Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 80a588ef10ed6893545fa1157f5e3da793df849e
Author: Pansmith <70342772+ThePansmith@users.noreply.github.com>
Date:   Fri May 10 11:43:53 2024 -0500

    minor qb fixes

commit fa11ae2b6fca4b2bb779d6cd73ccf85cdb4a83c5
Author: Pansmith <70342772+ThePansmith@users.noreply.github.com>
Date:   Fri May 10 11:43:38 2024 -0500

    Fixed WC expert recipe

commit d80cec5e9437e63a49a8f0ca64f7926dd4c80c95
Author: Pansmith <70342772+ThePansmith@users.noreply.github.com>
Date:   Fri May 10 11:43:27 2024 -0500

    Added lang for sdrp tiers

commit 56f09efa955d1966255bdc362783961ba3f09ab2
Author: Pansmith <70342772+ThePansmith@users.noreply.github.com>
Date:   Fri May 10 11:43:10 2024 -0500

    Fixed WC model

commit efacd696ede47cf17a071527ccf2521a3bf45b0a
Author: Pansmith <70342772+ThePansmith@users.noreply.github.com>
Date:   Fri May 10 10:43:46 2024 -0500

    La quest fixes
  • Loading branch information
ThePansmith committed May 10, 2024
1 parent 41e2d6c commit b1c78f2
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 45 deletions.
22 changes: 2 additions & 20 deletions config/ftbquests/quests/chapters/a_harder_genesis.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@
""
"&3Smelt&f it into ingots, &ahammer&f it into &6Plates&f, and &acut&f them into &6Wires&f."
]
icon: "gtceu:red_alloy_dust"
icon: "gtceu:red_alloy_ingot"
id: "605B2CCEAC246E14"
rewards: [{
id: "7FDDB9C4D0B83642"
Expand All @@ -1102,30 +1102,12 @@
}]
shape: "hexagon"
tasks: [
{
count: 16L
id: "761D450C2D7605B3"
item: { Count: 16b, id: "gtceu:copper_dust" }
type: "item"
}
{
count: 16L
id: "0BCFED23F6902B55"
item: { Count: 16b, id: "gtceu:red_alloy_dust" }
type: "item"
}
{
count: 16L
id: "1319F4826B365E7C"
item: { Count: 16b, id: "gtceu:red_alloy_ingot" }
type: "item"
}
{
count: 32L
id: "03B8535419C9303B"
item: { Count: 32b, id: "gtceu:iron_dust" }
type: "item"
}
{
count: 32L
id: "22A94430BF6CE5E6"
Expand All @@ -1151,7 +1133,7 @@
type: "item"
}
]
title: "From Dust to Wires"
title: "From Ingots to Wires"
x: 2.5d
y: 8.5d
}
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/end_game.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -3200,7 +3200,7 @@
subtitle: "Not just for tanks anymore!"
tasks: [{
id: "567872742E26A724"
item: "gtceu:creative_tank_fabricator"
item: "gtceu:subatomic_digital_assembler"
type: "item"
}]
title: "&9Matter Replicator"
Expand Down
19 changes: 6 additions & 13 deletions config/ftbquests/quests/chapters/genesis.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1094,22 +1094,15 @@
"&2GTCEu has a Primitive Water Pump, which can do it faster. However, it requires Treated Wood, which requires Creosote from a Coke Oven."
]
id: "0FF18D13CD42F48A"
rewards: [
{
id: "5B48A2DC5BF8979D"
item: "kubejs:moni_nickel"
type: "item"
}
{
id: "122522C479F28E1F"
item: "ulvcovm:ulv_electric_pump"
type: "item"
}
]
rewards: [{
id: "5B48A2DC5BF8979D"
item: "kubejs:moni_nickel"
type: "item"
}]
shape: "hexagon"
tasks: [{
id: "2ECEDA36F2ADFDE8"
item: "watercondenser:watercondenser"
item: "watercollector:watercollector"
type: "item"
}]
title: "&9Infinite Water"
Expand Down
1 change: 0 additions & 1 deletion config/ftbquests/quests/chapters/late_game.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,6 @@
type: "item"
}]
shape: "hexagon"
subtitle: "Holy crap it's that thing from the boxart"
tasks: [{
count: 16L
id: "52F9691851DE4023"
Expand Down
5 changes: 2 additions & 3 deletions config/ftbquests/quests/chapters/progression.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1681,11 +1681,9 @@
{
dependencies: [
"7FA0E6F3B466576C"
"17312BF0197B87A8"
"45B743CB23CA5735"
"03D0FFA69E671D48"
"605B2CCEAC246E14"
]
dependency_requirement: "one_completed"
description: [
"A \"&esubstrate&f\" is the \"board\" part of a circuit board... the backing that the circuit components and wires are laid into. A good substrate needs to not conduct electricity, for obvious reasons. &6Wood&r coated in &6Sticky Resin&r is a primitive but effective material to use as your first substrate."
""
Expand Down Expand Up @@ -1731,6 +1729,7 @@
"1EF6D85C63B73016"
"4B43ABA024E9A0B9"
]
dependency_requirement: "one_completed"
description: [
"&9This is where &bEMI&9 really shines! Using it alongside &3Crafting Stations&9, you should be able to easily calculate the amount of raw resources and intermediate components you'll need to &ebatch craft &9electronic circuits quickly."
""
Expand Down
10 changes: 9 additions & 1 deletion kubejs/assets/sdrp/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,13 @@
"sdrp.logo": "Playing Monifactory",
"sdrp.mainmenu": "In the Main Menu",
"sdrp.ulv": "Just starting to gregify the world!",
"sdrp.lv": "LV tier flufftext someone forgot to edit"
"sdrp.lv": "Starting production!",
"sdrp.mv": "Things are heating up!",
"sdrp.hv": "Autocrafting the way forward!",
"sdrp.ev": "Entering the microverse!",
"sdrp.iv": "Scaling up the factory!",
"sdrp.luv": "Researching the way forward!",
"sdrp.zpm": "Fusion!",
"sdrp.uv": "Cleaning out microverses!",
"sdrp.uhv": "Closing in on tank!"
}
3 changes: 3 additions & 0 deletions kubejs/assets/watercollector/models/item/watercollector.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "watercollector:block/watercollector"
}
3 changes: 0 additions & 3 deletions kubejs/assets/watercondenser/models/item/watercondenser.json

This file was deleted.

5 changes: 2 additions & 3 deletions kubejs/server_scripts/expert_mode/expert_mode.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ServerEvents.recipes(event => {
}


event.remove({ id: "watercollector:watercollector" })
event.remove({ id: /hostilenetworks/ })

const xpjuice = [
Expand All @@ -55,9 +54,9 @@ ServerEvents.recipes(event => {

event.replaceInput({ output: 'buildinggadgets2:gadget_exchanging' }, 'minecraft:redstone', 'gtceu:iv_emitter')

event.remove({ id: "watercondenser:watercondenser" })
event.remove({ id: "watercollector:watercollector" })
event.shaped(
"watercondenser:watercondenser", [
"watercollector:watercollector", [
"AAA",
"B B",
"AAA"
Expand Down

0 comments on commit b1c78f2

Please sign in to comment.