From b0216c3161e9bb420765f5cdb477cddb47293a6f Mon Sep 17 00:00:00 2001 From: htmlcsjs <46023024+htmlcsjs@users.noreply.github.com> Date: Wed, 24 Sep 2025 22:46:34 +0100 Subject: [PATCH] Update GT to 7.2.0 (#141) --- config/ftbquests/quests/chapters/gtceu.snbt | 34 +++++-------------- .../quests/chapters/hv__high_voltage.snbt | 2 ++ .../quests/chapters/iv__insane_voltage.snbt | 4 +-- .../quests/chapters/lv__low_voltage.snbt | 6 ++-- .../ftbquests/quests/chapters/steam_age.snbt | 26 ++++++++++---- .../quests/chapters/uv__ultimate_voltage.snbt | 4 +-- index.toml | 20 +++++------ .../appliedenergistics2/extendedae2.js | 6 +++- mods/gregtechceu-modern.pw.toml | 6 ++-- pack.toml | 2 +- 10 files changed, 55 insertions(+), 55 deletions(-) diff --git a/config/ftbquests/quests/chapters/gtceu.snbt b/config/ftbquests/quests/chapters/gtceu.snbt index 754b151..4a54249 100644 --- a/config/ftbquests/quests/chapters/gtceu.snbt +++ b/config/ftbquests/quests/chapters/gtceu.snbt @@ -8,9 +8,7 @@ id: "gtceu:iron_wrench" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "2F8B0AFE317363C9" @@ -187,9 +185,7 @@ id: "gtceu:steel_axe" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "13354F24F80F65FB" @@ -743,9 +739,7 @@ id: "gtceu:steel_hammer" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "1A4DDB914D7D2F3C" @@ -781,9 +775,7 @@ id: "gtceu:steel_mining_hammer" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "4A365A7CC9E374F9" @@ -796,9 +788,7 @@ id: "gtceu:steel_mining_hammer" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "4F372C393ADC6CE2" @@ -908,9 +898,7 @@ id: "gtceu:iron_wrench" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "2001CB4968D3E0A2" @@ -990,9 +978,7 @@ id: "gtceu:iron_screwdriver" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "5C3501DD3B4788FA" @@ -1329,9 +1315,7 @@ id: "gtceu:iron_shovel" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } type: "item" @@ -1342,13 +1326,13 @@ Count: 1 id: "gtceu:iron_axe" tag: { + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { DisableShields: 1b TreeFelling: 1b } GT.Tool: { - Damage: 0 HarvestLevel: 2 MaxDamage: 255 ToolSpeed: 4.0f diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 02cd42f..f1827fb 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -461,6 +461,8 @@ "Visiting &dThe End&r allows you to access a richer Bauxite vein, as well as &9Ilmenite&r - an even better source of Rutile." "" "&9Tip:&r Ore processing for &aBauxite&r is ridiculously good! Including the &3Thermal Centrifuge&r step easily &6triples&r your &aRutile&r yield." + "" + "&9Bonus Tip:&r There is also an alternate route you can process &aPurified Bauxite&r in a &3Mixer&r and process into a greater return of &aRutile&r, however this is much harder to initally batch so it is more ideal to use when you set up a dedicated Titanium processing line." ] icon: "gtceu:rutile_dust" id: "59DFC4DA7D29C315" diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt index c43b8ab..0c33470 100644 --- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt +++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt @@ -1091,10 +1091,10 @@ Count: 1 id: "gtceu:polybenzimidazole_mallet" tag: { + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { } GT.Tool: { - Damage: 0 MaxDamage: 1023 } HideFlags: 2 @@ -1110,10 +1110,10 @@ Count: 1 id: "gtceu:polybenzimidazole_mallet" tag: { + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { } GT.Tool: { - Damage: 0 MaxDamage: 1023 } HideFlags: 2 diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 8c1eb07..2f772ff 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -2258,6 +2258,7 @@ id: "gtceu:lv_iron_drill" tag: { Charge: 2147483647L + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { AoEColumn: 1 @@ -2268,7 +2269,6 @@ MaxAoERow: 1 } GT.Tool: { - Damage: 0 HarvestLevel: 2 MaxDamage: 767 ToolSpeed: 6.0f @@ -2289,6 +2289,7 @@ id: "gtceu:lv_iron_drill" tag: { Charge: 2147483647L + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { AoEColumn: 1 @@ -2299,7 +2300,6 @@ MaxAoERow: 1 } GT.Tool: { - Damage: 0 HarvestLevel: 2 MaxDamage: 767 ToolSpeed: 6.0f @@ -2431,10 +2431,10 @@ Count: 1 id: "gtceu:polybenzimidazole_mallet" tag: { + Damage: 0 DisallowContainerItem: 0b GT.Behaviours: { } GT.Tool: { - Damage: 0 MaxDamage: 1023 } HideFlags: 2 diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt index 9434b43..7724699 100644 --- a/config/ftbquests/quests/chapters/steam_age.snbt +++ b/config/ftbquests/quests/chapters/steam_age.snbt @@ -299,9 +299,7 @@ id: "gtceu:red_steel_pickaxe" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } type: "item" @@ -496,7 +494,7 @@ "{@pagebreak}" "The &cOutput Hatch&r is where water will be generated. You can make it face up or down to auto-output water into your pipes, which can go ðrough&r the Treated Wood Frames - just place the pipe before you encase it in the frames. " "" - "When you reach &7LV&r or &bMV&r, you can use an Output Hatch from either tier to further boost the Pump's output." + "Later you can use a &8ULV&r or &7LV&r Output Hatch to further boost the Pump's output." "" "&2Reminder:&r Use a Wrench to rotate GregTech blocks (sneak right-click)." "" @@ -1141,6 +1139,7 @@ Count: 1 id: "gtceu:invar_mining_hammer" tag: { + Damage: 0 DisallowContainerItem: 0b Enchantments: [{ id: "minecraft:efficiency" @@ -1155,7 +1154,6 @@ MaxAoERow: 1 } GT.Tool: { - Damage: 0 HarvestLevel: 2 MaxDamage: 1151 ToolSpeed: 5.6f @@ -1619,9 +1617,11 @@ "" "The &3Wooden Multiblock Tank&r&r holds &a250,000 mB&r, but you won't be able to use it to store &chot Fluids&r such as Lava, or &cGases&r such as Steam or Oxygen." "" - "The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts the aforementioned fluid restrictions." + "The &3Bronze Multiblock Tank&r holds &a500,000 mB&r, lifiting the maximum fluid tempreture and can now store &cGases&r. " "" - "Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden one instead." + "The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts all the aforementioned fluid restrictions." + "" + "Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden or Bronze one instead." "{@pagebreak}" "Fluid transfer can either be facilitated through the Controller block, or through up to &atwo Valves&r." "" @@ -1665,6 +1665,10 @@ } { Count: 1b + id: "gtceu:bronze_multiblock_tank" + } + { + Count: 1 id: "gtceu:steel_multiblock_tank" } ] @@ -1684,6 +1688,10 @@ Count: 1b id: "gtceu:wooden_tank_valve" } + { + Count: 1b + id: "gtceu:bronze_tank_valve" + } { Count: 1b id: "gtceu:steel_tank_valve" @@ -1706,6 +1714,10 @@ Count: 1b id: "gtceu:solid_machine_casing" } + { + Count: 1b + id: "gtceu:steam_machine_casing" + } { Count: 1b id: "gtceu:wood_wall" diff --git a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt index cfeb49b..1d13c74 100644 --- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt +++ b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt @@ -61,9 +61,7 @@ id: "gtceu:iron_wrench" tag: { Damage: 0 - GT.Tool: { - Damage: 0 - } + GT.Tool: { } } } id: "6E8F257261F93501" diff --git a/index.toml b/index.toml index 7ffd26b..375fec9 100644 --- a/index.toml +++ b/index.toml @@ -122,7 +122,7 @@ hash = "07fe5025de4ecd299a214260c8d6df1a9dd8094a7bf7a7362e59f4027270d3b0" [[files]] file = "config/ftbquests/quests/chapters/gtceu.snbt" -hash = "cecf5d83950dfd7d9943dfa54deac0545ced65b165b6819a405c02f13d40de80" +hash = "8328695fce4ed23b94fa2e54e431e59ede189e4a9ed1f76b9e6eec24639b7e8b" [[files]] file = "config/ftbquests/quests/chapters/heating_coils.snbt" @@ -130,11 +130,11 @@ hash = "3de3b8987fbd6652079f9a6f8ff7f0d140753eb94563b31554648a09990d89e1" [[files]] file = "config/ftbquests/quests/chapters/hv__high_voltage.snbt" -hash = "3e4ed0a11278da6cd1a4056b45370df93ed53c5525500a7b26743948bae3e5c7" +hash = "c7509bc06ae4bc0a5667610206be7cc8d2c9db244543adeba6b9a3f45c7f09eb" [[files]] file = "config/ftbquests/quests/chapters/iv__insane_voltage.snbt" -hash = "dd54590b939ae9dc5d053f794eac6d727d84b70bac05f90a3c8c4f2d2b7bae7a" +hash = "47e9a9124100e3e5d67af25dd1c2fa07a852a80f50d62d61588050960a2dd2fa" [[files]] file = "config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt" @@ -142,7 +142,7 @@ hash = "b68e2e3c85c5f70f5f1938e31ec228684cc08e823bca4e4170fb92e9339b2670" [[files]] file = "config/ftbquests/quests/chapters/lv__low_voltage.snbt" -hash = "2b7d8c6d348728a194348d6ec35da2c8775ec23776688e6b90e72a36c2a48fb5" +hash = "30fd5fb575e5a138f51de82459c5aa32708697d36a4690d4ed33f89ab6a4673f" [[files]] file = "config/ftbquests/quests/chapters/multiblock_dilemma.snbt" @@ -170,7 +170,7 @@ hash = "070e4c59640dc3014745eb4f2b83f918342a92c7dbec9a44c7e003500de90904" [[files]] file = "config/ftbquests/quests/chapters/steam_age.snbt" -hash = "7dfdebf57e389951e58ece3928f1e3826e1ded6e3e51da86edbd865d96994e26" +hash = "15f51039f3f8e730257b352a4ec337fb292c3e2a0213a049f90d4d485e6f4434" [[files]] file = "config/ftbquests/quests/chapters/tips_and_tricks_2.snbt" @@ -178,7 +178,7 @@ hash = "171dd9f3683bd2a82752e7cba96c8a4e44f5370e7ba1a819838eb5be7a652e0a" [[files]] file = "config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt" -hash = "9cc17a62f1d3504f9b0c2b923ef0130981a258900c52b743ac64b14c43e64162" +hash = "29cbbea672860c7c190eecdcfe8d9b183017a1c68b517b84c02675c0f8380f30" [[files]] file = "config/ftbquests/quests/chapters/zpm__zero_point_module.snbt" @@ -394,7 +394,7 @@ hash = "1dcee38470c2939f7265891203775b7631c81822bf2506a451727fcaaf2cc4a2" [[files]] file = "config/xaerominimap.txt" -hash = "59e679328251ff4aa7f0520a83e1d2d324e6119ce865fcb5146af03666fb9216" +hash = "633cb4a20c7ac18b6cbab3010650c7b100f20f92b20469e223815fd5ca82310e" [[files]] file = "config/xaerominimap_entities.json" @@ -410,7 +410,7 @@ hash = "103979a8e59e396f99fb8646c4f8a690c2d743ca3744a2eb8f663b3102b7498c" [[files]] file = "config/xaeroworldmap.txt" -hash = "5f5bdca3065e80bb07e21c346365c5b05fb999a938d4bee8cd3f227184f73afb" +hash = "0032589daad191eafe1a1da6476f1e3cd4c4f8381a306227e5247837cb466dc8" [[files]] file = "defaultconfigs/ftbchunks/client-config.snbt" @@ -578,7 +578,7 @@ hash = "e68a97b24aa63aa8290b9891b02af7499ccd7f9a1dc2ef2cc3d183d660c48177" [[files]] file = "kubejs/server_scripts/appliedenergistics2/extendedae2.js" -hash = "bee90f3cad28ab6d5c15a80b6ed1400a1969a0088b045c72ee2d923f794668f3" +hash = "17e494a87f0b9d1b242a90f75fa3ae8903db2c76a87ab1a9152394ec3798f766" [[files]] file = "kubejs/server_scripts/appliedenergistics2/inscriber.js" @@ -966,7 +966,7 @@ metafile = true [[files]] file = "mods/gregtechceu-modern.pw.toml" -hash = "f76dcc4122bcbc77ce67812b83013c7728c84c26b24321ab4ce2e650eb1688f4" +hash = "405441ee4b2caa3503f94720d00f9d86d804ab5cba09fb65f13cee4be11c3e39" metafile = true [[files]] diff --git a/kubejs/server_scripts/appliedenergistics2/extendedae2.js b/kubejs/server_scripts/appliedenergistics2/extendedae2.js index 930292e..5316ced 100644 --- a/kubejs/server_scripts/appliedenergistics2/extendedae2.js +++ b/kubejs/server_scripts/appliedenergistics2/extendedae2.js @@ -10,6 +10,7 @@ ServerEvents.recipes((event) => { "gtceu:soc", "#gtceu:circuits/hv" ) + .circuit(1) .itemOutputs("expatternprovider:ex_pattern_provider") .duration(200) .EUt(50); @@ -22,11 +23,12 @@ ServerEvents.recipes((event) => { "gtceu:soc", "#gtceu:circuits/hv" ) + .circuit(1) .itemOutputs("expatternprovider:ex_interface") .duration(200) .EUt(50); - // extended thermal upgrade shit + // extended upgrades (like thermal) event.remove({ id: "expatternprovider:epp_upgrade" }); greg .assembler("extended_pattern_provider_upgrade") @@ -35,6 +37,7 @@ ServerEvents.recipes((event) => { "gtceu:soc", "#gtceu:circuits/hv" ) + .circuit(2) .itemOutputs("expatternprovider:pattern_provider_upgrade") .duration(180) .EUt(50); @@ -42,6 +45,7 @@ ServerEvents.recipes((event) => { greg .assembler("extended_interface_upgrade") .itemInputs("4x ae2:logic_processor", "gtceu:soc", "#gtceu:circuits/hv") + .circuit(2) .itemOutputs("expatternprovider:interface_upgrade") .duration(180) .EUt(50); diff --git a/mods/gregtechceu-modern.pw.toml b/mods/gregtechceu-modern.pw.toml index 46b8431..d627cd9 100644 --- a/mods/gregtechceu-modern.pw.toml +++ b/mods/gregtechceu-modern.pw.toml @@ -1,13 +1,13 @@ name = "GregTech CEu Modern" -filename = "gtceu-1.20.1-7.1.4.jar" +filename = "gtceu-1.20.1-7.2.0.jar" side = "both" [download] hash-format = "sha1" -hash = "3592865e7174fd2d2305ccd043439c39936e67f8" +hash = "d41938569195b8b6a971a24f950f7999dfeba852" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 6862094 +file-id = 7022042 project-id = 890405 diff --git a/pack.toml b/pack.toml index 03a2acd..25aefeb 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "b0e82bcea7517ca61cd6d0fde9fca3f04c073bdb1ccf325e4cece30b5768d28b" +hash = "92b59557c10917e9257ebe8d13ce2539de6767daa400ca5b161bce35693be251" [versions] forge = "47.4.6"