diff --git a/config/ftbquests/quests/chapters/a_harder_genesis.snbt b/config/ftbquests/quests/chapters/a_harder_genesis.snbt index 3c16246e..ef1a712a 100644 --- a/config/ftbquests/quests/chapters/a_harder_genesis.snbt +++ b/config/ftbquests/quests/chapters/a_harder_genesis.snbt @@ -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" @@ -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" @@ -1151,7 +1133,7 @@ type: "item" } ] - title: "From Dust to Wires" + title: "From Ingots to Wires" x: 2.5d y: 8.5d } diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt index 7e7b73cd..566fe10a 100644 --- a/config/ftbquests/quests/chapters/end_game.snbt +++ b/config/ftbquests/quests/chapters/end_game.snbt @@ -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" diff --git a/config/ftbquests/quests/chapters/genesis.snbt b/config/ftbquests/quests/chapters/genesis.snbt index bdc1d940..b7eb6def 100644 --- a/config/ftbquests/quests/chapters/genesis.snbt +++ b/config/ftbquests/quests/chapters/genesis.snbt @@ -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" diff --git a/config/ftbquests/quests/chapters/late_game.snbt b/config/ftbquests/quests/chapters/late_game.snbt index 309b167f..8c48676c 100644 --- a/config/ftbquests/quests/chapters/late_game.snbt +++ b/config/ftbquests/quests/chapters/late_game.snbt @@ -1488,7 +1488,6 @@ type: "item" }] shape: "hexagon" - subtitle: "Holy crap it's that thing from the boxart" tasks: [{ count: 16L id: "52F9691851DE4023" diff --git a/config/ftbquests/quests/chapters/progression.snbt b/config/ftbquests/quests/chapters/progression.snbt index f3f1b1df..64f01c38 100644 --- a/config/ftbquests/quests/chapters/progression.snbt +++ b/config/ftbquests/quests/chapters/progression.snbt @@ -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." "" @@ -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." "" diff --git a/kubejs/assets/sdrp/lang/en_us.json b/kubejs/assets/sdrp/lang/en_us.json index 02907d33..abac9981 100644 --- a/kubejs/assets/sdrp/lang/en_us.json +++ b/kubejs/assets/sdrp/lang/en_us.json @@ -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!" } \ No newline at end of file diff --git a/kubejs/assets/watercondenser/models/block/watercondenser.json b/kubejs/assets/watercollector/models/block/watercollector.json similarity index 100% rename from kubejs/assets/watercondenser/models/block/watercondenser.json rename to kubejs/assets/watercollector/models/block/watercollector.json diff --git a/kubejs/assets/watercollector/models/item/watercollector.json b/kubejs/assets/watercollector/models/item/watercollector.json new file mode 100644 index 00000000..c145f5c6 --- /dev/null +++ b/kubejs/assets/watercollector/models/item/watercollector.json @@ -0,0 +1,3 @@ +{ + "parent": "watercollector:block/watercollector" +} \ No newline at end of file diff --git a/kubejs/assets/watercondenser/models/item/watercondenser.json b/kubejs/assets/watercondenser/models/item/watercondenser.json deleted file mode 100644 index 10fce40f..00000000 --- a/kubejs/assets/watercondenser/models/item/watercondenser.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "watercondenser:block/watercondenser" -} \ No newline at end of file diff --git a/kubejs/server_scripts/expert_mode/expert_mode.js b/kubejs/server_scripts/expert_mode/expert_mode.js index 2357c1d3..fb05929b 100644 --- a/kubejs/server_scripts/expert_mode/expert_mode.js +++ b/kubejs/server_scripts/expert_mode/expert_mode.js @@ -33,7 +33,6 @@ ServerEvents.recipes(event => { } - event.remove({ id: "watercollector:watercollector" }) event.remove({ id: /hostilenetworks/ }) const xpjuice = [ @@ -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"