From f324e7e6daf6c8c8696018900653a38cceaaa802 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 00:10:22 +0000 Subject: [PATCH] New content for ULV + LV (#2873) * require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust * first draft of bakelite, new phenolic boards, new cupro coils * add another page to the medicine quest * cl * backup of lv quests * quest stuff and some recipe tweaks * tweak --------- Co-authored-by: Redeix --- CHANGELOG.md | 4 +- .../quests/chapters/create_logistics.snbt | 17 +- .../quests/chapters/ev__extreme_voltage.snbt | 1 - .../quests/chapters/gregtech_energy.snbt | 8 +- .../quests/chapters/lv__low_voltage.snbt | 785 ++++++++++++------ .../quests/chapters/questsmetallurgy.snbt | 5 + .../quests/chapters/questssteam_age.snbt | 157 ++-- .../quests/chapters/questsstoneage.snbt | 2 + .../quests/chapters/tips__tools.snbt | 24 +- kubejs/assets/gtceu/lang/en_us.json | 2 + kubejs/assets/tfg/alloys/weak_blue_steel.json | 3 + kubejs/assets/tfg/alloys/weak_red_steel.json | 3 + kubejs/assets/tfg/lang/en_us.json | 96 ++- kubejs/client_scripts/tooltips.js | 3 + .../create_additions/recipes.js | 6 +- kubejs/server_scripts/greate/recipes.js | 4 +- .../server_scripts/greate/recipes.removes.js | 43 + .../gregtech/recipes.machines.js | 52 +- .../gregtech/recipes.removes.js | 10 + kubejs/server_scripts/gregtech/tags.js | 4 +- kubejs/server_scripts/tfc/recipes.js | 4 +- kubejs/server_scripts/tfc/recipes.removes.js | 7 + kubejs/server_scripts/tfcbetterbf/recipes.js | 28 +- .../tfg/machines/recipes.bakelite.js | 70 ++ .../tfg/machines/recipes.coils.js | 77 ++ .../tfg/machines/recipes.multiblocks.js | 4 +- .../tfg/ores_and_materials/recipes.alloys.js | 29 + .../recipes.material_tools.js | 2 +- .../tfg/primitive/recipes.clay.js | 23 +- .../primitive/recipes.glue_and_chipboard.js | 15 - kubejs/server_scripts/tfg/recipes.js | 2 + .../vintage_improvements/recipes.js | 6 +- kubejs/startup_scripts/gtceu/constants.js | 2 + .../gtceu/material_modification.js | 6 +- kubejs/startup_scripts/tfg/items.js | 3 - kubejs/startup_scripts/tfg/materials.js | 42 + .../tfg/primitive/items.primitive.js | 1 - .../tfg/primitive/materials.primitive.js | 32 +- kubejs/startup_scripts/tfg/tag_prefixes.js | 3 + 39 files changed, 1092 insertions(+), 493 deletions(-) create mode 100644 kubejs/assets/tfg/alloys/weak_blue_steel.json create mode 100644 kubejs/assets/tfg/alloys/weak_red_steel.json create mode 100644 kubejs/server_scripts/tfg/machines/recipes.bakelite.js create mode 100644 kubejs/server_scripts/tfg/machines/recipes.coils.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d84cca7..a31ec81bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,18 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix - Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie - Added steam alloy smelter glass batch recipes (#2853) @Pyritie -- Added the Artisan Table to "knap" GT molds and circuits. @BlueBoat29 @Redeix +- Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie - Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan - Fixed missing borax to flux recipe @Pyritie ### Translation updates +- Chinese (simplified) @jmecn ## [0.11.18] - 23-01-2026 ### Important notes diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index 9d7f8c168..914590ae0 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -131,6 +131,8 @@ dependencies: [ "572A8983FA12152A" "3AF956758FA289A8" + "07E7678095258EDB" + "383A14A5C65B3ADF" ] dependency_requirement: "one_completed" description: ["{quests.create_logistics.rose_quartz_lens.desc}"] @@ -209,8 +211,9 @@ { dependencies: [ "7C4807A247AF36A1" - "648BCF486E16CCB2" + "713C8D6A20BF3A0E" ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] id: "76490E046A44BCC3" size: 2.0d @@ -225,7 +228,11 @@ y: -1.0d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: [ "{quests.create_logistics.stock_ticker.desc.1}" "{@pagebreak}" @@ -245,7 +252,11 @@ y: -2.5d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.redstone_requester.desc}"] id: "3F44CFF8A6018F3E" subtitle: "{quests.create_logistics.redstone_requester.subtitle}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 40fd2428b..a736b2b47 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -92,7 +92,6 @@ { dependencies: [ "601088B7920140B2" - "3FBDC8552F7D8008" "3B18DE7395776B41" ] description: ["{quests.extreme_voltage.t2_rocket.desc}"] diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index a962839dd..e52987dc3 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -118,10 +118,7 @@ y: -7.0d } { - dependencies: [ - "06B2E38F7DCF2678" - "22510C5F2386B453" - ] + dependencies: ["06B2E38F7DCF2678"] dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.produce_energy.desc}"] icon: "gtceu:lv_field_generator" @@ -1083,12 +1080,15 @@ "4C620105AAC49381" "0C718329245D9619" ] + description: ["{quests.low_voltage.lv_biodiesel.desc}"] id: "139C7DF629329753" + subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}" tasks: [{ id: "7BA9FDD1F45B53F6" item: "gtceu:bio_diesel_bucket" type: "item" }] + title: "{quests.low_voltage.lv_biodiesel.title}" x: -9.0d y: -7.0d } diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 60e1d570a..42831456c 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -10,20 +10,55 @@ { id: "0EA7766FE6845121" linked_quest: "0FFBB6177DEB0A23" - x: -8.0d - y: 11.5d + x: -14.5d + y: 15.0d } { id: "46612C429BCA8A18" linked_quest: "6BAC3BE1D4FE0F6B" - x: 7.5d - y: 4.0d + x: 2.5d + y: 10.0d } { id: "5E5AD44B50E0B15B" linked_quest: "31A6A236B6710B95" - x: 7.5d - y: 5.0d + x: 4.5d + y: 12.0d + } + { + id: "5BC9534E2B4A16A2" + linked_quest: "2262F1FD4EAB777F" + shape: "octagon" + size: 1.5d + x: -2.5d + y: 14.0d + } + { + id: "3E4C0AAC278DC9F1" + linked_quest: "341E2F290344BEEE" + shape: "octagon" + size: 1.5d + x: -10.5d + y: 4.0d + } + { + id: "00B51E50BEBF7E1D" + linked_quest: "3F44CFF8A6018F3E" + x: -8.5d + y: 6.0d + } + { + id: "34F6462681BB5D77" + linked_quest: "7C4807A247AF36A1" + x: -8.5d + y: 2.0d + } + { + id: "343F16805E04BFBE" + linked_quest: "2D2CB8104E40E808" + shape: "heart" + x: 7.0d + y: 6.0d } ] quests: [ @@ -42,7 +77,7 @@ }] title: "{quests.low_voltage.lv_fluid_regulator.title}" x: 6.0d - y: -1.5d + y: -8.5d } { dependencies: ["38993B4697B0E16C"] @@ -62,7 +97,7 @@ }] title: "{quests.low_voltage.lv_robot_arm.title}" x: 6.0d - y: -4.5d + y: -11.5d } { dependencies: ["7EED0084BA59FED1"] @@ -78,7 +113,7 @@ }] title: "{quests.low_voltage.lv_conveyor.title}" x: 4.5d - y: -3.0d + y: -10.0d } { dependencies: ["7EED0084BA59FED1"] @@ -94,7 +129,7 @@ }] title: "{quests.low_voltage.lv_pump.title}" x: 4.5d - y: -1.5d + y: -8.5d } { dependencies: ["7EED0084BA59FED1"] @@ -110,18 +145,13 @@ }] title: "{quests.low_voltage.lv_piston.title}" x: 4.5d - y: -4.5d + y: -11.5d } { dependencies: ["7FA1525D681C4B4A"] - description: [ - "{quests.low_voltage.lv_steam_turbine.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_steam_turbine.desc.2}" - ] + description: ["{quests.low_voltage.lv_steam_turbine.desc}"] id: "6E186F9C57155BFA" optional: true - shape: "hexagon" size: 1.0d subtitle: "{quests.low_voltage.lv_steam_turbine.subtitle}" tasks: [{ @@ -130,8 +160,8 @@ type: "item" }] title: "{quests.low_voltage.lv_steam_turbine.title}" - x: 7.5d - y: 9.5d + x: 1.0d + y: -6.0d } { dependencies: ["7FA1525D681C4B4A"] @@ -148,16 +178,20 @@ type: "item" }] title: "{quests.low_voltage.lv_amp_explanation.title}" - x: 5.5d - y: 10.5d + x: 2.0d + y: -8.0d } { - dependencies: ["45B71324028F6E68"] + dependencies: [ + "45B71324028F6E68" + "39F6BCF4B8DFC7D4" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.aluminium_ingot.desc}"] hide_dependency_lines: false id: "7567E885B7166603" shape: "octagon" - size: 1.5d + size: 2.0d subtitle: "{quests.low_voltage.aluminium_ingot.subtitle}" tasks: [{ id: "161B5813936E5E42" @@ -165,21 +199,19 @@ type: "item" }] title: "{quests.low_voltage.aluminium_ingot.title}" - x: -10.0d - y: 11.5d + x: -12.5d + y: 14.0d } { dependencies: [ - "49896161B31DB7B4" - "5B891BA4897FD73C" "1912758422EEB006" + "5B891BA4897FD73C" + "49896161B31DB7B4" ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_battery_preparation.desc}"] - hide_dependency_lines: true icon: "gtceu:battery_alloy_ingot" id: "6D9D54FAB21EC086" - size: 1.0d subtitle: "{quests.low_voltage.lv_battery_preparation.subtitle}" tasks: [ { @@ -195,8 +227,8 @@ } ] title: "{quests.low_voltage.lv_battery_preparation.title}" - x: 7.5d - y: -0.5d + x: 5.0d + y: 4.0d } { dependencies: [ @@ -223,14 +255,10 @@ }] title: "{quests.low_voltage.cover_behaviour.title}" x: 6.0d - y: -3.0d + y: -10.0d } { - dependencies: [ - "32EA7E81885C8E87" - "10ECB471A77F5136" - "07E7678095258EDB" - ] + dependencies: ["47B899144B865516"] dependency_requirement: "one_completed" description: [ "{quests.low_voltage.machine_auto_output_behaviour.desc.1}" @@ -239,7 +267,7 @@ ] icon: "minecraft:hopper" id: "64E1E87B8AF72968" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.machine_auto_output_behaviour.subtitle}" tasks: [{ @@ -248,11 +276,11 @@ type: "checkmark" }] title: "{quests.low_voltage.machine_auto_output_behaviour.title}" - x: -5.0d - y: -0.5d + x: -2.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_wiremill.desc.1}" "{@pagebreak}" @@ -277,11 +305,11 @@ type: "item" }] title: "{quests.low_voltage.lv_wiremill.title}" - x: -3.0d - y: 0.5d + x: -1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_bender.desc}"] id: "10ECB471A77F5136" size: 1.0d @@ -302,11 +330,11 @@ type: "item" }] title: "{quests.low_voltage.lv_bender.title}" - x: -5.0d - y: 1.5d + x: -3.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_lathe.desc.1}" "{@pagebreak}" @@ -328,11 +356,11 @@ type: "item" }] title: "{quests.low_voltage.lv_lathe.title}" - x: -4.0d - y: 1.0d + x: -5.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_polariser.desc}"] id: "29379C91D6E00436" size: 1.0d @@ -343,8 +371,8 @@ type: "item" }] title: "{quests.low_voltage.lv_polariser.title}" - x: -1.0d - y: -0.5d + x: 3.0d + y: -1.0d } { dependencies: [ @@ -370,8 +398,8 @@ type: "item" }] title: "{quests.low_voltage.lbb.title}" - x: 9.0d - y: 9.5d + x: 0.0d + y: -5.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -391,18 +419,19 @@ type: "item" }] title: "{quests.low_voltage.lv_superconductor.title}" - x: -12.0d - y: 7.5d + x: -14.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_chemical_bath.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_chemical_bath.desc.2}" ] - hide_dependency_lines: true id: "330BDB559A7BAB35" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_chemical_bath.subtitle}" tasks: [{ @@ -411,8 +440,8 @@ type: "item" }] title: "{quests.low_voltage.lv_chemical_bath.title}" - x: -4.0d - y: 13.5d + x: 2.5d + y: 3.0d } { dependencies: ["64E1E87B8AF72968"] @@ -429,7 +458,7 @@ } } id: "59F0060B55307311" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.programmed_circuits.subtitle}" tasks: [{ @@ -438,11 +467,11 @@ type: "checkmark" }] title: "{quests.low_voltage.programmed_circuits.title}" - x: -6.5d - y: -0.5d + x: -4.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: ["{quests.low_voltage.lv_canner.desc}"] id: "37307A46E70011D3" size: 1.0d @@ -453,8 +482,8 @@ type: "item" }] title: "{quests.low_voltage.lv_canner.title}" - x: 5.0d - y: 1.5d + x: 2.5d + y: 6.0d } { dependencies: [ @@ -482,8 +511,8 @@ type: "item" }] title: "{quests.low_voltage.lv_battery.title}" - x: 7.5d - y: 1.0d + x: 5.0d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -512,11 +541,14 @@ type: "item" }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" - x: 7.5d - y: 2.5d + x: 5.0d + y: 8.0d } { - dependencies: ["1646BF9194100E57"] + dependencies: [ + "1646BF9194100E57" + "2FC7B1E867E4194E" + ] description: [ "{quests.low_voltage.lv_ebf.desc.1}" "{@pagebreak}" @@ -541,14 +573,22 @@ type: "item" }] title: "{quests.low_voltage.lv_ebf.title}" - x: -10.0d - y: 7.5d + x: -12.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.other_machines.desc}"] hide_dependency_lines: false - icon: "gtceu:crushed_sulfur_ore" + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_sphalerite_ore" + } id: "701BCADAE5CF6CA5" shape: "circle" size: 1.0d @@ -559,8 +599,8 @@ type: "checkmark" }] title: "{quests.low_voltage.other_machines.title}" - x: 5.5d - y: 4.5d + x: 2.5d + y: 12.0d } { description: ["{quests.low_voltage.lv_age_progression.desc}"] @@ -576,7 +616,7 @@ }] title: "{quests.low_voltage.lv_age_progression.title}" x: 0.0d - y: -3.0d + y: -12.5d } { dependencies: [ @@ -586,7 +626,8 @@ dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_fluid_solidifier.desc}"] id: "581CDF545E1EA1FD" - size: 1.0d + shape: "octagon" + size: 1.5d subtitle: "{quests.low_voltage.lv_fluid_solidifier.subtitle}" tasks: [{ id: "20B1CA4DB2750E84" @@ -594,8 +635,8 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_solidifier.title}" - x: -8.0d - y: 3.5d + x: -4.5d + y: 6.0d } { dependencies: [ @@ -621,13 +662,13 @@ type: "item" }] title: "{quests.low_voltage.lv_ore_prospector.title}" - x: 9.0d - y: 1.0d + x: 7.0d + y: 7.0d } { dependencies: [ "6042514C8FC54334" - "5B2696206205CB2E" + "02E5D186ABF719F0" ] description: ["{quests.low_voltage.cupronickel_coil.desc}"] icon: { @@ -647,11 +688,10 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_coil.title}" - x: -8.0d - y: 7.5d + x: -10.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_gas_collector.desc}"] id: "15928F50AE80A5CF" shape: "square" @@ -663,11 +703,11 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_collector.title}" - x: -4.0d - y: 9.5d + x: -8.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_chemical_reactor.desc.1}" "{@pagebreak}" @@ -697,17 +737,19 @@ } ] title: "{quests.low_voltage.lv_chemical_reactor.title}" - x: -6.0d - y: 3.5d + x: -2.5d + y: 6.0d } { - dependencies: ["10ECB471A77F5136"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.universal_cell.desc.1}" "{@pagebreak}" "{quests.low_voltage.universal_cell.desc.2}" ] id: "292938760AB9A12B" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.universal_cell.subtitle}" tasks: [{ @@ -723,16 +765,14 @@ type: "item" }] title: "{quests.low_voltage.universal_cell.title}" - x: -6.5d - y: 1.5d + x: 1.0d + y: 8.0d } { dependencies: ["581CDF545E1EA1FD"] description: ["{quests.low_voltage.mold_rotor.desc}"] icon: "gtceu:rotor_casting_mold" id: "115C4226F6473F0C" - optional: true - shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.mold_rotor.subtitle}" tasks: [ @@ -748,29 +788,35 @@ } ] title: "{quests.low_voltage.mold_rotor.title}" - x: -9.5d - y: 3.5d + x: -6.5d + y: 7.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["5B2696206205CB2E"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.soldering_alloy.desc}"] - icon: "gtceu:soldering_alloy_dust" + icon: "gtceu:soldering_alloy_bucket" id: "713C8D6A20BF3A0E" shape: "square" size: 1.0d subtitle: "{quests.low_voltage.soldering_alloy.subtitle}" - tasks: [{ - id: "67F9F84D66E32728" - item: "gtceu:soldering_alloy_dust" - type: "item" - }] + tasks: [ + { + id: "5F6344C5B4DCE4C8" + item: "gtceu:soldering_alloy_bucket" + optional_task: true + type: "item" + } + { + id: "1095906933C39F9A" + type: "checkmark" + } + ] title: "{quests.low_voltage.soldering_alloy.title}" - x: 4.0d - y: 11.5d + x: -6.5d + y: 4.0d } { - dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.lv_electroliser.desc.1}" "{@pagebreak}" @@ -788,11 +834,11 @@ type: "item" }] title: "{quests.low_voltage.lv_electroliser.title}" - x: -6.0d - y: 7.5d + x: -2.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_cutter.desc}"] id: "3A8D7FC6F316C38C" size: 1.0d @@ -813,11 +859,11 @@ type: "item" }] title: "{quests.low_voltage.lv_cutter.title}" - x: -2.0d - y: 0.0d + x: 1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.lv_centrifuge.desc.1}" "{@pagebreak}" @@ -834,8 +880,8 @@ type: "item" }] title: "{quests.low_voltage.lv_centrifuge.title}" - x: -2.0d - y: 9.5d + x: -2.5d + y: 10.0d } { dependencies: ["37307A46E70011D3"] @@ -852,11 +898,11 @@ type: "item" }] title: "{quests.low_voltage.lv_sprayer.title}" - x: 5.0d - y: 0.0d + x: 2.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_assembler.desc.1}" "{@pagebreak}" @@ -873,10 +919,10 @@ }] title: "{quests.low_voltage.lv_assembler.title}" x: 0.0d - y: 9.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_extractor.desc.1}" "{@pagebreak}" @@ -891,8 +937,8 @@ type: "item" }] title: "{quests.low_voltage.lv_extractor.title}" - x: -6.0d - y: 5.5d + x: -4.5d + y: 4.0d } { dependencies: ["0DBC148D92A9F69F"] @@ -912,7 +958,7 @@ }] title: "{quests.low_voltage.lv_circuit_assembler.title}" x: 0.0d - y: 16.5d + y: 19.5d } { dependencies: ["1A77CA35F054F988"] @@ -930,8 +976,8 @@ type: "item" }] title: "{quests.low_voltage.lv_arc_furnace.title}" - x: -6.0d - y: 11.5d + x: -4.5d + y: 13.0d } { dependencies: [ @@ -973,8 +1019,8 @@ } ] title: "{quests.low_voltage.lv_oxygen.title}" - x: -6.0d - y: 9.5d + x: -4.5d + y: 12.0d } { dependencies: ["5263F866638D875C"] @@ -1004,11 +1050,11 @@ } ] title: "{quests.low_voltage.lv_glue.title}" - x: -2.0d - y: 11.5d + x: -4.5d + y: 10.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["701BCADAE5CF6CA5"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.gallium_arsenide.desc}"] id: "4073577B7EF9B593" @@ -1020,14 +1066,13 @@ type: "item" }] title: "{quests.low_voltage.gallium_arsenide.title}" - x: 2.0d - y: 11.5d + x: 2.5d + y: 14.0d } { dependencies: [ - "0EAC071414AEC07E" - "330BDB559A7BAB35" - "63CD0236B337EAAD" + "1C5F5EDAEE355130" + "628C72BC441DAAB5" ] description: [ "{quests.low_voltage.t2_circuit_board.desc.1}" @@ -1042,8 +1087,8 @@ item: "gtceu:phenolic_printed_circuit_board" type: "item" }] - x: -2.0d - y: 13.5d + x: -3.5d + y: 16.0d } { dependencies: [ @@ -1061,7 +1106,7 @@ }] title: "{quests.low_voltage.lv_diode.title}" x: 0.0d - y: 11.5d + y: 14.0d } { dependencies: [ @@ -1070,8 +1115,8 @@ ] description: ["{quests.low_voltage.1_mv_circuit.desc}"] id: "0DBC148D92A9F69F" - shape: "gear" - size: 1.5d + shape: "octagon" + size: 2.0d subtitle: "{quests.low_voltage.1_mv_circuit.subtitle}" tasks: [{ id: "70313E1917121E14" @@ -1080,7 +1125,7 @@ }] title: "{quests.low_voltage.1_mv_circuit.title}" x: 0.0d - y: 13.5d + y: 16.0d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1094,19 +1139,20 @@ type: "item" }] title: "{quests.low_voltage.aluminium_dust.title}" - x: -10.0d - y: 9.5d + x: -12.5d + y: 12.0d } { - dependencies: ["1E9BE8D3F8A602DC"] description: ["{quests.low_voltage.multiblock_tech.desc}"] hide_text_until_complete: false icon: "gtceu:heatproof_machine_casing" id: "2FC7B1E867E4194E" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.multiblock_tech.subtitle}" tasks: [ { + disable_toast: true id: "1B5378C55DC4AE73" item: { Count: 1 @@ -1119,23 +1165,13 @@ type: "item" } { - id: "3201D38691813B6D" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:ulv_output_bus)item(gtceu:lv_output_bus))" - } - } - title: "{quests.low_voltage.multiblock_tech.task.2}" - type: "item" - } - { + disable_toast: true id: "1F39902E1FB41053" item: "gtceu:maintenance_hatch" type: "item" } { + disable_toast: true id: "705D4CC1AA36EF10" item: "gtceu:lv_muffler_hatch" type: "item" @@ -1147,6 +1183,7 @@ type: "item" } { + disable_toast: true id: "7E3D72FA8499654D" item: { Count: 1 @@ -1160,49 +1197,29 @@ } { count: 2L + disable_toast: true id: "64F174F0EDAED10E" item: "gtceu:lv_energy_input_hatch" type: "item" } + { + disable_toast: true + id: "226789AAB78CDC09" + item: "gtceu:lv_output_bus" + type: "item" + } ] title: "{quests.low_voltage.multiblock_tech.title}" - x: -10.0d - y: 5.5d + x: -12.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] - description: [ - "{quests.low_voltage.lv_rock_crusher.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_rock_crusher.desc.2}" + dependencies: [ + "2E36E5755B2F551C" + "4B4F052F00435AFE" + "2D2CB8104E40E808" ] - icon: "gtceu:lv_rock_crusher" - id: "1F2359106FC95603" - optional: true - shape: "heart" - size: 1.0d - subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}" - tasks: [{ - id: "37396BE76A4F64C5" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"Any Rock Crusher\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:lv_rock_crusher)item(gtceu:mv_rock_crusher)item(gtceu:hv_rock_crusher)item(gtceu:ev_rock_crusher)item(gtceu:iv_rock_crusher)item(gtceu:luv_rock_crusher)item(gtceu:zpm_rock_crusher)item(gtceu:uv_rock_crusher))" - } - } - title: "{quests.low_voltage.lv_rock_crusher.task}" - type: "item" - }] - title: "{quests.low_voltage.lv_rock_crusher.title}" - x: 3.5d - y: 0.5d - } - { - dependencies: ["3E6DC423FE4A99F7"] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_turbo_charge.desc}"] icon: "gtceu:lv_charger_4x" id: "2DB259568F347C0E" @@ -1227,42 +1244,30 @@ }] title: "{quests.low_voltage.lv_turbo_charge.title}" x: 9.0d - y: -0.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_mixer.desc}"] id: "5B891BA4897FD73C" subtitle: "{quests.low_voltage.lv_mixer.subtitle}" tasks: [{ - id: "337A6B670842F80A" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"LV Mixer\"}" - } - "ftbfiltersystem:filter": "or(item(greate:steel_mechanical_mixer)item(gtceu:lv_mixer))" - } - } - title: "{quests.low_voltage.lv_mixer.task}" + id: "7595657F7017B1F6" + item: "gtceu:lv_mixer" type: "item" }] title: "{quests.low_voltage.lv_mixer.title}" - x: 2.0d - y: 9.5d + x: 5.0d + y: -1.0d } { - dependencies: ["12565AB92A2BF976"] + dependencies: ["648BCF486E16CCB2"] description: [ "{quests.low_voltage.lv_machine_hull.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_machine_hull.desc.2}" ] id: "22510C5F2386B453" - shape: "gear" - size: 2.5d subtitle: "{quests.low_voltage.lv_machine_hull.subtitle}" tasks: [{ id: "499CACFF0350B3CA" @@ -1271,7 +1276,7 @@ }] title: "{quests.low_voltage.lv_machine_hull.title}" x: 0.0d - y: 4.5d + y: -10.0d } { dependencies: ["15928F50AE80A5CF"] @@ -1301,11 +1306,11 @@ } ] title: "{quests.low_voltage.lv_nitrogen.title}" - x: -4.0d - y: 11.5d + x: -10.5d + y: 12.0d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_motor.desc}"] icon: "gtceu:lv_electric_motor" id: "7EED0084BA59FED1" @@ -1320,7 +1325,7 @@ }] title: "{quests.low_voltage.lv_motor.title}" x: 3.0d - y: -3.0d + y: -10.0d } { dependencies: ["581CDF545E1EA1FD"] @@ -1342,14 +1347,16 @@ } ] title: "{quests.low_voltage.mold_plate.title}" - x: -9.5d - y: 2.5d + x: -6.5d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] + description: ["{quests.low_voltage.night_vision_goggles.desc}"] id: "4B4F052F00435AFE" optional: true shape: "heart" + subtitle: "{quests.low_voltage.night_vision_goggles.subtitle}" tasks: [{ id: "00E6EDB1E4C1482F" item: { @@ -1359,15 +1366,15 @@ } type: "item" }] - x: 9.0d - y: 2.5d + x: 7.0d + y: 5.0d } { dependencies: ["7FA1525D681C4B4A"] description: ["{quests.steam_age.alternator.desc.1}"] + icon: "createaddition:alternator" id: "2DC24661CAD557B0" optional: true - shape: "hexagon" subtitle: "{quests.steam_age.alternator.subtitle}" tasks: [ { @@ -1391,11 +1398,14 @@ } ] title: "{quests.steam_age.alternator.title}" - x: 7.5d - y: 8.0d + x: -1.0d + y: -6.0d } { - dependencies: ["7567E885B7166603"] + dependencies: [ + "7567E885B7166603" + "1C5F5EDAEE355130" + ] description: [ "{quests.low_voltage.mv_hull.desc1}" "{@pagebreak}" @@ -1411,22 +1421,51 @@ type: "item" }] title: "{quests.low_voltage.mv_hull.title}" - x: -10.0d - y: 15.0d + x: -12.5d + y: 17.5d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: [ + "170B544373A16112" + "2DC24661CAD557B0" + "1AD51E2B66EA7F67" + "6E186F9C57155BFA" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_machine_casing.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:red_steel_wire_cutter" + tag: { + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 15359 + ToolSpeed: 11.0f + } + HideFlags: 2 + } + } id: "12565AB92A2BF976" + shape: "circle" + size: 1.5d subtitle: "{quests.low_voltage.lv_machine_casing.subtitle}" tasks: [{ - id: "7459A24E5EBE148D" - item: "gtceu:lv_machine_casing" - type: "item" + id: "373E2FE9A8AB14B3" + type: "checkmark" }] title: "{quests.low_voltage.lv_machine_casing.title}" x: 0.0d - y: 1.0d + y: -3.5d } { dependencies: ["0DBC148D92A9F69F"] @@ -1451,11 +1490,11 @@ type: "item" }] title: "{quests.low_voltage.lv_greenhouse.title}" - x: 2.25d - y: 13.5d + x: 2.5d + y: 16.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: ["{quests.low_voltage.lv_aqueous_accumulator.desc}"] icon: "tfg:lv_aqueous_accumulator" id: "47E6F8AC20D51814" @@ -1475,8 +1514,8 @@ type: "item" }] title: "{quests.low_voltage.lv_aqueous_accumulator.title}" - x: 2.0d - y: 0.0d + x: 2.5d + y: 2.0d } { dependencies: [ @@ -1488,7 +1527,6 @@ description: ["{quests.low_voltage.lv_combuston_gen.desc}"] id: "170B544373A16112" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_combuston_gen.subtitle}" tasks: [{ id: "2B36CA88F25D5449" @@ -1496,8 +1534,8 @@ type: "item" }] title: "{quests.low_voltage.lv_combuston_gen.title}" - x: 7.5d - y: 11.0d + x: -3.0d + y: -6.0d } { dependencies: ["22510C5F2386B453"] @@ -1516,8 +1554,8 @@ type: "checkmark" }] title: "{quests.low_voltage.link_chapter.title}" - x: 5.5d - y: 8.5d + x: 0.0d + y: -8.0d } { dependencies: ["5F3063C539C9CBBF"] @@ -1539,8 +1577,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seeds.title}" - x: 11.0d - y: 11.0d + x: -6.5d + y: -6.5d } { dependencies: ["55213ACBF5F5D398"] @@ -1555,8 +1593,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seed_oil.title}" - x: 10.0d - y: 11.0d + x: -5.5d + y: -6.5d } { dependencies: ["1D979CB5862BD480"] @@ -1571,12 +1609,10 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: 9.0d - y: 11.0d + x: -4.5d + y: -6.5d } { - dependencies: ["1912758422EEB006"] - dependency_requirement: "one_completed" description: ["{quests.low_voltage.cupronickel_ingot.desc}"] id: "6042514C8FC54334" shape: "diamond" @@ -1587,8 +1623,8 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_ingot.title}" - x: -8.0d - y: 9.5d + x: -10.5d + y: 8.0d } { dependencies: ["7567E885B7166603"] @@ -1617,14 +1653,10 @@ } ] title: "{quests.low_voltage.aluminium_greate.title}" - x: -12.0d - y: 11.5d + x: -14.5d + y: 14.0d } { - dependencies: [ - "5263F866638D875C" - "3D98819A799D2E64" - ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.oil.desc}"] hide_dependency_lines: true @@ -1639,8 +1671,8 @@ type: "checkmark" }] title: "{quests.low_voltage.oil.title}" - x: 10.0d - y: 12.0d + x: -5.5d + y: -5.5d } { dependencies: [ @@ -1650,7 +1682,6 @@ description: ["{quests.low_voltage.lv_gas_turbine.desc}"] id: "1AD51E2B66EA7F67" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_gas_turbine.subtitle}" tasks: [{ id: "295425BB3FED8220" @@ -1658,8 +1689,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_turbine.title}" - x: 7.5d - y: 6.5d + x: 3.0d + y: -6.0d } { dependencies: ["2CEE3C0972650C81"] @@ -1690,8 +1721,8 @@ } ] title: "{quests.low_voltage.lv_naphtha_light.title}" - x: 9.0d - y: 12.0d + x: -4.5d + y: -5.5d } { dependencies: ["5F3063C539C9CBBF"] @@ -1707,8 +1738,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_syngas.title}" - x: 9.0d - y: 6.5d + x: 4.5d + y: -6.0d } { dependencies: [ @@ -1725,8 +1756,8 @@ type: "item" }] title: "{quests.low_voltage.glowstone.title}" - x: -8.0d - y: 5.5d + x: -6.5d + y: 5.0d } { dependencies: ["22510C5F2386B453"] @@ -1747,8 +1778,222 @@ type: "checkmark" }] title: "{quests.low_voltage.lost.title}" - x: 1.5d - y: 5.0d + x: -2.0d + y: -10.0d + } + { + dependencies: [ + "32EA7E81885C8E87" + "3A8D7FC6F316C38C" + "10ECB471A77F5136" + "5B891BA4897FD73C" + "07E7678095258EDB" + "29379C91D6E00436" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.next_machines.desc}"] + icon: { + Count: 1 + id: "gtceu:lv_blue_steel_wrench" + tag: { + Charge: 2147483647L + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { + Mode: 2b + } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 6143 + ToolSpeed: 34.0f + } + HideFlags: 2 + MaxCharge: 2147483647L + } + } + id: "47B899144B865516" + shape: "circle" + size: 1.5d + subtitle: "{quests.low_voltage.next_machines.subtitle}" + tasks: [{ + id: "4E3F61B3665C360D" + type: "checkmark" + }] + title: "{quests.low_voltage.next_machines.title}" + x: 0.0d + y: 2.0d + } + { + dependencies: ["3D98819A799D2E64"] + description: ["{quests.low_voltage.lv_distillery.desc}"] + id: "26C843A618A39A44" + subtitle: "{quests.low_voltage.lv_distillery.subtitle}" + tasks: [{ + id: "7A2467AC143CE86C" + item: "gtceu:lv_distillery" + type: "item" + }] + x: -4.5d + y: 8.0d + } + { + dependencies: ["26C843A618A39A44"] + description: [ + "{quests.low_voltage.phenolic_resin.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.phenolic_resin.desc.2}" + ] + icon: "tfg:phenolic_resin_bucket" + id: "671F90ADCDF476A8" + subtitle: "{quests.low_voltage.phenolic_resin.subtitle}" + tasks: [ + { + id: "173ED252A38EC942" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"tfg:phenolic_resin\"}})nbt(fuzzy:{Fluid:{FluidName:\"tfg:phenolic_resin\"}})item(tfg:phenolic_resin_bucket))" + } + } + optional_task: true + title: "{material.tfg.phenolic_resin}" + type: "item" + } + { + id: "7427C1BCD5B921B6" + type: "checkmark" + } + ] + title: "{material.tfg.phenolic_resin}" + x: -6.5d + y: 10.0d + } + { + dependencies: ["671F90ADCDF476A8"] + description: [ + "{quests.low_voltage.bakelite.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.bakelite.desc.2}" + ] + id: "1C5F5EDAEE355130" + shape: "octagon" + size: 1.5d + subtitle: "{quests.low_voltage.bakelite.subtitle}" + tasks: [{ + id: "0938AC37E76A29D7" + item: "tfg:bakelite_plate" + type: "item" + }] + title: "{material.tfg.bakelite}" + x: -6.5d + y: 16.0d + } + { + description: ["{quests.low_voltage.lv_forming_press.desc}"] + icon: "gtceu:lv_forming_press" + id: "628C72BC441DAAB5" + subtitle: "{quests.low_voltage.lv_forming_press.subtitle}" + tasks: [{ + id: "60128F9B939ED982" + item: "gtceu:lv_forming_press" + type: "item" + }] + x: -3.5d + y: 18.0d + } + { + dependencies: [ + "671F90ADCDF476A8" + "6FFD4990FF07078A" + "698DCAB4F014EB3B" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.refractory_brick.desc}"] + id: "02E5D186ABF719F0" + subtitle: "{quests.low_voltage.refractory_brick.subtitle}" + tasks: [{ + id: "5E377C9A0AD52487" + item: "tfg:magnesia_refractory_brick_ingot" + type: "item" + }] + x: -8.5d + y: 10.0d + } + { + description: ["{quests.low_voltage.magnesia.desc}"] + id: "698DCAB4F014EB3B" + shape: "diamond" + subtitle: "{quests.low_voltage.magnesia.subtitle}" + tasks: [{ + id: "57C83D16611E601A" + item: "gtceu:magnesia_dust" + type: "item" + }] + x: -8.5d + y: 8.0d + } + { + dependencies: ["47B899144B865516"] + description: ["{quests.low_voltage.food_machines.desc}"] + icon: "tfg:lv_food_processor" + id: "3B6A7B1E9114C2A9" + optional: true + shape: "heart" + subtitle: "{quests.low_voltage.food_machines.subtitle}" + tasks: [ + { + id: "12EE86BCBC04FCCE" + item: "tfg:lv_food_processor" + type: "item" + } + { + id: "4A3187B73528B908" + item: "tfg:lv_food_oven" + type: "item" + } + { + id: "2D6C7761076670A5" + item: "tfg:rotten_voiding_cover" + optional_task: true + type: "item" + } + ] + title: "{quests.low_voltage.food_machines.title}" + x: 2.5d + y: 4.0d + } + { + dependencies: [ + "713C8D6A20BF3A0E" + "7C4807A247AF36A1" + ] + dependency_requirement: "one_completed" + description: ["{quests.create_logistics.stock_link.desc}"] + disable_toast: true + id: "50FE830DA6F403B2" + subtitle: "{quests.create_logistics.stock_link.subtitle}" + tasks: [{ + id: "7B71B5DBEFD84C1F" + item: "create:stock_link" + type: "item" + }] + title: "{quests.create_logistics.stock_link.title}" + x: -8.5d + y: 4.0d + } + { + description: ["{quests.low_voltage.lv_laser_engraver.desc}"] + id: "383A14A5C65B3ADF" + subtitle: "{quests.low_voltage.lv_laser_engraver.subtitle}" + tasks: [{ + id: "4CB619C294C16642" + item: "gtceu:lv_laser_engraver" + type: "item" + }] + x: -10.5d + y: 2.0d } ] subtitle: ["{quests.low_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 132a73332..61a20311b 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -415,6 +415,7 @@ description: ["{quests.metal_age.anvil_recycling.desc}"] icon: "tfc:firepit" id: "3B2550394C94CEC9" + shape: "circle" size: 1.0d subtitle: "{quests.metal_age.anvil_recycling.subtitle}" tasks: [{ @@ -646,6 +647,7 @@ } } id: "5792DDAA82895E67" + shape: "circle" subtitle: "{quests.metal_age.red_blu.subtitle}" tasks: [{ id: "63890641DCD6659F" @@ -719,6 +721,7 @@ description: ["{quests.metal_age.wrought_iron_goodies.desc}"] icon: "create:chute" id: "20C2CE92459BE14A" + shape: "circle" subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}" tasks: [{ id: "60605AA92B6947D8" @@ -734,6 +737,7 @@ description: ["{quests.metal_age.fire_clay_ingredients.desc}"] icon: "minecraft:cartography_table" id: "5A936E9BCF30AA3D" + shape: "circle" subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}" tasks: [{ id: "39CA01175999A291" @@ -816,6 +820,7 @@ description: ["{quests.metal_age.steel_goodies.desc}"] icon: "greate:steel_mechanical_pump" id: "0C9B7745D812555A" + shape: "circle" subtitle: "{quests.metal_age.steel_goodies.subtitle}" tasks: [{ id: "3EB7C3AE88950E4B" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 433379c42..753639ff5 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -19,20 +19,22 @@ { id: "39027CF4DC307D33" linked_quest: "5E186CD5E83BFDF0" - x: -28.5d + x: -27.0d y: 2.0d } { id: "0CE64B9914191C56" linked_quest: "6FFD4990FF07078A" shape: "diamond" - x: -9.5d + x: -9.0d y: 11.5d } { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - x: -12.5d + shape: "octagon" + size: 2.0d + x: -11.5d y: 8.0d } { @@ -40,27 +42,27 @@ linked_quest: "48A8E3210B2BAE1C" shape: "octagon" size: 2.0d - x: -28.5d + x: -27.0d y: 0.0d } { id: "7C03FE015586C652" linked_quest: "55213ACBF5F5D398" shape: "heart" - x: -12.0d + x: -10.5d y: 16.0d } { id: "65E0B13E245D2E5F" linked_quest: "379F434116632A89" - x: -26.0d + x: -24.5d y: 1.0d } { id: "68F5E521F2DB0A86" linked_quest: "0404FBCC34011053" shape: "heart" - x: -13.0d + x: -11.5d y: 16.0d } { @@ -77,6 +79,14 @@ x: -22.5d y: 4.0d } + { + id: "6C8C3BBD2BA9853B" + linked_quest: "56CA2EB7812529C5" + shape: "gear" + size: 1.5d + x: -13.0d + y: 13.5d + } ] quests: [ { @@ -84,7 +94,11 @@ "7B045998769930F0" "55FDF06AC0C01D0B" ] - description: ["{quests.steam_age.basic_millstone.desc}"] + description: [ + "{quests.steam_age.basic_millstone.desc.1}" + "{@pagebreak}" + "{quests.steam_age.basic_millstone.desc.2}" + ] id: "48C1E980F7D64317" size: 1.0d subtitle: "{quests.steam_age.basic_millstone.subtitle}" @@ -94,7 +108,7 @@ type: "item" }] title: "{quests.steam_age.basic_millstone.title}" - x: -20.5d + x: -19.0d y: 0.0d } { @@ -112,7 +126,7 @@ type: "item" }] title: "{quests.steam_age.horse_crank.title}" - x: -24.5d + x: -23.0d y: -2.0d } { @@ -131,7 +145,7 @@ type: "item" }] title: "{quests.steam_age.helve_hammer.title}" - x: -20.5d + x: -19.0d y: -4.0d } { @@ -159,7 +173,7 @@ } ] title: "{quests.steam_age.basic_greate.title}" - x: -20.5d + x: -19.0d y: -2.0d } { @@ -173,7 +187,7 @@ type: "item" }] title: "{quests.steam_age.water_wheel.title}" - x: -14.5d + x: -13.0d y: 0.0d } { @@ -195,7 +209,7 @@ } ] title: "{quests.steam_age.windmill.title}" - x: -14.5d + x: -13.0d y: -4.0d } { @@ -210,7 +224,7 @@ type: "item" }] title: "{quests.steam_age.metal_casing.title}" - x: -9.5d + x: -8.0d y: -2.0d } { @@ -227,7 +241,7 @@ type: "item" }] title: "{quests.steam_age.steel_encased_fan.title}" - x: -5.5d + x: -4.0d y: 4.0d } { @@ -247,7 +261,7 @@ type: "item" }] title: "{quests.steam_age.steel_pump.title}" - x: -3.5d + x: -2.0d y: 2.0d } { @@ -297,7 +311,7 @@ } ] title: "{quests.steam_age.steam_engine.title}" - x: -5.5d + x: -4.0d y: -2.0d } { @@ -316,7 +330,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_saw.title}" - x: -9.5d + x: -8.0d y: 0.0d } { @@ -330,7 +344,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_harvester.title}" - x: -9.5d + x: -8.0d y: -4.0d } { @@ -358,7 +372,7 @@ } ] title: "{quests.steam_age.chute.title}" - x: -12.0d + x: -10.5d y: 0.0d } { @@ -376,7 +390,7 @@ type: "item" }] title: "{quests.steam_age.mold_table.title}" - x: -3.5d + x: -2.0d y: 4.0d } { @@ -406,7 +420,7 @@ } ] title: "{quests.steam_age.steel_greate.title}" - x: -5.5d + x: -4.0d y: 2.0d } { @@ -424,7 +438,7 @@ type: "item" }] title: "{quests.steam_age.steel_millstone.title}" - x: -7.5d + x: -6.0d y: 2.0d } { @@ -523,8 +537,8 @@ } ] title: "{quests.steam_age.miner.title}" - x: -10.0d - y: 17.0d + x: -9.0d + y: 18.0d } { dependencies: [ @@ -681,7 +695,7 @@ type: "item" }] title: "{quests.steam_age.item_pipes.title}" - x: -12.0d + x: -10.5d y: 2.0d } { @@ -708,7 +722,7 @@ } ] title: "{quests.steam_age.circuit_boards.title}" - x: -10.0d + x: -9.0d y: 10.0d } { @@ -777,8 +791,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_tubes.title}" - x: -8.0d - y: 14.0d + x: -7.0d + y: 15.0d } { dependencies: ["7DB7AB5349218605"] @@ -828,7 +842,7 @@ type: "item" }] title: "{quests.steam_age.resistors.title}" - x: -5.0d + x: -4.0d y: 11.5d } { @@ -844,8 +858,8 @@ type: "item" }] title: "{quests.steam_age.coiling_machine.title}" - x: -5.0d - y: 16.0d + x: -4.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -860,8 +874,8 @@ type: "item" }] title: "{quests.steam_age.steel_mixer.title}" - x: -5.0d - y: 14.5d + x: -4.0d + y: 15.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -875,8 +889,8 @@ type: "item" }] title: "{quests.steam_age.lathe.title}" - x: -6.0d - y: 17.0d + x: -5.0d + y: 18.0d } { dependencies: [ @@ -913,8 +927,8 @@ type: "item" }] title: "{quests.steam_age.vibrating_table.title}" - x: -8.0d - y: 17.0d + x: -7.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -933,8 +947,8 @@ type: "item" }] title: "{quests.steam_age.rolling_mill.title}" - x: -5.0d - y: 13.0d + x: -4.0d + y: 14.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -948,8 +962,8 @@ type: "item" }] title: "{quests.steam_age.steel_saw.title}" - x: -7.0d - y: 17.0d + x: -6.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -963,8 +977,8 @@ type: "item" }] title: "{quests.steam_age.curving_press.title}" - x: -9.0d - y: 17.0d + x: -8.0d + y: 18.0d } { dependencies: [ @@ -1124,7 +1138,7 @@ } ] title: "{quests.steam_age.fluid_pipes.title}" - x: -3.5d + x: -2.0d y: 0.0d } { @@ -1150,7 +1164,7 @@ type: "item" }] title: "{quests.steam_age.fluid_drums.title}" - x: -1.5d + x: 0.0d y: 2.0d } { @@ -1179,8 +1193,8 @@ type: "item" }] title: "{quests.steam_age.potin.title}" - x: -3.5d - y: 14.5d + x: -2.5d + y: 15.5d } { dependencies: ["6F1BC99BE641B671"] @@ -1207,7 +1221,7 @@ } ] title: "{quests.steam_age.create_tools.title}" - x: -22.5d + x: -21.0d y: -4.0d } { @@ -1240,7 +1254,10 @@ y: 16.0d } { - dependencies: ["6AA07588374B59AB"] + dependencies: [ + "6AA07588374B59AB" + "56CA2EB7812529C5" + ] description: ["{quests.steam_age.vacuum_chamber.desc}"] id: "5F3063C539C9CBBF" subtitle: "{quests.steam_age.vacuum_chamber.subtitle}" @@ -1250,7 +1267,7 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -12.5d + x: -11.5d y: 15.0d } { @@ -1321,7 +1338,7 @@ } ] title: "{quests.steam_age.poor_paths.title}" - x: -26.0d + x: -24.5d y: -3.5d } { @@ -1373,7 +1390,7 @@ } ] title: "{quests.steam_age.normal_paths.title}" - x: -26.5d + x: -25.0d y: -2.0d } { @@ -1431,7 +1448,7 @@ } ] title: "{quests.steam_age.good_paths.title}" - x: -26.0d + x: -24.5d y: -0.5d } { @@ -1453,7 +1470,7 @@ type: "item" }] title: "{quests.steam_age.lv_circuit.title}" - x: -8.0d + x: -7.0d y: 8.0d } { @@ -1468,7 +1485,7 @@ type: "item" }] title: "{quests.steam_age.paper.title}" - x: -3.5d + x: -2.5d y: 11.5d } { @@ -1491,7 +1508,7 @@ type: "item" }] title: "{quests.metal_age.bronze_goodies.title}" - x: -22.5d + x: -21.0d y: -2.0d } { @@ -1515,7 +1532,7 @@ type: "item" }] title: "{quests.metal_age.wrought_iron_goodies.title}" - x: -12.0d + x: -10.5d y: -2.0d } { @@ -1539,7 +1556,7 @@ type: "item" }] title: "{quests.metal_age.steel_goodies.title}" - x: -5.5d + x: -4.0d y: 0.0d } { @@ -1621,7 +1638,7 @@ type: "item" }] title: "{quests.steam_age.rotation_speed_controller.title}" - x: -7.5d + x: -6.0d y: 0.0d } { @@ -1638,7 +1655,7 @@ type: "item" }] title: "{quests.steam_age.resin_boards.title}" - x: -11.5d + x: -10.5d y: 11.5d } { @@ -1672,7 +1689,7 @@ } ] title: "{quests.metal_age.coke_oven.title}" - x: -14.5d + x: -13.0d y: -2.0d } { @@ -1707,7 +1724,7 @@ type: "item" }] title: "{quests.steam_age.basic_mech_press.title}" - x: -18.5d + x: -17.0d y: -2.0d } { @@ -1730,7 +1747,7 @@ type: "item" }] title: "{quests.steam_age.steel_mech_press.title}" - x: -7.5d + x: -6.0d y: 4.0d } { @@ -1745,7 +1762,7 @@ type: "checkmark" }] title: "{quests.steam_age.fuel_sources.title}" - x: -7.5d + x: -6.0d y: -2.0d } { @@ -1759,7 +1776,7 @@ type: "item" }] title: "{quests.steam_age.large_water_wheel.title}" - x: -3.5d + x: -2.0d y: -2.0d } { @@ -1781,8 +1798,8 @@ type: "item" }] title: "{quests.steam_age.supers.title}" - x: -10.5d - y: 13.5d + x: -6.0d + y: 13.0d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -1811,7 +1828,7 @@ } ] title: "{quests.steam_age.multiblock_tank.title}" - x: -16.5d + x: -15.0d y: -2.0d } { diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index b429838d3..02786704d 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -1674,6 +1674,7 @@ } } id: "1562419608EB333D" + shape: "circle" size: 1.5d subtitle: "{quests.stone_age.hydration.subtitle}" tasks: [{ @@ -1847,6 +1848,7 @@ description: ["{quests.stone_age.water_bucket.desc}"] icon: "minecraft:water_bucket" id: "1F9321F1743A0B79" + shape: "circle" subtitle: "{quests.stone_age.water_bucket.subtitle}" tasks: [{ id: "64BE95016DF461FD" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 9f57ea394..897535008 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -790,7 +790,10 @@ y: 15.0d } { - dependencies: ["02FDECC931B5E8EF"] + dependencies: [ + "02FDECC931B5E8EF" + "3E6DC423FE4A99F7" + ] description: [ "{quests.tfg_tips.gt_power_tools.desc.1}" "{@pagebreak}" @@ -823,20 +826,13 @@ } } id: "2D2CB8104E40E808" + optional: true subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}" - tasks: [ - { - id: "5DA224C235E227E3" - title: "GT Tool" - type: "checkmark" - } - { - id: "5B0BF3A94CA0D8A9" - item: "gtceu:lv_charger_4x" - optional_task: true - type: "item" - } - ] + tasks: [{ + id: "5DA224C235E227E3" + title: "GT Tool" + type: "checkmark" + }] title: "{quests.tfg_tips.gt_power_tools.title}" x: 10.5d y: 11.5d diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 4f656545c..c07bbc0e6 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -190,6 +190,8 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Moon and Ostrum Harvesters:§r", "tooltip.moldraw.shift_view_molecule": "§7§oHold (Shift) for Molecular Structure§r", "tooltip.moldraw.shift_view_alloy": "§7§oHold (Shift) for Alloy Composition§r", + "gtceu.medical_condition.antidote.description.effect_removed": "Removes %s%% of the above conditions' effects", + "gtceu.medical_condition.antidote.description.effect_removed.all": "Removes all of the above conditions' effects", "gtceu.greenhouse": "Electric Greenhouse", "gtceu.steam_bloomery": "Steam Bloomery", "gtceu.food_oven": "Food Oven", diff --git a/kubejs/assets/tfg/alloys/weak_blue_steel.json b/kubejs/assets/tfg/alloys/weak_blue_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_blue_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/alloys/weak_red_steel.json b/kubejs/assets/tfg/alloys/weak_red_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_red_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c0d3908ba..518b158ad 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2898,10 +2898,10 @@ "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", "quests.low_voltage.lv_machine_hull.subtitle": "It's time to get into electricity", "quests.low_voltage.lv_machine_hull.desc.1": "You're getting real close to your &6first LV Machine&r and the beginning of the electric age! If you haven't made any &4Red Steel&r yet, you'll now have to, but in return you will get &6new ways&r to improve your production.\n\nThis is the GregTech philosophy: &6the further you progress, the better the new recipes become&r.\n\nTry to make at least 3 or 4 casings to begin.", - "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.\n\nLost on where to start? We recommend looking for machines that will make everything else cheaper, starting with the thing you hate the most.", - "quests.low_voltage.lv_machine_casing.title": "LV Machine Casing for Create?", + "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.\n\nAs a quick reminder, &cmachines explode when exposed to rain or water&r on any of the blocks they're adjacent to, unless the machine specifically says otherwise.", + "quests.low_voltage.lv_machine_casing.title": "Your next machines", "quests.low_voltage.lv_machine_casing.subtitle": "More options!", - "quests.low_voltage.lv_machine_casing.desc": "To make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", + "quests.low_voltage.lv_machine_casing.desc": "Now that you've got some electricity going, it's time to use it! We recommend starting by making machines that will make it easier and cheaper to make even more machines.\n\nTo make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", "quests.low_voltage.lv_motor.title": "The First of Many Motors", "quests.low_voltage.lv_motor.subtitle": "Low Voltage beckons...", "quests.low_voltage.lv_motor.desc": "Remember that &2EMI is your friend&r if recipes are getting overwhelming. You can click the button with four stacked squares on the bottom right of any recipe, and EMI will show you a tree of all the crafting ingredients, and you can even have it add a \"shopping list\" to your favourites!\n\nGetting back on topic, set yourself up for &7LV&r by crafting six &aLV Electric Motors&r! This may seem like a lot, but that's the bare minimum required to get to the good stuff in &7LV&r.", @@ -2917,19 +2917,18 @@ "quests.low_voltage.lost.task": "I know what to do now!", "quests.low_voltage.lv_steam_turbine.title": "The Steam Turbine", "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct additional turbines", - "quests.low_voltage.lv_steam_turbine.desc.1": "The &3Steam Turbine&r is one of the only generators you can realistically use in &7LV&r. &2Later, you'll unlock more interesting Power options&r, such as natural gases or petrols.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.", - "quests.low_voltage.lv_steam_turbine.desc.2": "If you're using a single &3Steam Turbine&r, you only need &a1x Tin Cables&r. On the other hand, if you upgrade to &32 Steam Turbines&r, you should use &a2x Tin Cables&r - else they may end up &cburning&r.\n\nThis is because of the &9Amperage&r mechanic... but that will be explained later so you can enjoy playing. Don't worry!", + "quests.low_voltage.lv_steam_turbine.desc": "The &3Steam Turbine&r is most players' first &7LV&r generator, as you've already got steam production set up from your Steam machines.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.\n\nOne downside of steam is transporting it, and due to its lack of energy density, you'll need large or huge pipes to carry it around. You may also consider upgrading to the Large Bronze Boiler once you start needing more power than what your single-block boilers can produce.", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", + "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF, or if you have a lot of steam multiblocks.", - "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake, or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", + "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake (no, infinite lava is not a thing), or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", "quests.low_voltage.lv_polariser.title": "Basic Polarizer", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "View the chapter by clicking here", + "quests.low_voltage.link_chapter.desc": "GregTech's energy system works differently to FE (Forge Energy), the system used by almost every other mod.\n\nIt might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter:", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", @@ -2945,7 +2944,7 @@ "quests.low_voltage.lv_seeds.desc": "If you come across these plants, you should pick them up and start a farm.\n\nThey will be your best source of &aSeed Oil&r, a liquid used for producing &eBio Diesel&r. Canola is a bit more resistant to lower temperatures, while Sunflowers are happier in warmer climates. You also could grow them in your Electric Greenhouse if you don't want to spend as much time farming, at the expense of having to spend a little power to grow them.", "quests.low_voltage.lv_seeds.task": "Canola or Sunflowers", "quests.low_voltage.lv_gas_turbine.title": "The Gas Turbine", - "quests.low_voltage.lv_gas_turbine.subtitle": "It needs more circuits but less materials", + "quests.low_voltage.lv_gas_turbine.subtitle": "For petrochemical enthusiasts", "quests.low_voltage.lv_gas_turbine.desc": "With the help of &7Syngas&r, you now have a viable way to use the &cGas Turbine&r at &7LV&r. They work exactly like the other &6generators&r but should be a tiny bit cheaper than the &6Combustion Generator&r.", "quests.low_voltage.lv_gas_syngas.title": "Syngas", "quests.low_voltage.lv_gas_syngas.subtitle": "Not Wood Gas", @@ -2957,15 +2956,6 @@ "quests.low_voltage.lv_turbo_charge.subtitle": "Useful to charge your electric tools faster", "quests.low_voltage.lv_turbo_charge.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Turbo Charger&r charges &6RF and EU&r items such as &9Drills&r extremely quickly.\n\nIt accepts up to 4 Amps for every item it charges, making it &6twice as fast&r as the &3Battery Buffer&r. It cannot discharge, though.\n\n&eAny&r Charger will complete this Quest.", "quests.low_voltage.lv_turbo_charge.task": "Any Turbo Charger will do", - "quests.low_voltage.lv_fisher.title": "Fishing Machine", - "quests.low_voltage.lv_fisher.subtitle": "Fully compatible with TFC!", - "quests.low_voltage.lv_fisher.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Fisher&r catches fish from Water. It requires a 5x5 area of Water directly below to operate. It uses the same loot table as normal Fishing. Each operation consumes 1 String and EU equivalent to its tier (32 for &7LV&r, etc.). That's about it.\n\n&eFish Oil&r can be extracted from Fish, which can be used for &6Bio Diesel&r.", - "quests.low_voltage.lv_fisher.task": "Any Fisher will do", - "quests.low_voltage.lv_rock_crusher.title": "Rock Crusher", - "quests.low_voltage.lv_rock_crusher.subtitle": "Cobble is Love, Cobble is Life", - "quests.low_voltage.lv_rock_crusher.desc.1": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Rock Breaker&r is effectively a Cobblestone Generator in a box. You can give it any raw rock or cobblestone block, and it will produce copies of it. Very handy if you want a lot of bricks fast!\n\n&eAny&r Rock Breaker will complete this Quest.", - "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3Lore:&r&o Obsidian requiring Redstone to generate is in reference to an ancient Minecraft bug, &7MC-4239&f. Placing Redstone where the Cobblestone would go in a cobble generator would make it generate Obsidian instead. This bug was resolved in snapshot 14w25b for Minecraft 1.8, over 9 years ago at the time of writing!", - "quests.low_voltage.lv_rock_crusher.task": "Any Rock Crusher will do", "quests.low_voltage.lv_aqueous_accumulator.title": "Aqueous Accumulator", "quests.low_voltage.lv_aqueous_accumulator.subtitle": "Thermal Foundation is calling", "quests.low_voltage.lv_aqueous_accumulator.desc": "The &3Aqueous Accumulator&r is basically a Rock Crusher but for fluids. Simply place the machine next to two source blocks of the appropriate fluid, set the circuit, and voila! It'll keep producing more of that fluid. It effectively does the same thing as a mechanical pump, but using electricity instead of mechanical power, so you may find it easier to fit into your factory. As a bonus, the HV one will make infinite lava too!\n\nYou can safely waterlog the source blocks to prevent them freezing in winter, and the machine will continue to work.", @@ -2986,13 +2976,13 @@ "quests.low_voltage.lv_lathe.task": "Any of these", "quests.low_voltage.universal_cell.title": "Better bucket", "quests.low_voltage.universal_cell.subtitle": "You can see inside, unlike those drums...", - "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nFluid Cells hold &done bucket&r of Fluid.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.", - "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r will hold more by then.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", + "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nThe basic Fluid Cells hold &done bucket&r of Fluid, while the Steel Cells hold eight buckets.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating. They're also significantly cheaper!", + "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r can hold even more.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", "quests.low_voltage.universal_cell.task": "Any cell", "quests.low_voltage.machine_auto_output_behaviour.title": "Machine Auto-Output Behaviour", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "Let's learn.", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "All machines typically have one &7Front Face&r, and one &9Output Face&r.\n\nThe &7Front Face&r should be obvious.\nThe &9Output Face&r is the face with a dot or hole on it. By default, this is at the back of the machine as you place it.\n\nMachines can &aauto-output&r through their output face. To enable auto-output, click the appropriate button in the GUI. Fluid and item auto-outputs are toggled separately. Further control over auto-outputs can be achieved with &dFilters&r and &dCovers&r, which are explained in the &dCover Behavior&r quest found in this chapter.", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.\n\nThere are unique machines that do not process recipes, such as the &3Pump&r, &3Miner&r, &3Fisher&r, &3Item Collector&r, etc. These machines will output on their &7Front Face&r (which is still marked as a dot).", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.", "quests.low_voltage.machine_auto_output_behaviour.task": "Hmm, how interesting!", "quests.low_voltage.programmed_circuits.title": "Programmed Circuits", "quests.low_voltage.programmed_circuits.subtitle": "Don't want to spend your circuits to select recipes?", @@ -3039,18 +3029,20 @@ "quests.low_voltage.lv_amp_explanation.subtitle": "Amps and You: a how-to", "quests.low_voltage.lv_amp_explanation.desc": "This questline serves as a quick guide to &9GregTech Amperage&r. As for &dVoltage&r mechanics, we'll go over those once you reach &bMV&r.\n\n&6&lTL;DR:&r For safety, match the Amperage limit of your Cables with the max amount of Amps provided by your Energy Producers.\n\nStill confused? Check the &cGregTech Energy&r chapter for a full rundown on GregTech's electricity system!", "quests.low_voltage.lv_ore_prospector.title": "This is Hacking", - "quests.low_voltage.lv_ore_prospector.subtitle": "The future of prospector", + "quests.low_voltage.lv_ore_prospector.subtitle": "Prospector NEO", "quests.low_voltage.lv_ore_prospector.desc": "The Prospector is an amazing tool that'll help you find veins in no time.\n\nIts GUI is interactive. Right-clicking will scan for ores, displaying them on a dynamic map.\n\n&l&3Lore:&r&o Back in OUR day, the portable Prospector was locked to &dLuV&f. Kids these days have it easy.", + "quests.low_voltage.night_vision_goggles.subtitle": "See in the dark!", + "quests.low_voltage.night_vision_goggles.desc": "Charge them up and put them on your face to get a permanent Night Vision effect as long as the batteries last! You can toggle this effect with a keybind, set to &aO&r by default.", "quests.low_voltage.lv_sprayer.title": "Spray Can", "quests.low_voltage.lv_sprayer.subtitle": "Time for server tag wars", - "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Chemical Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", + "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", "quests.low_voltage.other_machines.title": "But wait, there's more!", "quests.low_voltage.other_machines.subtitle": "You can't escape Greg...", "quests.low_voltage.other_machines.desc": "We won't go over the &dfull scale of regular Ore Processing&r. Why regular? Some ores require special treatment, but that's a topic for much later. Oh no, we're already getting carried away!\n\nSome machines like the &bChemical Bath&r or the &bElectrolyser&r could be useful.\n\nIntimidated by ore processing? Check the dedicated &cOre Processing&r chapter for a full walkthrough!", "quests.low_voltage.other_machines.task": "I agree to lose my sanity", "quests.low_voltage.lv_chemical_bath.title": "Basic Chemical Bath", "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", - "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making paper and leather &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", + "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making leather and treated wood &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", "quests.low_voltage.lv_chemical_bath.desc.2": "&lFor Ore Processing:&r\n\nSome &aCrushed Ores&r have alternate routes when washed into &aPurified Ore&r, involving bathing in either &aMercury&r or &aSodium Persulfate&r. This step isn't really important, unless you really want that special &6Byproduct&r. This can be a nice alternate source of Silver (hint, hint!).", "quests.low_voltage.lv_electroliser.title": "Basic Electrolyzer", "quests.low_voltage.lv_electroliser.subtitle": "It goes bzzz", @@ -3059,8 +3051,7 @@ "quests.low_voltage.lv_electroliser.desc.3": "&cTake caution!&r Due to how ores work, directly smelting dusts into Ingots can give higher metal yields than electrolysis. However, it means you lose the other products in the dust. You will have to decide whether you want to prioritise direct value, or byproduct count.", "quests.low_voltage.lv_mixer.title": "Basic Mixer", "quests.low_voltage.lv_mixer.subtitle": "The Mixer mixes...", - "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially the &4red steel&r for your machine hulls. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r.", - "quests.low_voltage.lv_mixer.task": "From Create or GregTech", + "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, since now it can directly make the &aColored Steel Dust&r. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. &7(Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r&7.)&r", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.", @@ -3068,12 +3059,12 @@ "quests.low_voltage.gallium_arsenide.subtitle": "I hate byproducts, they're awesome", "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r, or put &aCobaltite&r through an EBF.", "quests.low_voltage.lv_assembler.title": "Basic Assembler", - "quests.low_voltage.lv_assembler.subtitle": "This bad boy is assembling better than you and IKEA", - "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, this will &9&lnot help you immediately&r as it is &cexpensive.&r Most of the recipes you will want to pursue require &cfluids&r. Set up a little bit more infrastructure before rushing this.\n\nWith that out of the way, the &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", - "quests.low_voltage.lv_assembler.desc.2": "Once you have enough infrastructure you will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", + "quests.low_voltage.lv_assembler.subtitle": "No IKEA instruction manual required", + "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, we don't recommend trying to craft it as your first LV machine as it is &cexpensive.&r\n\nHowever, if you've followed the quests up to this point, now is a good time to craft it!\n\nThe &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", + "quests.low_voltage.lv_assembler.desc.2": "You will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used.\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", "quests.low_voltage.lv_assembler.task": "Basic Assembler", - "quests.low_voltage.t2_circuit_board.subtitle": "Yeah yeah it's wood but don't under estimate it", - "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the crafting recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", + "quests.low_voltage.t2_circuit_board.subtitle": "They don't make 'em like this any more...", + "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the Artisan Table recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", "quests.low_voltage.t2_circuit_board.desc.2": "&l&3Lore:&r&o Back in GTCEu 1.12.2, these circuit boards were called &2Good Circuit Boards&f. Not exactly a fitting name, as they're &4rather evil&f to craft.", "quests.low_voltage.lv_diode.title": "Diode", "quests.low_voltage.lv_diode.subtitle": "Don't be swayed by EMI!", @@ -3088,22 +3079,30 @@ "quests.low_voltage.lv_greenhouse.title": "Electric Greenhouse", "quests.low_voltage.lv_greenhouse.subtitle": "The power of &mKubejs&r... Java", "quests.low_voltage.lv_greenhouse.desc.1": "The multiblock &3Electric Greenhouse&r can be your source of &aLogs&r and other plants if you prefer making GregTech machines over Create contraptions. It also has the unique property of being able to grow more of TFC's decorative plants!", - "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be inproved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", + "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be improved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", "quests.low_voltage.lv_greenhouse.desc.3": "&l&3Lore:&r&o This multiblock was originally created for the GTCEu Community Pack, but is also available on the GTCEu developer documentation. It's significantly slower than default to keep in line with TFC's slower tree growing speeds, but prior to TFG 0.9, it used to take almost an hour for each recipe!\n\nIn TFG 0.11 it was remade from scratch with new recipes, a new structure, a mk2 in the form of the hydroponic facility and custom renders by RubenVerg.\n\nThe original subtitle for this quest was \"The power of Kubejs\" since originally it was an example of a custom machine that could be made in Kubejs--A dev kit. But now the structure is entirely made in Java to support TFC's food properties properly.", "quests.low_voltage.lv_centrifuge.title": "Basic Centrifuge", "quests.low_voltage.lv_centrifuge.subtitle": "It does the opposite of the Mixer", "quests.low_voltage.lv_centrifuge.desc.1": "&lOutside of Ore Processing:&r\n\nOh boy, what can't this machine do? Decomposition recipes to separate dust types, separating air, do your taxes, and many others...\n\nThe list is too long! Let's just say &cyou need the Centrifuge&r.", "quests.low_voltage.lv_centrifuge.desc.2": "&lFor Ore Processing:&r\n\nThis takes &aImpure Dust&r or &aPurified Dust&r and turns them into clean Dust, plus an added tiny Dust &6Byproduct&r. This is outside of the optimal chain for Byproducts, but this is also the cheapest Ore Processing machine of the presented array to run and to setup on a small scale.", "quests.low_voltage.lv_centrifuge.desc.3": "&l&3Lore:&r&o In base GTCE, this was objectively the strongest Ore Processing machine as it was fairly easy to use, and gave three tiny dusts, just like the Ore Washer or the Thermal Centrifuge. We tuned it down in favor of diversity.", - "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "Glued", "quests.low_voltage.lv_glue.subtitle": "What a sticky situation", - "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", + "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, for now).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r.\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_glue.task": "Glue", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nIf you don't have one yet, this machine will also cut &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", "quests.low_voltage.lv_cutter.task": "Any cutter", + "quests.low_voltage.lv_distillery.subtitle": "The distillery distills...", + "quests.low_voltage.lv_distillery.desc": "The Distillery is kind of like a centrifuge, but mostly for organic/petrochemical fluids.\n\nIn &7LV&r, you can only extract one output from one input, but this will change after you get to the Distillation Tower in &6HV&r.\n\nYou won't use this machine for all that much in LV (unless you're using Combustion fuel), but it's essential for obtaining &ePhenol&r.", + "quests.low_voltage.phenolic_resin.subtitle": "Artificial Resin", + "quests.low_voltage.phenolic_resin.desc.1": "Phenolic Resin is made from a chemical reaction of both &6Phenol&r and &aFormaldehyde&r. While you only really have two options for obtaining the Phenol in &7LV&r (distilling either Creosote or Heavy Fuel), the Formaldehyde will require &dMethane&r, which has more options.", + "quests.low_voltage.phenolic_resin.desc.2": "The simplest (and slowest) is with hydrogen and carbon in a chemical reactor, which will also require very slow water electrolysis.\n\nThe distillery also has many options, including via Creosote.\n\nIf you're using Syngas as a fuel, you can also oxidize that into Methane.\n\nLastly, if you're feeling silly, you can also centrifuge a ton of mushrooms from the Beneath.", + "quests.low_voltage.magnesia.subtitle": "Also the name of a place in Greece!", + "quests.low_voltage.magnesia.desc": "Also known as Magnesium Oxide, Magnesia can be obtained in two ways:\n\n- Magnesite Ore\n\n- React Magnesium and Lye to create Magnesium Hydroxide, then calcinate it in a Coke Oven. Magnesium can be obtained from a variety of different ores.", + "quests.low_voltage.refractory_brick.subtitle": "The Cooler™ Fire Bricks", + "quests.low_voltage.refractory_brick.desc": "It's almost time to tear down your old TFC blast furnace setup! If you'd like, you can recycle most of it down into &6Refractory Clay Dust&r (we recommend using the Arc Furnace so you get back both the dust and the iron!), otherwise you can cook up some more Fire Clay. Just make sure you've got a large stockpile of Steel first!\n\nFrom there, mix the refractory clay dust with some Magnesia, Graphite, and Resin to create the improved ceramics required for &dyour first Coils&r.", "quests.low_voltage.lv_gas_collector.title": "Basic Gas Collector", "quests.low_voltage.lv_gas_collector.subtitle": "It'll take your breath away", "quests.low_voltage.lv_gas_collector.desc": "The Gas Collector collects Air that can then be centrifuged into &aOxygen&r and &aNitrogen&r.\n\n&l&3Lore:&r&o GregTech 5 players remember when they had to use a Compressor with IC2 cells to get Compressed Air... here, cell chemistry is no more.", @@ -3111,7 +3110,7 @@ "quests.low_voltage.lv_oxygen.subtitle": "Achtually, it's Dioxygen...", "quests.low_voltage.lv_oxygen.desc.1": "You could waste &o&eprecious years of your life&r in JEI looking for the most optimal Oxygen recipe, given the many ways to obtain it. Various minerals will produce it when electrolyzed.\n\nIf only the quest book had more information!", "quests.low_voltage.lv_oxygen.desc.2": "Surprise! The best source according to us (!) is &acentrifuging Air&r after making a &dGas Collector&r, which you might not be able to make just yet. This recipe also gives &aNitrogen&r, which is handy as it can speed up certain &3Electric Blast Furnace&r recipes&r.\n\nThe second best source according to us (!) is &aelectrolyzing Silicon Dioxide&r. Silicon Dioxide is obtained from various sources, such as Glass Dust and various Stone Dusts. We will come back to &6this method later&r because this one is actually &6god&r.", - "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A bucket will also work.", + "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.", "quests.low_voltage.lv_oxygen.task": "Oxygen", "quests.low_voltage.lv_nitrogen.title": "Nitrogen Gas", "quests.low_voltage.lv_nitrogen.subtitle": "Your EBF booster", @@ -3129,7 +3128,7 @@ "quests.low_voltage.lv_chemical_reactor.subtitle": "Chemistry for dummies", "quests.low_voltage.lv_chemical_reactor.task": "Liquid Rubber", "quests.low_voltage.lv_chemical_reactor.desc.1": "The &3Chemical Reactor&r will be required for &la lot&r of recipes.\n\nLet's give it a spin - why don't we use your freshly made Chemical Reactor to unlock a new, &6better recipe for Rubber&r? Rubber is &dunusable&r as a Fluid, so you will need to make another machine to process it further.", - "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A Drum is the perfect candidate.", + "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.", "quests.low_voltage.lv_fluid_solidifier.title": "Basic Fluid Solidifier", "quests.low_voltage.lv_fluid_solidifier.subtitle": "The Fluid Solidifier solidifies...", "quests.low_voltage.lv_fluid_solidifier.desc": "Build this machine next to your &3Chemical Reactor&r to automatically solidify Rubber into &aRubber Sheets&r.\n\nYou can make your Chemical Reactor auto-output if you &dwrench&r the side of your &3Chemical Reactor&r and enable Fluid &9auto-output&r.\n\nThere will be more Fluids to solidify, so you may re-purpose your &3Fluid Solidifier&r when not crafting Rubber - or make a second one!", @@ -3172,13 +3171,26 @@ "quests.low_voltage.mv_hull.desc2": "Before going further into &bMV&r, remember that in &6TFG&r you can use &6Create&r to reinforce your infrastructure if you don't want to use too much of GregTech. Aluminium Shafts and Cogwheels have 4x the stress capacity of steel ones, so you should be able to run all your machines much faster with them!", "quests.low_voltage.aluminium_greate.title": "Aluminium-tier Greate", "quests.low_voltage.aluminium_greate.subtitle": "Also known as Medium Stress", - "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress more with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", + "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress production with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", "quests.low_voltage.oil.title": "Found Oil early?", "quests.low_voltage.oil.subtitle": "For LV overachievers", - "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, or better yet, use it to make a little &bPolyethylene&r!\n\nThe details of this are in the MV chapter, but at this point you can use the polyethylene to make a few things such as cheaper Machine Hulls and Diodes.", + "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, convert it into Diesel to power your base.", "quests.low_voltage.glowstone.title": "Permanent Lighting", "quests.low_voltage.glowstone.subtitle": "A roundabout way of inventing light bulbs", "quests.low_voltage.glowstone.desc": "Looking for some cheap, permanent light sources? Now that you've got an LV Extractor (and soon an LV Fluid Solidifer), you can put all that &6Glowstone Dust&r you found in The Beneath to work. Ran out? You can make more in a Mixer.\n\nCheck out JEI for all the new light sources you can make with both liquid glowstone and glowstone blocks. GregTech also has some made with glowstone dust in an assembler.\n\nAs a bonus, you can also use liquid glowstone as an infinite fuel for your lamps!", + "quests.low_voltage.next_machines.title": "Even more machines", + "quests.low_voltage.next_machines.subtitle": "Now the fun begins", + "quests.low_voltage.next_machines.desc": "Now that you've got a few machines going, it's time to put them to work.\n\nTo the right of this quest are some purely optional machines (we don't know where else to put them in this chapter!), but otherwise the Assembler will make electronic components cheaper, while the Chemical Reactor, Extractor, and Fluid Solidifier will make Rubber cheaper. After that, the rest of &7LV&r is yours to explore!", + "quests.low_voltage.food_machines.title": "Food Machines", + "quests.low_voltage.food_machines.subtitle": "Fast Food On The Go", + "quests.low_voltage.food_machines.desc": "The Food Processor and Electric Oven are two custom machines designed specifically to work with TerraFirmaCraft's food system.\n\nThe processor can handle mixing bowl recipes, soups, sandwiches, smoking, brining, drying... You name it, this machine can do it. Except for cooking. That's what the oven is for.\n\nThe Rotten Voiding Cover can be placed on any machine or Input Bus to automatically void any food items that become rotten. Useful to stop your food automation from getting backed up!", + "quests.low_voltage.bakelite.subtitle": "Also known as Poly­oxy­benzyl­methylen­glycol­anhydride... try saying that five times fast", + "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.", + "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV. The second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", + "quests.low_voltage.lv_forming_press.subtitle": "The Forming Press forms...", + "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can automate any remaining TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the Phenolic Circuit Board.", + "quests.low_voltage.lv_laser_engraver.subtitle": "Pew pew!", + "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitter's for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", "quests.medium_voltage": "&bMV&r - Medium Voltage", "quests.medium_voltage.subtitle": "Venture into petrochemistry and refine electronics", "quests.medium_voltage.mv_machine_hull.title": "Welcome to MV!", @@ -3870,7 +3882,8 @@ "quests.steam_age.create_tools.desc": "A wrench will let you quickly pick up Create blocks by Sneak + Right-Clicking on them, though an axe or pickaxe will still work too. The goggles will let you see much more detailed information about your machines, such as how much stress they're producing or consuming.\n\nBoth of these are optional for now, but will prove to be very useful, and you'll definitely want them later.\n\nCheck the TFG Tips chapter for help on glassblowing. Did you know that breaking cobblestone with a hammer will turn it into gravel, and breaking that again will turn it into sand...?", "quests.steam_age.basic_millstone.title": "Automatic Ore Processing", "quests.steam_age.basic_millstone.subtitle": "No more querning", - "quests.steam_age.basic_millstone.desc": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.1": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.2": "&l&3Lore:&r&o The millstone can't be used to process grains into flower because Create doesn't understand TFC's food expiry system, which previously led to all sorts of bugs involving rotten items becoming fresh and vice versa. Until you're able to get the Food Processor in &7LV&r, you can still crush your grains via a Mortar in a crafting grid.", "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", @@ -4061,7 +4074,7 @@ "quests.steam_age.rolling_mill.desc.2": "&l&3Lore:&r &oThis machine existed in older versions of TFG, but it made rods instead of plates, and your best plate-making option before the LV bender had a 20 percent chance of failure!&r", "quests.steam_age.steel_mixer.title": "Steel Mechanical Mixer", "quests.steam_age.steel_mixer.subtitle": "An earlier LV Mixer", - "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your colored steel dusts at a much more efficient rate than the Crucible! It can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", + "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your black steel dusts at a much more efficient rate than the Crucible! Unfortunately, it can't make red or blue steel dusts directly, but it can make their &aweak versions&r.\n\nIt can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", "quests.steam_age.potin.title": "Potin Seller...", "quests.steam_age.potin.subtitle": "...I'm going into battle, and I need only your finest Potin.", "quests.steam_age.potin.desc.1": "&dPotin Fluid Pipes&r have a &avery high throughput&r for the material tier and cost. You may want to look into making some of these to aid with fluid logistics.\n\nTo get &dPotin&r, you should start by crafting its &eDust&r form.\n\nThis quest calls for either the small or normal pipe. Get either size to complete it.", @@ -4081,7 +4094,7 @@ "quests.steam_age.what_next.desc": "If you rushed straight here, we suggest machines like the LV Bender, Wiremill, or Mixer first.\nOtherwise, if you made the kinetic machines below, we suggest the Assembler, Arc Furnace, Chemical Reactor, or Polarizer.", "quests.steam_age.alternator.title": "Alternators", "quests.steam_age.alternator.subtitle": "Turning stress into power", - "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of LV!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable LV energy. Be sure to hit it with a Soft Mallet to convert it to FE to EU mode.", + "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of &7LV&r!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable &7LV&r energy. Be sure to hit it with a Soft Mallet to convert it to &aFE to EU&r mode.", "quests.steam_age.alternator.desc.2": "An example of a steam engine producing 8 amps of LV!\n", "quests.steam_age.packager.title": "Create Logistics", "quests.steam_age.packager.subtitle": "\"We have AE2 at home\"", @@ -4268,6 +4281,7 @@ "quests.stone_age.medical_conditions.subtitle": "Don't eat the Asbestos", "quests.stone_age.medical_conditions.desc.1": "Be careful what you pick up! Not all ores or dusts are safe to touch, and some will cause a buildup of a &6Medical Condition&r.\n\nEverything &cHazardous&r is written on its tooltip, so if you suddenly notice a debuff appearing, get that item out of your inventory! Putting it inside a container like a small vessel or backpack is safe.\n\nMost of these effects will slowly go away on their own, but if you let them build up long enough, you'll start getting a host of other nasty effects, up to and including &cdeath&r.", "quests.stone_age.medical_conditions.desc.2": "You will eventually need to work with some of these materials, so you have ways to deal with them.\n\nThe best way is to avoid getting any conditions in the first place - a Face Mask and Rubber Gloves will prevent inhalation and contact hazards respectively.\n\nThe second-best way is a cure: check out some of the &aPills, Tablets, and Salvos&r you can craft - they all help cure certain effects (and provide helpful buffs!), though the stronger cures have more annoying side-effects.", + "quests.stone_age.medical_conditions.desc.3": "Be careful around anything &cCarcinogenic&r or &cRadioactive&r - these conditions are &epermanent&r until you're able to craft Paracetamol in &7LV&r.", "quests.stone_age.medical_conditions.task": "I'm my own doctor", "quests.stone_age.copper_for_anvil.title": "Copper for the Anvil", "quests.stone_age.copper_for_anvil.subtitle": "You better get used to getting 14 ingots of something.", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 6f8c264c6..a55a97db4 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -24,6 +24,9 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:antipoison_tablet'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.antipoison_tablet')) }) + event.addAdvanced(['tfg:polycaprolactam_fabric'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.polycaprolactam')) + }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1')); text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2')); diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 5ba0b86fc..81c14d48b 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -9,11 +9,11 @@ const registerCreateAdditionsRecipes = (event) => { // Прокатный стан event.recipes.gtceu.shaped('createaddition:rolling_mill', [ 'ABA', - 'CBC', - 'DED' + 'CEC', + 'DBD' ], { A: 'create:precision_mechanism', - B: 'greate:steel_shaft', + B: '#forge:rods/long/blue_steel', C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index aa6173590..6bfd0a31e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -757,7 +757,7 @@ function registerGreateRecipes(event) { 'FEG' ], { A: '#gtceu:circuits/ulv', - B: 'greate:steel_shaft', + B: '#forge:small_gears/blue_steel', C: 'gtceu:ulv_machine_hull', D: '#forge:plates/black_steel', E: 'gtceu:steel_whisk', @@ -766,7 +766,7 @@ function registerGreateRecipes(event) { }).id('greate:shaped/steel_mechanical_mixer') event.recipes.gtceu.assembler('greate:steel_mechanical_mixer') - .itemInputs('greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') + .itemInputs('#forge:small_gears/blue_steel', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') .itemOutputs('greate:steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index d50b81cc9..c23447eb6 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -85,4 +85,47 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:mixing/brass_ingot' }) event.remove({ id: /^greate:.*\/integration\/createaddition/ }) + + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_distilled_water' }) } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 17f880fdb..cb93b4faa 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -5,7 +5,7 @@ * @param {Internal.RecipesEventJS} event */ function registerGTCEuMachineRecipes(event) { - //#region Выход: Filter Casing + // Filter Casing event.shaped('gtceu:filter_casing', [ 'AAA', @@ -19,9 +19,7 @@ function registerGTCEuMachineRecipes(event) { E: '#forge:rotors/steel' }).id('gtceu:shaped/filter_casing') - //#endregion - - //#region Выход: Assembly Line Grating + // Assembly Line Grating event.shaped('2x gtceu:assembly_line_grating', [ 'ABA', @@ -34,9 +32,7 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:mv_electric_motor' }).id('gtceu:shaped/casing_grate_casing') - //#endregion - - //#region Gas Collectors + // #region Gas Collectors event.shaped('gtceu:lv_gas_collector', [ 'ABA', @@ -133,10 +129,9 @@ function registerGTCEuMachineRecipes(event) { D: '#gtceu:circuits/uv', E: 'gtceu:uv_machine_hull' }).id('gtceu:shaped/uv_gas_collector') + // #endregion - //#endregion - - //#region Forge Hammers + // #region Forge Hammers event.shaped('gtceu:lv_forge_hammer', [ 'ABA', @@ -233,10 +228,9 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:uv_machine_hull', E: '#tfc:red_or_blue_anvil', }).id('gtceu:shaped/uv_forge_hammer') + // #endregion - //#endregion - - //#region CokeOven + // #region Coke Oven event.remove({ id: 'gtceu:shaped/casing_coke_bricks' }) event.remove({ id: 'gtceu:compressor/coke_bricks' }) @@ -257,7 +251,6 @@ function registerGTCEuMachineRecipes(event) { .duration(50) .EUt(2); - // Coke Oven removeMaceratorRecipe(event, 'macerate_coke_oven') event.recipes.gtceu.shaped('gtceu:coke_oven', [ 'ABA', @@ -287,15 +280,12 @@ function registerGTCEuMachineRecipes(event) { A: 'gtceu:coke_oven_bricks', B: '#forge:chests/wooden' }).addMaterialInfo().id('gtceu:shaped/coke_oven_hatch') - //#endregion - //#region Выход: Стальные машины - // HP Steam Boilers removeMaceratorRecipe(event, 'macerate_hp_steam_solid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_solid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -303,12 +293,13 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: 'tfc:crucible', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_coal_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_liquid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_liquid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -316,7 +307,8 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: '#forge:glass', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_lava_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_solar_boiler') @@ -327,12 +319,13 @@ function registerGTCEuMachineRecipes(event) { ], { A: '#forge:glass_panes', B: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.Silver, 1), - C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1), + C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), D: 'gtceu:steel_brick_casing', E: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), }).addMaterialInfo().id('gtceu:shaped/steam_boiler_solar_steel') - // Экстрактор + // #region Other steam machines + removeMaceratorRecipe(event, 'macerate_hp_steam_extractor') event.recipes.gtceu.shaped('gtceu:hp_steam_extractor', [ 'BEB', @@ -347,7 +340,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.ring, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_extractor_steel') - // Дробитель removeMaceratorRecipe(event, 'macerate_hp_steam_macerator') event.recipes.gtceu.shaped('gtceu:hp_steam_macerator', [ 'BFB', @@ -362,7 +354,6 @@ function registerGTCEuMachineRecipes(event) { F: '#forge:raw_materials/diamond' }).addMaterialInfo().id('gtceu:shaped/steam_macerator_steel') - // Компрессор removeMaceratorRecipe(event, 'macerate_hp_steam_compressor') event.recipes.gtceu.shaped('gtceu:hp_steam_compressor', [ 'BCB', @@ -374,10 +365,9 @@ function registerGTCEuMachineRecipes(event) { C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1), D: ChemicalHelper.get(TagPrefix.plate, GTMaterials.WroughtIron, 1), E: 'minecraft:piston', - F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + F: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_compressor_steel') - // Молот removeMaceratorRecipe(event, 'macerate_hp_steam_forge_hammer') event.recipes.gtceu.shaped('gtceu:hp_steam_forge_hammer', [ 'DFD', @@ -392,7 +382,6 @@ function registerGTCEuMachineRecipes(event) { F: 'minecraft:piston' }).addMaterialInfo().id('gtceu:shaped/steam_hammer_steel') - // Печь removeMaceratorRecipe(event, 'macerate_hp_steam_furnace') event.recipes.gtceu.shaped('gtceu:hp_steam_furnace', [ 'BCB', @@ -406,7 +395,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_furnace_steel') - // Сплавщик removeMaceratorRecipe(event, 'macerate_hp_steam_alloy_smelter') event.recipes.gtceu.shaped('gtceu:hp_steam_alloy_smelter', [ 'FCF', @@ -420,7 +408,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_alloy_smelter_steel') - // Блоко-ломатель removeMaceratorRecipe(event, 'macerate_hp_steam_rock_crusher') event.recipes.gtceu.shaped('gtceu:hp_steam_rock_crusher', [ 'ECE', @@ -434,7 +421,6 @@ function registerGTCEuMachineRecipes(event) { E: ChemicalHelper.get(TagPrefix.screw, GTMaterials.WroughtIron, 1) }).addMaterialInfo().id('gtceu:shaped/steam_rock_breaker_steel') - // Miner removeMaceratorRecipe(event, 'macerate_hp_steam_miner') event.recipes.gtceu.shaped('gtceu:hp_steam_miner', [ 'EFE', @@ -451,7 +437,7 @@ function registerGTCEuMachineRecipes(event) { //#endregion - //#region passthrough hatches + //#region Passthrough hatches event.recipes.gtceu.shaped('gtceu:lv_item_passthrough_hatch', [ ' A ', 'BCB', @@ -623,6 +609,8 @@ function registerGTCEuMachineRecipes(event) { //#region ULV Hatches + event.replaceInput({ id: 'gtceu:shaped/ulv_machine_hull' }, '#forge:plates/wood', '#forge:plates/lead') + event.recipes.gtceu.shaped('gtceu:ulv_input_bus', [ 'CAC', 'CBC', diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 6c780ab13..d4dab7a2b 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -391,6 +391,8 @@ function removeGTCEURecipes(event) { //#region Выход: Бумажная пыль event.remove({ id: 'gtceu:shaped/paper_dust' }) + event.remove({ id: 'gtceu:shaped_fluid_container/paper' }) + event.remove({ id: 'gtceu:macerator/macerate_enchanting_table' }) //#endregion @@ -838,9 +840,13 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__granite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__diorite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__andesite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__marble' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__redrock' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__deepslate' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blackstone' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__endstone' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__red_granite' }) + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_tuff' }) removeMaceratorRecipe(event, 'macerate_end_stone'); removeMaceratorRecipe(event, 'macerate_end_stone_bricks'); @@ -900,6 +906,10 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:macerator/macerate_smooth_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_cut_sandstone' }) + + event.remove({ id: 'gtceu:rock_breaker/obsidian' }) + + event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_magnesia_refractory_brick_to_nugget' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 6953a1202..171d3841a 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -112,5 +112,7 @@ function registerGTCEUFluidTags(event) { event.add("c:hidden_from_recipe_viewers", "gtceu:damascus_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:blaze"); event.add("c:hidden_from_recipe_viewers", "gtceu:thorium"); - + + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_red_steel"); + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_blue_steel"); } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 6bc85679e..692fb88a4 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -21,7 +21,7 @@ const registerTFCRecipes = (event) => { ], { A: '#forge:double_plates/wrought_iron', B: 'tfc:crucible' - }).addMaterialInfo().id('tfc:crafting/blast_furnace') + }).id('tfc:crafting/blast_furnace') // Тыква -> Кусочки тыквы event.recipes.tfc.advanced_shapeless_crafting( @@ -250,4 +250,6 @@ const registerTFCRecipes = (event) => { .itemOutputs("4x tfc:powder/flux") .duration(50) .EUt(2); + + event.shapeless('4x tfc:fire_clay', ['tfc:fire_clay_block']) } diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index a4dd78bbc..90f5266bc 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -130,4 +130,11 @@ function removeTFCRecipes(event) { event.remove({ output: 'tfc:rustic_windmill_blade'}) event.remove({ output: 'tfc:lattice_windmill_blade'}) event.remove({ id: 'tfchotornot:heating/insulating_items'}) + + event.remove({ id: 'tfc:heating/metal/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_fire_ingot' }) + event.remove({ id: 'tfc:heating/metal/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_fire_ingot' }) } diff --git a/kubejs/server_scripts/tfcbetterbf/recipes.js b/kubejs/server_scripts/tfcbetterbf/recipes.js index 86cc9ad9e..941c5f5a5 100644 --- a/kubejs/server_scripts/tfcbetterbf/recipes.js +++ b/kubejs/server_scripts/tfcbetterbf/recipes.js @@ -4,16 +4,24 @@ * * @param {Internal.RecipesEventJS} event */ -const registerTFCBetterBFRecipes = (event) => { - event.remove("tfcbetterbf:heating/metal/insulation") - - event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulation`) +const registerTFCBetterBFRecipes = (event) => { + event.remove("tfcbetterbf:heating/metal/insulation") - event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulated_fire_bricks`) + event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulation`) - TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.WroughtIron, 3]) + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulation', [GTMaterials.WroughtIron, 3]) + + event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulated_fire_bricks`) + + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.get('tfg:refractory_clay'), 5, GTMaterials.WroughtIron, 3]) + + event.recipes.gtceu.packer('tfcbetterbf:insulated_fire_bricks') + .itemInputs('tfcbetterbf:insulated_fire_bricks') + .itemOutputs('tfc:fire_bricks', '3x tfcbetterbf:insulation') + .duration(20) + .EUt(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js new file mode 100644 index 000000000..fd46fbf09 --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -0,0 +1,70 @@ +"use strict"; + +function registerTFGBakeliteRecipes(event) { + + // TODO: move oil PE to MV + + event.recipes.gtceu.chemical_reactor('tfg:formaldehyde_from_methane') + .inputFluids('gtceu:methane 1000', 'gtceu:oxygen 1000') + .outputFluids('gtceu:formaldehyde 1000', 'gtceu:hydrogen 2000') + .circuit(1) + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + + // add phenol and methane to distillation + event.recipes.gtceu.distillation_tower('gtceu:distill_creosote') + .inputFluids('gtceu:creosote 1000') + .outputFluids('gtceu:lubricant 500') + .outputFluids('gtceu:phenol 50') + .outputFluids('gtceu:carbon_dioxide 200') + .outputFluids('gtceu:methane 250') + // this adds single-block distillery recipes too + .disableDistilleryRecipes(false) + .duration(8 * 20) + .EUt(96) + + event.recipes.gtceu.chemical_reactor('tfg:syngas_to_methane') + .inputFluids('tfg:syngas 1000') + .notConsumable('#forge:dusts/silver') + .outputFluids('gtceu:methane 100') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_reactor('tfg:phenolic_resin') + .inputFluids('gtceu:phenol 500', 'gtceu:formaldehyde 1000') + .notConsumable('#forge:dusts/sodium_hydroxide') + .outputFluids('tfg:phenolic_resin 1000') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_wood') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('tfg:treated_chipboard_composite') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_asbestos') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('#forge:dusts/asbestos') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.remove({ id: 'gtceu:assembler/phenolic_board' }) + + event.recipes.gtceu.forming_press('tfg:phenolic_board') + .itemInputs('2x #forge:foils/bakelite', '2x minecraft:paper', 'gtceu:resin_circuit_board') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.assembler('tfg:phenolic_board_pe') + .itemInputs('2x #forge:foils/polyethylene', 'gtceu:wood_plate') + .inputFluids('gtceu:phenol 50') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + event.replaceInput({ id: 'gtceu:shaped/mv_machine_hull' }, '#forge:plates/wrought_iron', '#forge:plates/bakelite') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.coils.js b/kubejs/server_scripts/tfg/machines/recipes.coils.js new file mode 100644 index 000000000..850945e8d --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.coils.js @@ -0,0 +1,77 @@ +"use strict"; + +function registerTFGCoilRecipes(event) { + + // #region Cupronickel Coil + + event.smelting('tfg:refractory_clay_dust', 'tfc:fire_clay') + + event.recipes.gtceu.chemical_reactor('tfg:magnesium_hydroxide') + .itemInputs('#forge:dusts/magnesium') + .inputFluids('tfc:lye 2000') + .itemOutputs('#forge:dusts/magnesium_hydroxide', '2x #forge:dusts/sodium') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.coke_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + + event.recipes.gtceu.pyrolyse_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + .EUt(GTValues.VHA[GTValues.MV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.alloy_smelter('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(8 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .category(GTRecipeCategories.INGOT_MOLDING) + + event.recipes.gtceu.forming_press('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(4 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.assembler('gtceu:coil_cupronickel') + .itemInputs('8x #forge:double_wires/cupronickel', '8x #forge:foils/blue_steel', '8x #forge:ingots/magnesia_refractory_brick') + .inputFluids('gtceu:tin_alloy 144') + .itemOutputs('gtceu:cupronickel_coil_block') + .duration(10 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true, true) + + // #endregion +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 65f5b2f21..3b40a47da 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -98,7 +98,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'gtceu:potin_large_fluid_pipe', C: 'gtceu:hp_steam_compressor' }).addMaterialInfo().id('gtceu:shaped/steam_squasher') @@ -108,7 +108,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'tfc:metal/anvil/steel', C: 'gtceu:hp_steam_forge_hammer', D: 'gtceu:potin_large_fluid_pipe' diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js index db441beb3..d132b768a 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js @@ -67,6 +67,35 @@ function registerTFGAlloyingRecipes(event) { .circuit(1) .EUt(GTValues.VA[GTValues.MV]) .blastFurnaceTemp(1000) + + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/red_steel' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/blue_steel' }) + + event.recipes.greate.mixing('#forge:dusts/weak_red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/weak_blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_blue_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:blue_steel_greate') //#endregion diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js index bdc455e77..8eabb675d 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js @@ -156,7 +156,7 @@ function processToolHead(event, headTagPrefix, tagPrefixName, extruderMold, cera .circuit(circuitMeta) .itemOutputs(toolHeadItem) .duration(material.getMass() * 6) - .EUt(GTValues.VA[GTValues.LV]) + .EUt(GTValues.VA[GTValues.MV]) } addMaterialRecycling(event, toolHeadItem, material, tagPrefixName, headTagPrefix); diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 5ea2bf0fd..0b256107b 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -187,19 +187,16 @@ function registerTFGClayRecipes(event) { .duration(20) .EUt(2) - event.recipes.gtceu.macerator('tfg:casting_channel') - .itemInputs('tfcchannelcasting:channel') - .itemOutputs('1x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) - - event.recipes.gtceu.macerator('tfg:mold_table') - .itemInputs('tfcchannelcasting:mold_table') - .itemOutputs('5x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) + var refractoryClay = GTMaterials.get('tfg:refractory_clay'); + TFGHelpers.registerMaterialInfo('tfc:blast_furnace', [GTMaterials.WroughtIron, 16, refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:fire_bricks', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:crucible', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_brick', [refractoryClay, 1]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:channel', [refractoryClay, 5/4]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:mold_table', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_ingot_mold', [refractoryClay, 5/2]) + TFGHelpers.registerMaterialInfo('tfg:rod_mold', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfg:small_gear_mold', [refractoryClay, 5]) // Renewable clay event.recipes.gtceu.rock_breaker("clay_duping") diff --git a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js index b6d6c956d..d79899f97 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js @@ -128,13 +128,6 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') - .itemInputs('1x gtceu:wood_plate') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_treated_wood_dust') .itemInputs('#tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:creosote', 50)) @@ -142,17 +135,9 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite') - .itemInputs('tfg:treated_chipboard_composite') - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(200) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') .itemOutputs('gtceu:resin_circuit_board') .duration(20 * 10) .EUt(GTValues.VA[GTValues.ULV]) - - event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 3366ed27d..eec9b4a7a 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -56,6 +56,8 @@ const registerTFGRecipes = (event) => { registerTFGMultiblockRecipes(event) registerTFGSteamBloomeryRecipes(event) registerTFGElectronicComponentsRecipes(event) + registerTFGBakeliteRecipes(event) + registerTFGCoilRecipes(event) registerTFGEarlyGasRecipes(event) registerTFGBoilerRecipes(event) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index be452a79f..4e125b161 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -16,7 +16,7 @@ function registerVintageImprovementsRecipes(event) { B: 'greate:steel_cogwheel', C: '#forge:rods/steel', D: '#forge:double_ingots/black_steel', - E: '#forge:small_gears/steel', + E: '#forge:small_gears/blue_steel', F: '#gtceu:circuits/ulv' }).addMaterialInfo().id('tfg:vi/shaped/spring_coiling_machine') @@ -27,8 +27,8 @@ function registerVintageImprovementsRecipes(event) { ], { A: 'gtceu:ulv_machine_casing', B: 'greate:steel_mechanical_pump', - C: 'create:mechanical_piston', - D: '#forge:springs/wrought_iron', + C: 'minecraft:piston', + D: '#forge:springs/blue_steel', E: 'create:electron_tube', F: '#forge:plates/black_steel', G: 'create:precision_mechanism' diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 38e7473b7..a00a7aea5 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -170,6 +170,8 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:molten_black_bronze_bucket", "gtceu:molten_bismuth_bronze_bucket", + "tfg:molten_weak_blue_steel_bucket", + "tfg:molten_weak_red_steel_bucket", //armor "gtceu:bronze_helmet", diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 985f022e4..e7c733f4f 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -106,6 +106,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(891, 1188, 1485, 5)); GTMaterials.BlueSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.RedSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_blue_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_red_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.Gold.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(636, 848, 1060, 1)); GTMaterials.Bismuth.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(162, 216, 270, 1)); @@ -282,7 +284,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.Zinc.addFlags(GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); - GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); + GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SPRING, GENERATE_SMALL_GEAR, GENERATE_FOIL); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); @@ -395,6 +397,8 @@ const registerGTCEuMaterialModification = (event) => { // Remove properties GTMaterials.Glass.getProperties().removeProperty(PropertyKey.GEM) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.INGOT) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.FLUID) // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 92fadd335..c71f7f7b5 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -73,14 +73,11 @@ const registerTFGItems = (event) => { // Add item for BTX Fuel event.create('tfg:catalyser_pt_re_zsm') - .translationKey('item.tfg.catalyser_pt_re_zsm') .texture('tfg:item/btx/catalyser_zsm') event.create('tfg:used_catalyser') - .translationKey('item.tfg.used_catalyser') .texture('tfg:item/btx/used_catalyser') event.create('tfg:loaded_resin') - .translationKey('item.tfg.loaded_resin') .texture('tfg:item/btx/loaded_resin') } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 7e8068be4..ad21a71ba 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -16,6 +16,14 @@ const registerTFGMaterials = (event) => { event.create('methoxy') .components('1x oxygen', '1x carbon', '3x hydrogen') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('methylene') + .components('1x carbon', '2x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('hydroxide') + .components('1x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) //#endregion registerTFGPowerReworkMaterials(event); @@ -65,6 +73,40 @@ const registerTFGMaterials = (event) => { .secondaryColor(0x67FFE6) .formula("(Al2Si2O5(OH)4)(BeK4N5)") + // Bakelite + event.create('tfg:bakelite') + .polymer() + .fluid() + .color(0xF29104) + .secondaryColor(0xD96005) + .components('1x phenol', '1x formaldehyde') + .flags( + GTMaterialFlags.DISABLE_DECOMPOSITION, + GTMaterialFlags.NO_SMELTING, + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_FOIL + ) + + event.create('tfg:phenolic_resin') + .fluid() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x phenol', '1x formaldehyde') + .color(0xFCD7A3) + + // Coils + + event.create('tfg:magnesium_hydroxide') + .dust() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x magnesium', '2x hydroxide') + .color(0xC6E4FF) + + event.create('tfg:magnesia_refractory_brick') + .dust() + .ingot() + .iconSet(GTMaterialIconSet.ROUGH) + .flags(GTMaterialFlags.NO_SMELTING) + .color(0xA69D96) //#region Tungsten Line diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index 1e5da063f..fcc217dd5 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -25,7 +25,6 @@ function registerTFGPrimitiveItems(event) { // Chipboard event.create('tfg:chipboard_composite') event.create('tfg:treated_chipboard_composite') - event.create('tfg:high_density_treated_fiberboard') // Wax event.create('tfg:paraffin_wax') diff --git a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js index 9edbd241e..1d6a7b7fd 100644 --- a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js @@ -94,5 +94,35 @@ function registerTFGPrimitiveMaterials(event) { .dust() .color(0xf0ccb4) .formula("C6H3(OH)3") - .iconSet('rough') + .iconSet(GTMaterialIconSet.ROUGH) + + // Fire clay + event.create('tfg:refractory_clay') + .dust() + .iconSet(GTMaterialIconSet.ROUGH) + .color(0xB49AA2) + .secondaryColor(0x60545F) + + // Weak colored steel + event.create('tfg:weak_blue_steel') + .dust() + .ingot() + .liquid() + .components('1x sterling_silver', '1x bismuth_bronze', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0x697FBD) + .secondaryColor(0x384B82) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) + + event.create('tfg:weak_red_steel') + .dust() + .ingot() + .liquid() + .components('1x brass', '1x rose_gold', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0xB55C5C) + .secondaryColor(0x7D3232) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 695ed3041..c3bbdfbfe 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -20,6 +20,9 @@ function registerTFGTagPrefixes(event) { TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); TagPrefix.plate.setIgnored(GTMaterials.RawRubber); TagPrefix.plateDouble.setIgnored(GTMaterials.RawRubber); + + TagPrefix.nugget.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) + TagPrefix.block.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) } function excludeAllGemsButNormal(material) {