diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index a6cb44d8f..af8feae53 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1033,6 +1033,9 @@ "{quests.medium_voltage.mv_fluid_rig.desc.3}" "{@pagebreak}" "{quests.medium_voltage.mv_fluid_rig.desc.4}" + "{@pagebreak}" + "{quests.medium_voltage.mv_fluid_rig.desc.5}" + "{image:tfg:textures/quests/prospector_gui.png width:200 height:120 align:center}" ] icon: "gtceu:mv_fluid_drilling_rig" id: "05ADBAE5B6F38956" diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 73a72333a..1062a46a6 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1104,6 +1104,7 @@ "ftbfiltersystem:filter": "or(custom(HasPreservation/tfc:wood_grilled)custom(HasPreservation/firmaciv:oven_baked))" } } + optional_task: true title: "{quests.tfg_tips.cook_meat.task.1}" type: "item" } @@ -1116,9 +1117,15 @@ "ftbfiltersystem:filter": "or(item(tfc:wrought_iron_grill)item(firmalife:cured_oven_top))" } } + optional_task: true title: "{quests.tfg_tips.cook_meat.task.2}" type: "item" } + { + id: "3277299EE8419365" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } ] title: "{quests.tfg_tips.cook_meat.title}" x: 5.0d diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index c22705e7e..f23ab8152 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -5,15 +5,6 @@ group: "19428C6E7A36D463" icon: "create:white_toolbox" id: "254D02A31AA8EB49" - images: [{ - color: 16762887 - height: 2.0d - image: "ftbquests:block/barrier_open" - rotation: 0.0d - width: 2.0d - x: -10.5d - y: 2.0d - }] order_index: 3 quest_links: [ { @@ -2005,23 +1996,6 @@ x: -8.0d y: 2.0d } - { - dependencies: ["7A200766AAC1EE19"] - description: ["{quests.tfg_tips.grapple_repair.desc}"] - icon: "createdeco:decal_warning" - id: "1F93C858F1D02F7C" - shape: "none" - size: 2.0d - subtitle: "{quests.tfg_tips.grapple_repair.subtitle}" - tasks: [{ - id: "1269BD886B07619D" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - }] - title: "{quests.tfg_tips.grapple_repair.title}" - x: -10.5d - y: 2.0d - } { dependencies: ["6C64C20FF5DF972A"] description: ["{quests.tfg_tips.grapple_length.desc}"] @@ -2072,7 +2046,7 @@ y: 0.0d } { - dependencies: ["1F93C858F1D02F7C"] + dependencies: ["7A200766AAC1EE19"] description: [ "{quests.tfg_tips.grapple_upgrades.desc.1}" "{@pagebreak}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 1b33043f3..55fda84f3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -4368,9 +4368,6 @@ "quests.tfg_tips.grappling_hook.title": "Grappling Hook", "quests.tfg_tips.grappling_hook.subtitle": "This is going to end poorly", "quests.tfg_tips.grappling_hook.desc": "By combining 2 pieces of &aRope Coil&r and a &bWrought Iron Pickaxe Head&r, you can create a &dGrappling Hook!&r An ideal tool for scaling big mountains, exploring large caves and traversing the world. It contains an &eupgrade system&r that allows you to combine and modify your &dHook&r to your leisure.", - "quests.tfg_tips.grapple_repair.title": "Grappling Hook Warnings", - "quests.tfg_tips.grapple_repair.subtitle": "READ ME, OR YOU MAY REGRET IT LATER!", - "quests.tfg_tips.grapple_repair.desc": "All your &dGrappling Hook&r &aupgrades&r are stored as NBT Data inside the item. This means trying to repair your hook using &canother&r Grappling Hook &l&cWILL destroy all your upgrades!&r\n\nInstead, you should place your &dGrappling Hook&r and some &bWrought Iron Dust&r in a &3Workbench&r to repair it.\n\nAlso, don't use your Grappling Hook when traveling between the Overworld and Beneath, it's rather deadly.", "quests.tfg_tips.grapple_upgrades.title": "Upgrading your Grappling Hook", "quests.tfg_tips.grapple_upgrades.subtitle": "Balanced around TFG, of course!", "quests.tfg_tips.grapple_upgrades.desc.1": "Upgrading your &dGrappling Hook&r consists of adding or removing items to it via the &3Workbench&r.&r\n\nTo see all the upgrades you can apply to your &dGrappling Hook&r, you can press the \"Usage\" key in &2EMI.&r\nEach of the custom recipes will contain text describing what changes are being applied.", diff --git a/kubejs/assets/tfg/textures/quests/prospector_gui.png b/kubejs/assets/tfg/textures/quests/prospector_gui.png new file mode 100644 index 000000000..46ff117ad Binary files /dev/null and b/kubejs/assets/tfg/textures/quests/prospector_gui.png differ diff --git a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js index d960d60b3..a6826317b 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js @@ -218,13 +218,17 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('tfg:syngas', 1)) .EUt(-(32)) .duration(20*0.2) - + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + // Reformate Gas event.recipes.gtceu.gas_turbine('tfg:reformate_gas') // Gas Turbine .inputFluids(Fluid.of('tfg:reformate_gas', 1)) .EUt(-(32)) .duration(20*0.6) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') // BTX Fuel @@ -232,6 +236,8 @@ function registerTFGEarlyGasRecipes(event) { .inputFluids(Fluid.of('tfg:btx_fuel', 1)) .EUt(-(32)) .duration(20*2.6) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') //#endregion @@ -310,7 +316,8 @@ function registerTFGEarlyGasRecipes(event) { .outputFluids(Fluid.of('tfg:btx_fuel', 48000)) .duration(20*6) .EUt(GTValues.VA[GTValues.IV]) - + .circuit(24) + // Loop event.recipes.gtceu.macerator('tfg:catalyser_power') @@ -365,4 +372,4 @@ function registerTFGEarlyGasRecipes(event) { -} \ No newline at end of file +}