From 0d5c176d3a4ad9d8921583d79e0b4521ab503806 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 00:26:09 +0100 Subject: [PATCH 01/48] added a resource pack that makes some animals look nicer --- pakku-lock.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 857a69258..b4276ec52 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5878,6 +5878,39 @@ } ] }, + { + "pakku_id": "v7A0bgYd4KcqmpVA", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "new-animals-for-terrafirmacraft" + }, + "name": { + "curseforge": "New Animals for TerraFirmaCraft" + }, + "id": { + "curseforge": "1246070" + }, + "files": [ + { + "type": "curseforge", + "file_name": "TerraFirmaCraft_New_Animals.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6436/812/TerraFirmaCraft_New_Animals.zip", + "id": "6436812", + "parent_id": "1246070", + "hashes": { + "sha1": "c3318956eff6b4c9e49e81b89ff2b49eaf16d4dc", + "md5": "09466b7016348fb845c40886f466e9b2" + }, + "required_dependencies": [], + "size": 65591, + "date_published": "2025-04-18T17:00:53.570Z" + } + ] + }, { "pakku_id": "PelbQK42HFCTe5cc", "type": "MOD", From 80fff75580bcdee0f4384b172e8735aa12632989 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:44:37 +0100 Subject: [PATCH 02/48] fixes #1130 --- config/ftbquests/quests/chapters/queststfc_tips.snbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 219a9f019..c9a45c9e9 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1996,7 +1996,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)custom(HasPreservation/tfc:brined)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)custom(HasPreservation/tfc:brined)" } } title: "{quests.tfg_tips.smoke_meat.task}" @@ -5269,7 +5269,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)item(tfc:food/pork)" } } title: "{quests.tfg_tips.bacon.task}" From 1942321b1c79be7a7e251d4400737edc935eac1b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:48:45 +0100 Subject: [PATCH 03/48] added clean-swing-through-grass mod --- pakku-lock.json | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index a04aece95..3176e285f 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1462,6 +1462,44 @@ } ] }, + { + "pakku_id": "0Cv6dO3ZGvsziQH1", + "type": "MOD", + "slug": { + "curseforge": "clean-swing-through-grass" + }, + "name": { + "curseforge": "Clean Swing Through Grass" + }, + "id": { + "curseforge": "915308" + }, + "files": [ + { + "type": "curseforge", + "file_name": "cleanswing-1.20-1.8.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5962/530/cleanswing-1.20-1.8.jar", + "id": "5962530", + "parent_id": "915308", + "hashes": { + "sha1": "c128e24c47ab4a389b3868ff6913ee0631f254e8", + "md5": "84f9950e09245d82f72a6461f57ca30f" + }, + "required_dependencies": [], + "size": 8305, + "date_published": "2024-12-04T16:23:38.883Z" + } + ] + }, { "pakku_id": "PDE7RB7hlFnTfgkq", "type": "MOD", @@ -2494,7 +2532,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "BOTH", + "side": "CLIENT", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6592,7 +6630,6 @@ "id": { "curseforge": "585406" }, - "export": false, "files": [ { "type": "curseforge", From e8c9346f8aa5f46900b9a37d7d3ee2da6bf1feb3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:12:01 +0100 Subject: [PATCH 04/48] added computercraft/advanced peripherals resource pack --- pakku-lock.json | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 3176e285f..4aabc5f2a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1689,6 +1689,45 @@ } ] }, + { + "pakku_id": "On44S9fQbI0vVJTW", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "computercraft-greg-flavored" + }, + "name": { + "curseforge": "ComputerCraft: Greg Flavored" + }, + "id": { + "curseforge": "1061743" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "mc_versions": [ + "1.20.2", + "1.20.5", + "1.20.3", + "1.20.1", + "1.20", + "1.20.6", + "1.20.4" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5560/613/ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "id": "5560613", + "parent_id": "1061743", + "hashes": { + "sha1": "6d1d3642537c40ea813507379941773a49c62f28", + "md5": "57d0168a3d006bca79603d0646594f83" + }, + "required_dependencies": [], + "size": 957439, + "date_published": "2024-07-24T09:35:57.853Z" + } + ] + }, { "pakku_id": "MaU4DxZPJWpFlsaT", "type": "MOD", From 7dc2130819b445ebab6e1cb5660bd66843a209cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:13:55 +0100 Subject: [PATCH 05/48] fixes #1134 --- CHANGELOG.md | 3 +++ kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63c4b0cc..937e6bd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### New features ### Changes +### Bug fixes +- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025 ### New features diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index a3b5bbbc8..1e63e277e 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -666,7 +666,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`) .itemInputs(unfinishedLampStack) - .itemOutputs([materialIngotStack, glassDustStack]) + .itemOutputs(materialIngotStack) .duration(material.getMass() * 8) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) From a99c2da26cf2893856dad90a08e083a77605a2b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:24:04 +0100 Subject: [PATCH 06/48] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 937e6bd65..7249d00ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### New features ### Changes ### Bug fixes +- Fixed trowel being consumed on use @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025 From 0ab15723923dd92fb78703b380f9c06c0335d9d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 23:29:34 +0100 Subject: [PATCH 07/48] added a bunch of circuits to create's assembler recipes --- kubejs/server_scripts/create/recipes.js | 28 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 7035d80c8..684b6ff15 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -373,6 +373,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:rope_pulley') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(22) // Шкиф подъемника event.shaped('create:elevator_pulley', [ @@ -411,6 +412,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:cart_assembler') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(21) // Контроллер рельсы event.shaped('create:controller_rail', [ @@ -477,6 +479,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_drill') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(19) event.shaped('create:mechanical_roller', [ 'GBG', @@ -497,6 +500,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_roller') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(20) // Редстоуновый контакт event.shaped('2x create:redstone_contact', [ @@ -555,7 +559,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('tfg:create/mechanical_plough') .itemInputs('3x #forge:hoe_heads', '2x #forge:plates/wrought_iron', '#tfg:small_cogwheels', 'create:andesite_casing') - .circuit(4) + .circuit(5) .itemOutputs('create:mechanical_plough') .duration(200) .EUt(20) @@ -715,7 +719,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_funnel') .itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber') .itemOutputs('create:andesite_funnel') - .circuit(4) + .circuit(6) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -732,7 +736,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_funnel_leather') .itemInputs('#forge:plates/wrought_iron', '#forge:leather') .itemOutputs('create:andesite_funnel') - .circuit(4) + .circuit(7) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -752,7 +756,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_funnel') .itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube') .itemOutputs('2x create:brass_funnel') - .circuit(6) + .circuit(8) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -771,7 +775,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_funnel_leather') .itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube') .itemOutputs('2x create:brass_funnel') - .circuit(6) + .circuit(9) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -789,7 +793,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_tunnel') .itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber') .itemOutputs('create:andesite_tunnel') - .circuit(5) + .circuit(10) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -806,7 +810,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_tunnel_leather') .itemInputs('#forge:plates/wrought_iron', '#forge:leather') .itemOutputs('create:andesite_tunnel') - .circuit(5) + .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -825,7 +829,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_tunnel') .itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube') .itemOutputs('2x create:brass_tunnel') - .circuit(5) + .circuit(12) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -843,7 +847,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_tunnel_leather') .itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube') .itemOutputs('2x create:brass_tunnel') - .circuit(5) + .circuit(13) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -863,6 +867,7 @@ const registerCreateRecipes = (event) => { .itemInputs('2x #forge:plates/wrought_iron', '2x #forge:rings/wrought_iron', '#forge:small_gears') .itemOutputs('create:display_board') .duration(50) + .circuit(14) .EUt(GTValues.VA[GTValues.ULV]) // Латунная рука @@ -913,6 +918,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('2x create:electron_tube') .duration(50) .EUt(7) + .circuit(14) event.shaped('4x create:electron_tube', [ 'FAG', @@ -1687,6 +1693,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:contraption_controls') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(18) event.shaped('create:wrench', [ ' BB', @@ -1757,6 +1764,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:redstone_link') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(17) event.shaped('create:display_link', [ 'FED', @@ -1833,6 +1841,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_bearing') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(15) event.shaped('create:gantry_carriage', [ 'DCE', @@ -1871,6 +1880,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:weighted_ejector') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(16) event.shaped('create:turntable', [ 'DA ', From 8beb9ba0902d67745355fd791ceae0db10c12654 Mon Sep 17 00:00:00 2001 From: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> Date: Sun, 8 Jun 2025 18:21:46 -0300 Subject: [PATCH 08/48] Conflict issues fix (#1141) * Remove Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Fix Glass Jar conflict Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --------- Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --- kubejs/server_scripts/tfc/recipes.machines.js | 2 +- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index ee2542c74..ac2370124 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -355,7 +355,7 @@ function registerTFCMachineRecipes(event) { // Empty Jar event.recipes.gtceu.alloy_smelter('tfc:jar_alloying') .itemInputs('#tfc:glass_batches_tier_2') - .notConsumable('gtceu:cylinder_casting_mold') + .notConsumable('gtceu:ball_casting_mold') .itemOutputs('tfc:empty_jar') .duration(100) .EUt(2) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index c9f7e2374..9c8e2ee1b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -124,7 +124,7 @@ function registerTFGMiscellaneousRecipes(event) { .outputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000)) .duration(300) .EUt(GTValues.VA[GTValues.LV]) - + //Scaffolding Frame event.shaped('tfg:scaffolding_frame', [ @@ -136,13 +136,7 @@ function registerTFGMiscellaneousRecipes(event) { A: '#forge:rods/wood', B: '#forge:cloth' }).id('tfg:shaped/scaffolding_frame'); - - event.recipes.gtceu.assembler('tfg:assembler/scaffolding_frame') - .itemInputs('4x #forge:rods/wood', '#forge:cloth') - .itemOutputs('tfg:scaffolding_frame') - .duration(10) - .EUt(GTValues.VA[GTValues.ULV]); - + //Airship Hull event.shaped('tfg:airship_hull', [ 'A B', @@ -485,4 +479,4 @@ function registerTFGMiscellaneousRecipes(event) { .duration(40) .circuit(4) .EUt(GTValues.VA[GTValues.ULV]) -} \ No newline at end of file +} From e4014d1d6e8e4bb8b11974f3dcc065bcf1a5ec35 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sun, 8 Jun 2025 17:22:01 -0400 Subject: [PATCH 09/48] Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142) * Fix Chute Assembler recipe * Fix quest tips beekeper * Fix for wine and jar alloy smelter conflicting recipe * fix to fit #1141 * mistakes were made * Fix jetpack 1 quest mv * Mistake again * Revert the fix on chute --- config/ftbquests/quests/chapters/mv__medium_voltage.snbt | 4 ++-- config/ftbquests/quests/chapters/queststfc_tips.snbt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index af23a8289..043c8d484 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1268,12 +1268,12 @@ { dependencies: ["45769156F4253C86"] dependency_requirement: "one_completed" - description: ["{quests.medium_voltage.mv_.desc}"] + description: ["{quests.medium_voltage.mv_jetpack.desc}"] id: "6FA956DAA72D6139" optional: true shape: "heart" size: 1.0d - subtitle: "{quests.medium_voltage.mv_.subtitle}" + subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}" tasks: [{ id: "022324F9630960C6" item: { diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index c9a45c9e9..91963f4fd 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1269,6 +1269,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1280,6 +1281,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1291,6 +1293,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1302,6 +1305,7 @@ Damage: 0 } } + optional_task: true type: "item" } { From 2a0f11bd152820eb5f2b5763a89f3283ccac49ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A5=93?= Date: Mon, 9 Jun 2025 23:54:04 +0800 Subject: [PATCH 10/48] Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) --- ...site_encased_large_aluminium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_andesite_alloy_cogwheel.json | 21 +++++++++++++++++++ ...e_encased_large_darmstadtium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_naquadah_alloy_cogwheel.json | 21 +++++++++++++++++++ ...ite_encased_large_neutronium_cogwheel.json | 21 +++++++++++++++++++ ...rge_rhodium_plated_palladium_cogwheel.json | 21 +++++++++++++++++++ ...ncased_large_stainless_steel_cogwheel.json | 21 +++++++++++++++++++ ...andesite_encased_large_steel_cogwheel.json | 21 +++++++++++++++++++ ...esite_encased_large_titanium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_tungsten_steel_cogwheel.json | 21 +++++++++++++++++++ ...rass_encased_large_aluminium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_andesite_alloy_cogwheel.json | 21 +++++++++++++++++++ ...s_encased_large_darmstadtium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_naquadah_alloy_cogwheel.json | 21 +++++++++++++++++++ ...ass_encased_large_neutronium_cogwheel.json | 21 +++++++++++++++++++ ...rge_rhodium_plated_palladium_cogwheel.json | 21 +++++++++++++++++++ ...ncased_large_stainless_steel_cogwheel.json | 21 +++++++++++++++++++ .../brass_encased_large_steel_cogwheel.json | 21 +++++++++++++++++++ ...brass_encased_large_titanium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_tungsten_steel_cogwheel.json | 21 +++++++++++++++++++ 20 files changed, 420 insertions(+) create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json new file mode 100644 index 000000000..e14f22878 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_aluminium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_aluminium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json new file mode 100644 index 000000000..09304f82f --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_andesite_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_andesite_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json new file mode 100644 index 000000000..ec3f612b3 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_darmstadtium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_darmstadtium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json new file mode 100644 index 000000000..965a57b1d --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_naquadah_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_naquadah_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json new file mode 100644 index 000000000..c6fb85829 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_neutronium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_neutronium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json new file mode 100644 index 000000000..8d26ac33b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_rhodium_plated_palladium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json new file mode 100644 index 000000000..2580d9875 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_stainless_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_stainless_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json new file mode 100644 index 000000000..221f23fdb --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json new file mode 100644 index 000000000..408bcdbd6 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_titanium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_titanium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json new file mode 100644 index 000000000..444e3d5b1 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_tungsten_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_tungsten_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json new file mode 100644 index 000000000..a7a746480 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_aluminium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_aluminium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json new file mode 100644 index 000000000..687399fa3 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_andesite_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_andesite_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json new file mode 100644 index 000000000..bbd6490e1 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_darmstadtium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_darmstadtium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json new file mode 100644 index 000000000..d2cf7859b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_naquadah_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_naquadah_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json new file mode 100644 index 000000000..26bce8b0a --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_neutronium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_neutronium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json new file mode 100644 index 000000000..84a91c18e --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_rhodium_plated_palladium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_rhodium_plated_palladium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json new file mode 100644 index 000000000..a71faa358 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_stainless_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_stainless_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json new file mode 100644 index 000000000..1c6189f67 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json new file mode 100644 index 000000000..a2e4466d2 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_titanium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_titanium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json new file mode 100644 index 000000000..8fdc6db6b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_tungsten_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_tungsten_steel_cogwheel" +} \ No newline at end of file From 158f2c112cd565474d42f64f927588e76c817e58 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 9 Jun 2025 10:56:02 -0500 Subject: [PATCH 11/48] gregtech facade crafting (#1145) * Update recipes.js * Whitelist Tag from Redeix * Update tags.js * fixed create copper blocks tag * added more blocks to facades * Fixed industrial iron * changed facades to tfg * changed tag to tfg * updated tag to tfg from ae2 --- kubejs/server_scripts/ae2/tags.js | 2 +- kubejs/server_scripts/gregtech/recipes.js | 26 +- kubejs/server_scripts/tfg/tags.facades.js | 324 +++++++++++++++++++++ kubejs/server_scripts/tfg/tags.js | 1 + kubejs/startup_scripts/create/constants.js | 53 +--- 5 files changed, 352 insertions(+), 54 deletions(-) create mode 100644 kubejs/server_scripts/tfg/tags.facades.js diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 719cf7567..90cf5ce3d 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -5,7 +5,7 @@ const registerAE2ItemTags = (event) => { global.AE2_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) - }) + }) } const registerAE2BlockTags = (event) => { diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 09cec2dc8..927ec9b51 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1132,7 +1132,31 @@ const registerGTCEURecipes = (event) => { .EUt(2) //#endregion - + + //#region GT Facades + event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"]) + .modifyResult((craftingGrid, result) => + { + let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id + + console.log(blockID) + let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + result.nbt = facadeNBT + return result; + }).id('gtceu:facade_cover'); + + event.shapeless(Item.of('gtceu:facade_cover', 32, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/titanium', "#tfg:whitelisted/facades"]) + .modifyResult((craftingGrid, result) => + { + let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id + + console.log(blockID) + let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + result.nbt = facadeNBT + return result; + }).id('gtceu:facade_cover32'); + //#endregion + event.recipes.gtceu.laser_engraver('tfg:diamond_gear') .itemInputs('4x #forge:plates/diamond') .itemOutputs('#forge:gears/diamond') diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js new file mode 100644 index 000000000..abbdb17f9 --- /dev/null +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -0,0 +1,324 @@ +// priority: 0 + +function registerFacadeWhitelistTags(event) { + + const facade_materials = [ + //tags + '#tfc:rock/bricks', + '#tfc:rock/smooth', + '#tfc:rock/gravel', + '#tfc:rock/cracked_bricks', + '#tfc:rock/chiseled', + '#tfc:rock/raw', + '#tfc:metal_plated_blocks', + + '#tfc:colored_raw_alabaster', + '#tfc:colored_bricks_alabaster', + '#tfc:colored_polished_alabaster', + '#tfc:mud_bricks', + '#forge:sandstone', + '#forge:storage_blocks', + '#forge:glass', + '#minecraft:terracotta', + '#create:casing', + '#dormum_ornamentum:brick_items', + '#simplylight:any_lamp_on', + '#simplylight:any_lamp_off', + '#minecraft:planks', + '#minecraft:logs', + //rnr shingles + 'rnr:ceramic_roof', + 'rnr:terracotta_roof', + + //tfc blocks + 'tfc:fire_bricks', + 'tfc:aggregate', + 'tfc:alabaster/raw', + 'tfc:alabaster/bricks', + 'tfc:alabaster/polished', + + //firmalife blocks + 'firmalife:metal/blocks/stainless_steel', + 'firmalife:metal/blocks/chromium', + 'firmalife:sealed_bricks', + 'firmalife:chiseled_sealed_bricks', + 'firmalife:polished_sealed_bricks', + + //gtceu blocks + 'gtceu:coke_oven_bricks', + 'gtceu:firebricks', + 'gtceu:wood_wall', + 'gtceu:tempered_glass', + 'gtceu:laminated_glass', + 'gtceu:plascrete', + 'gtceu:cleanroom_glass', + + //gtceu casing + 'gtceu:steam_machine_casing', + 'gtceu:heatproof_machine_casing', + 'gtceu:frostproof_machine_casing', + 'gtceu:solid_machine_casing', + 'gtceu:clean_machine_casing', + 'gtceu:stable_machine_casing', + 'gtceu:robust_machine_casing', + 'gtceu:inert_machine_casing', + 'gtceu:sturdy_machine_casing', + 'gtceu:stainless_evaporation_casing', + 'gtceu:nonconducting_casing', + 'gtceu:vibration_safe_casing', + 'gtceu:watertight_casing', + 'gtceu:secure_maceration_casing', + 'gtceu:high_temperature_smelting_casing', + 'gtceu:laser_safe_engraving_casing', + 'gtceu:large_scale_assembler_casing', + 'gtceu:shock_proof_cutting_casing', + 'gtceu:stress_proof_casing', + 'gtceu:corrosion_proof_casing', + 'gtceu:reaction_safe_mixing_casing', + 'gtceu:assembly_line_casing', + 'gtceu:titanium_turbine_casing', + 'gtceu:stainless_turbine_casing', + 'gtceu:tungstensteel_turbine_casing', + 'gtceu:computer_casing', + 'gtceu:advanced_computer_casing', + 'gtceu:high_power_casing', + + //gtceu hazard signs + 'gtceu:acid_hazard_sign_block', + 'gtceu:antimatter_hazard_sign_block', + 'gtceu:bio_hazard_sign_block', + 'gtceu:boss_hazard_sign_block', + 'gtceu:causality_hazard_sign_block', + 'gtceu:explosion_hazard_sign_block', + 'gtceu:fire_hazard_sign_block', + 'gtceu:frost_hazard_sign_block', + 'gtceu:generic_hazard_sign_block', + 'gtceu:gregification_hazard_sign_block', + 'gtceu:high_pressure_hazard_sign_block', + 'gtceu:high_voltage_hazard_sign_block', + 'gtceu:laser_hazard_sign_block', + 'gtceu:magic_hazard_sign_block', + 'gtceu:magnetic_hazard_sign_block', + 'gtceu:mob_infestation_hazard_sign_block', + 'gtceu:mob_spawner_hazard_sign_block', + 'gtceu:noise_hazard_sign_block', + 'gtceu:radioactive_hazard_sign_block', + 'gtceu:spatial_storage_hazard_sign_block', + 'gtceu:turret_hazard_sign_block', + 'gtceu:void_hazard_sign_block', + 'gtceu:yellow_stripes_block_a', + 'gtceu:yellow_stripes_block_b', + + //windows + 'create:dark_oak_window', + 'create:mangrove_window', + 'create:ornate_iron_window', + 'create_connected:cherry_window', + 'create_connected:bamboo_window', + 'createdeco:andesite_window', + 'createdeco:copper_window', + 'createdeco:iron_window', + 'createdeco:industrial_iron_window', + 'createdeco:brass_window', + 'createdeco:zinc_window', + 'everycomp:c/domum_ornamentum/cactus_window', + 'everycomp:c/domum_ornamentum/cactus_extra_window', + 'ae2:quartz_glass', + + //create deco + 'createdeco:andesite_sheet_metal', + 'createdeco:brass_sheet_metal', + 'createdeco:iron_sheet_metal', + 'createdeco:copper_sheet_metal', + 'createdeco:industrial_iron_sheet_metal', + 'createdeco:zinc_sheet_metal' + ]; + + const mc_colors = + [ + 'white', + 'orange', + 'magenta', + 'light_blue', + 'yellow', + 'lime', + 'pink', + 'gray', + 'light_gray', + 'cyan', + 'purple', + 'blue', + 'brown', + 'green', + 'red', + 'black' + ] + + const wood_types_tfc = + [ + 'acacia', + 'ash', + 'aspen', + 'birch', + 'blackwood', + 'chestnut', + 'douglas_fir', + 'hickory', + 'kapok', + 'mangrove', + 'maple', + 'oak', + 'palm', + 'pine', + 'rosewood', + 'sequoia', + 'spruce', + 'sycamore', + 'white_cedar', + 'willow' + ] + + const wood_types_afc = + [ + 'baobao', + 'eucalyptus', + 'mahogany', + 'heavea', + 'tualang', + 'teak', + 'cypress', + 'fig', + 'ironwood', + 'ipe' + ] + + const createdeco_bricks_fm = + [ + 'pearl_bricks', + 'verdant_bricks', + 'red_bricks', + 'dean_bricks', + 'umber_bricks', + 'dusk_bricks', + 'blue_bricks', + 'scarlet_bricks' + ] + + const gtceu_stonelike_fm = + [ + 'light_concrete', + 'dark_concrete', + 'red_granite', + 'marble' + ] + + const create_copper_fm = + [ + 'copper', + 'exposed_copper', + 'weathered_copper', + 'oxidized_copper' + ] + + const create_rock_types_fm = + [ + 'granite', + 'diorite', + 'andesite', + 'calcite', + 'dripstone', + 'deepslate', + 'limestone' + //'ochrum', + //'scoria', + //'scorchia', + //'veridium' + //'tuff', + //'asurine', + //'crimsite', + ] + + //misc blocks + facade_materials.forEach(facade_material => { + event.add('tfg:whitelisted/facades', `${facade_material}`) + }); + + //gtceu stonelike stuff + gtceu_stonelike_fm.forEach(facade_material => { + if(facade_material != 'marble') + { + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_cobblestone') + event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_cobblestone') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:cracked_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_bricks') + } + + event.add('tfg:whitelisted/facades', 'gtceu:polished_' + facade_material) + event.add('tfg:whitelisted/facades', 'gtceu:chiseled' + facade_material) + + event.add('tfg:whitelisted/facades', 'gtceu:small_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:square_' + facade_material + '_bricks') + + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_tile') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_small_tile') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_a') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_b') + }); + + //gtceu misc colored blocks + mc_colors.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs') + }); + + //create copper + create_copper_fm.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_shingles') + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_tiles') + }); + + //create rocks + create_rock_types_fm.forEach(facade_material => { + + if(facade_material == 'limestone') + { + event.add('tfg:whitelisted/facades', 'create:' + facade_material) + } + + event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:polished_cut_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'create:small_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'create:layered_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_pillar') + }); + + //rnr shingles + wood_types_tfc.concat(wood_types_afc).forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material) + }); + + //createdeco bricks + createdeco_bricks_fm.forEach(facade_material => { + if (facade_material != 'red_bricks') + { + event.add('tfg:whitelisted/facades', 'createdeco:' + facade_material) + } + event.add('tfg:whitelisted/facades', 'createdeco:short_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:long_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:tiled_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:corner_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:cracked_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:mossy_' + facade_material) + }); + + //everycomp windows + wood_types_tfc.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window') + }); + wood_types_afc.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window') + }); +} diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 852abde96..59f697f36 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -1,6 +1,7 @@ const registerTFGItemTags = (event) => { registerTFGTrimTags(event) + registerFacadeWhitelistTags(event) //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 8fec001aa..c78f93e53 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -186,63 +186,12 @@ global.CREATE_DISABLED_ITEMS = [ 'create:warped_window_pane', // Blocks - 'create:andesite_alloy_block', - 'create:industrial_iron_block', + 'create:andesite_alloy_block', 'create:experience_block', 'create:rose_quartz_block', 'create:rose_quartz_tiles', 'create:small_rose_quartz_tiles', - // Shit Copper Blocks (Когда гребаный Create стал модом про декор) - 'create:oxidized_copper_tiles', - 'create:copper_tile_slab', - 'create:exposed_copper_tile_slab', - 'create:weathered_copper_tile_slab', - 'create:oxidized_copper_tile_slab', - 'create:copper_tile_stairs', - 'create:exposed_copper_tile_stairs', - 'create:weathered_copper_tile_stairs', - 'create:oxidized_copper_tile_stairs', - 'create:copper_shingles', - 'create:exposed_copper_shingles', - 'create:weathered_copper_shingles', - 'create:oxidized_copper_shingles', - 'create:copper_shingle_slab', - 'create:exposed_copper_shingle_slab', - 'create:weathered_copper_shingle_slab', - 'create:oxidized_copper_shingle_slab', - 'create:copper_shingle_stairs', - 'create:exposed_copper_shingle_stairs', - 'create:weathered_copper_shingle_stairs', - 'create:oxidized_copper_shingle_stairs', - 'create:waxed_copper_shingles', - 'create:waxed_exposed_copper_shingles', - 'create:waxed_weathered_copper_shingles', - 'create:waxed_oxidized_copper_shingles', - 'create:waxed_copper_shingle_slab', - 'create:waxed_exposed_copper_shingle_slab', - 'create:waxed_weathered_copper_shingle_slab', - 'create:waxed_oxidized_copper_shingle_slab', - 'create:waxed_copper_shingle_stairs', - 'create:waxed_exposed_copper_shingle_stairs', - 'create:waxed_weathered_copper_shingle_stairs', - 'create:waxed_oxidized_copper_shingle_stairs', - 'create:copper_tiles', - 'create:exposed_copper_tiles', - 'create:weathered_copper_tiles', - 'create:waxed_copper_tiles', - 'create:waxed_exposed_copper_tiles', - 'create:waxed_weathered_copper_tiles', - 'create:waxed_oxidized_copper_tiles', - 'create:waxed_copper_tile_slab', - 'create:waxed_exposed_copper_tile_slab', - 'create:waxed_weathered_copper_tile_slab', - 'create:waxed_oxidized_copper_tile_slab', - 'create:waxed_copper_tile_stairs', - 'create:waxed_exposed_copper_tile_stairs', - 'create:waxed_weathered_copper_tile_stairs', - 'create:waxed_oxidized_copper_tile_stairs', - // Other 'create:honey_bucket', 'create:chocolate_bucket', From c11e13c9497660dfb3b06ed933ef778ac3ae5622 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:46:30 +0100 Subject: [PATCH 12/48] fixes #1149 --- .../gregtech/recipes.machines.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 1dd94ab88..2224f956b 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -718,6 +718,30 @@ function registerGTCEuMachineRecipes(event) { .EUt(GTValues.VA[GTValues.ZPM]) .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) + event.remove({ id: 'gtceu:assembly_line/ultimate_battery' }) + event.recipes.gtceu.assembly_line('ultimate_battery') + .itemInputs('16x #forge:double_plates/darmstadtium', + '4x #gtceu:circuits/uhv', + '16x #gtceu:batteries/uv', + '4x gtceu:uv_field_generator', + '64x gtceu:uhpic_wafer', + '64x gtceu:uhpic_wafer', + '64x gtceu:advanced_smd_diode', + '64x gtceu:advanced_smd_capacitor', + '64x gtceu:advanced_smd_resistor', + '64x gtceu:advanced_smd_transistor', + '64x gtceu:advanced_smd_inductor', + '32x gtceu:enriched_naquadah_trinium_europium_duranide_double_wire', + '64x #forge:bolts/neutronium') + .inputFluids( + Fluid.of('gtceu:soldering_alloy', 5760), + Fluid.of('gtceu:polybenzimidazole', 2304), + Fluid.of('gtceu:naquadria', 2592)) + .itemOutputs('gtceu:max_battery') + .duration(100 * 20) + .EUt(300000) + .stationResearch(b => b.researchStack(Item.of('gtceu:energy_cluster')).EUt(GTValues.VA[GTValues.UHV]).CWUt(144)) + // #endregion // Контроллер теплицы From d3a47fa04fa9047df4bea9ec43c21a5c34fa9b2d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:51:11 +0100 Subject: [PATCH 13/48] changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7249d00ac..4038cdc70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,12 @@ ### New features ### Changes ### Bug fixes -- Fixed trowel being consumed on use @Redeix +- Fixed trowel being consumed on use (#1143) @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie +- Fixed ultimate battery recipe stack size issue (#1149) @Pyritie +- Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie +- Quest fixes (#1119, #1142) @TomPlop +- Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz ## [0.9.10] - 05.06.2025 ### New features From fd7ae525ff3e431e6a02cca33e704816fb0b4b49 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:52:20 +0100 Subject: [PATCH 14/48] langs --- kubejs/assets/gtceu/lang/en_us.json | 3 ++- kubejs/assets/railways/lang/en_us.json | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2aea9b95e..111f851a5 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -74,7 +74,8 @@ "material.gtceu.vitrified_asbestos": "Vitrified Asbestos", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", - "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice", + "item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice", + "item.gtceu.tool.butchery_knife.tooltip": "Butchers animals for more meat", "block.gtceu.overworld_marker": "Earth", "block.gtceu.the_nether_marker": "The Beneath", "tagprefix.sword_head": "%s Sword Head", diff --git a/kubejs/assets/railways/lang/en_us.json b/kubejs/assets/railways/lang/en_us.json index c900a7d9d..97fc7b4bb 100644 --- a/kubejs/assets/railways/lang/en_us.json +++ b/kubejs/assets/railways/lang/en_us.json @@ -3,5 +3,22 @@ "block.railways.track_create_andesite_wide": "Wide Train Track", "block.railways.track_create_andesite_narrow": "Narrow Train Track", "item.railways.track_incomplete_create_andesite_wide": "Incomplete Wide Track", - "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track" + "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track", + "tfc.recipe.barrel.railways.barrel.dyeing.cap_decolor": "Decoloring", + "tfc.recipe.barrel.railways.barrel.dyeing.black_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.gray_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_gray_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.white_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.pink_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.magenta_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.purple_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.blue_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_blue_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.cyan_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.green_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.lime_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.yellow_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.orange_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.red_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.brown_conductor_cap": "Dyeing" } \ No newline at end of file From 1a5867d9560bb5b42e5241e7b1e277c087e60327 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:59:05 +0100 Subject: [PATCH 15/48] fixes #1107 --- .../quests/chapters/queststfc_tips.snbt | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 91963f4fd..78062b116 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1618,18 +1618,25 @@ description: ["{quests.tfg_tips.get_milk.desc}"] id: "3C7F170E065B60E1" subtitle: "{quests.tfg_tips.get_milk.subtitle}" - tasks: [{ - id: "5ADFB5FC06EAED6C" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))" + tasks: [ + { + id: "5ADFB5FC06EAED6C" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))" + } } + optional_task: true + title: "{quests.tfg_tips.get_milk.task}" + type: "item" } - title: "{quests.tfg_tips.get_milk.task}" - type: "item" - }] + { + id: "26460F400A280214" + type: "checkmark" + } + ] title: "{quests.tfg_tips.get_milk.title}" x: 4.5d y: -8.5d From 2b3a1d8ee2baf2b8b1b77c43756c334bee071a96 Mon Sep 17 00:00:00 2001 From: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:34:05 -0300 Subject: [PATCH 16/48] Conductor (#1144) * Remove Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Fix Glass Jar conflict Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Conductor Tags Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Conductor Recipes Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update constants.js Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update recipes.js Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * update id Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --------- Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --- kubejs/server_scripts/railways/recipes.js | 40 ++++++++++++++++++++ kubejs/server_scripts/railways/tags.js | 6 ++- kubejs/startup_scripts/railways/constants.js | 18 --------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 50f43c06e..879eaeb8d 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -85,6 +85,46 @@ const registerRailWaysRecipes = (event) => { //#endregion + //#region conductor + event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`) + .itemInputs('#gtceu:circuits/lv','#gtceu:electric_motors','2x #forge:string','#tfc:high_quality_cloth') + .circuit(15) + .itemOutputs('railways:white_conductor_cap') + .duration(80) + .inputFluids(Fluid.of('gtceu:glue', 200)) + .EUt(16) + + event.recipes.tfc.barrel_sealed(1000) + .inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288)) + .outputItem(`railways:white_conductor_cap`) + .id(`railways:barrel/cap_decolor`) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`) + .itemInputs('railways:white_conductor_cap') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) + .itemOutputs(`railways:${dye}_conductor_cap`) + .duration(200) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + if (dye != "white") { + event.recipes.tfc.barrel_sealed(1000) + .inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288)) + .outputItem(`railways:${dye}_conductor_cap`) + .id(`railways:barrel/dyeing/${dye}_conductor_cap`) + + event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`) + .itemInputs('#tfg:colored_caps') + .inputFluids(Fluid.of('gtceu:chlorine',20)) + .itemOutputs('railways:white_conductor_cap') + .duration(80) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + } + }) + + //#endregion + // Переключатель пути поезда из андезита event.shaped('railways:track_switch_andesite', [ 'BAB', diff --git a/kubejs/server_scripts/railways/tags.js b/kubejs/server_scripts/railways/tags.js index 81863a6be..c9dcba6d6 100644 --- a/kubejs/server_scripts/railways/tags.js +++ b/kubejs/server_scripts/railways/tags.js @@ -7,8 +7,12 @@ const registerRailWaysItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) + // Adding Conductor tags + global.MINECRAFT_DYE_NAMES.forEach(dye => { + if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`) + event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`) + }) } - const registerRailWaysBlockTags = (event) => { // Удаление тегов у отключенных предметов diff --git a/kubejs/startup_scripts/railways/constants.js b/kubejs/startup_scripts/railways/constants.js index 3b232b34a..462167ae9 100644 --- a/kubejs/startup_scripts/railways/constants.js +++ b/kubejs/startup_scripts/railways/constants.js @@ -100,24 +100,6 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ 'railways:track_incomplete_tieless_narrow', 'railways:track_incomplete_tieless_wide', - // Caps - 'railways:white_conductor_cap', - 'railways:orange_conductor_cap', - 'railways:magenta_conductor_cap', - 'railways:light_blue_conductor_cap', - 'railways:yellow_conductor_cap', - 'railways:lime_conductor_cap', - 'railways:pink_conductor_cap', - 'railways:gray_conductor_cap', - 'railways:light_gray_conductor_cap', - 'railways:cyan_conductor_cap', - 'railways:purple_conductor_cap', - 'railways:blue_conductor_cap', - 'railways:brown_conductor_cap', - 'railways:green_conductor_cap', - 'railways:red_conductor_cap', - 'railways:black_conductor_cap', - // Incomplete Caps 'railways:white_incomplete_conductor_cap', 'railways:orange_incomplete_conductor_cap', From 86a35b7386128d7f5e3194c2da8c7ca2bb21827d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 20:50:40 +0100 Subject: [PATCH 17/48] turned on the EMI default recipe button by default --- config/emi.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/emi.css b/config/emi.css index 463b05fcb..8aafd66ad 100644 --- a/config/emi.css +++ b/config/emi.css @@ -141,7 +141,7 @@ /** * Whether recipes should have a button to set as default. */ - recipe-default-button: false; + recipe-default-button: true; /** * Whether recipes should have a button to show the recipe tree. From 5be2eb1d99ae534f029b21d00b75f47af260d0c6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:01:09 +0100 Subject: [PATCH 18/48] welcome back stonecutter --- .../category/properties/ae2_attunement.json | 2 +- .../emi/category/properties/ae2_entropy.json | 2 +- .../category/properties/create_draining.json | 2 +- .../properties/create_spout_filling.json | 2 +- .../domum_ornamentum_architects_cutter.json | 2 +- .../emi/category/properties/emi_info.json | 2 +- .../emi/category/properties/emi_tag.json | 2 +- .../exposure_photograph_stacking.json | 2 +- .../properties/framedblocks_framing_saw.json | 2 +- .../category/properties/ftbquests_quest.json | 2 +- .../properties/greate_block_cutting.json | 2 +- .../properties/gtceu_programmed_circuit.json | 2 +- .../properties/minecraft_stonecutting.json | 1 + .../assets/emi/recipe/filters/categories.json | 3 --- kubejs/server_scripts/minecraft/recipes.js | 18 ++++++++++++++++++ .../minecraft/recipes.removes.js | 1 + .../sophisticated_backpacks/recipes.js | 12 ++++++++++++ kubejs/startup_scripts/minecraft/constants.js | 1 - .../sophisticated_backpacks/constants.js | 1 - 19 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/minecraft_stonecutting.json diff --git a/kubejs/assets/emi/category/properties/ae2_attunement.json b/kubejs/assets/emi/category/properties/ae2_attunement.json index c59ef7b95..5eaac13fc 100644 --- a/kubejs/assets/emi/category/properties/ae2_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_attunement.json @@ -1 +1 @@ -{"ae2:attunement":{"order":137}} \ No newline at end of file +{"ae2:attunement":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_entropy.json b/kubejs/assets/emi/category/properties/ae2_entropy.json index 216720cd4..ad4f28cee 100644 --- a/kubejs/assets/emi/category/properties/ae2_entropy.json +++ b/kubejs/assets/emi/category/properties/ae2_entropy.json @@ -1 +1 @@ -{"ae2:entropy":{"order":138}} \ No newline at end of file +{"ae2:entropy":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index 53271885e..d1fcdd94a 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":139}} \ No newline at end of file +{"create:draining":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index a4468f41a..c60505e9e 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":140}} \ No newline at end of file +{"create:spout_filling":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index 46e37bc28..20e1cce71 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":135}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index 93f32d060..ba0f8f819 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":143}} \ No newline at end of file +{"emi:info":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 51db84b5f..c02f47c21 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":144}} \ No newline at end of file +{"emi:tag":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index fdb948c49..5919b18ac 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":141}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index 60d9ec581..54596234a 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":134}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ftbquests_quest.json b/kubejs/assets/emi/category/properties/ftbquests_quest.json index 869db266a..466ed2a22 100644 --- a/kubejs/assets/emi/category/properties/ftbquests_quest.json +++ b/kubejs/assets/emi/category/properties/ftbquests_quest.json @@ -1 +1 @@ -{"ftbquests:quest":{"order":142}} \ No newline at end of file +{"ftbquests:quest":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 124326eca..464c5b4a7 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":133}} \ No newline at end of file +{"greate:block_cutting":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 8ebe43293..e7ecce1ed 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":136}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json new file mode 100644 index 000000000..602760d46 --- /dev/null +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -0,0 +1 @@ +{"minecraft:stonecutting":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 8b7fd72fd..ec400b936 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -6,9 +6,6 @@ { "category": "minecraft:brewing" }, - { - "category": "minecraft:stonecutting" - }, { "category": "minecraft:blasting" }, diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 536179d1b..55a34243c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1010,4 +1010,22 @@ const registerMinecraftRecipes = (event) => { .itemOutputs('minecraft:shroomlight') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + + // Stonecutter + + event.shaped('minecraft:stonecutter', + [ + ' E ', + 'CAC', + 'BDB' + ], + { + A: '#forge:plates/wrought_iron', + B: '#tfc:lumber', + C: '#forge:plates/brass', + D: '#forge:small_gears', + E: '#forge:buzz_saw_heads' + }).id('tfg:shaped/stonecutter'); + + event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block') } diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index dc0df2cc0..2daad74bb 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -689,6 +689,7 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'minecraft:quartz' }) event.remove({ id: 'minecraft:quartz_from_blasting' }) + event.remove({ id: 'minecraft:smooth_quartz' }) //#endregion diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 74415dad4..6306b3dc3 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -422,4 +422,16 @@ const registerSophisticatedBackpacksRecipes = (event) => { F: '#forge:tools/wrenches', G: 'gtceu:aluminium_drum', }).id('tfg:sophisticated_backpacks/shaped/tank_upgrade') + + // Stonecutter upgrade + event.shaped('sophisticatedbackpacks:stonecutter_upgrade', [ + 'ABA', + 'CDC', + 'ACA' + ], { + A: '#forge:rods/steel', + B: 'minecraft:stonecutter', + C: '#forge:plates/steel', + D: 'sophisticatedbackpacks:upgrade_base', + }).id('tfg:sophisticated_backpacks/shaped/stonecutter_upgrade') } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index ce8873bfc..50074e51b 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -503,7 +503,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:mud', 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', - 'minecraft:stonecutter', 'minecraft:gravel', 'minecraft:large_fern', 'minecraft:tall_grass', diff --git a/kubejs/startup_scripts/sophisticated_backpacks/constants.js b/kubejs/startup_scripts/sophisticated_backpacks/constants.js index 9cebaebbc..0ad76928b 100644 --- a/kubejs/startup_scripts/sophisticated_backpacks/constants.js +++ b/kubejs/startup_scripts/sophisticated_backpacks/constants.js @@ -8,7 +8,6 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [ 'sophisticatedbackpacks:auto_smoking_upgrade', 'sophisticatedbackpacks:blasting_upgrade', 'sophisticatedbackpacks:auto_blasting_upgrade', - 'sophisticatedbackpacks:stonecutter_upgrade', 'sophisticatedbackpacks:stack_upgrade_tier_2', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_4', From f9d213019219ed283dc8f9b1588664497a455e15 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:05:26 +0100 Subject: [PATCH 19/48] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4038cdc70..e2d9c5f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## [Unreleased] ### New features +- Added back the vanilla stonecutter @Pyritie ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix From 84041d2e00fc5532dcb6c55fc285d21a99368dcc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:08:50 +0100 Subject: [PATCH 20/48] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d9c5f82..8b3cfae25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### New features - Added back the vanilla stonecutter @Pyritie +- Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix From 5d3f50daebb20af8aff038ce1e79a5c60c5e3da2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:51:53 +0100 Subject: [PATCH 21/48] fix railways cap decolor recipe --- kubejs/server_scripts/railways/recipes.js | 100 +++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 879eaeb8d..c31104657 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -4,7 +4,7 @@ const registerRailWaysRecipes = (event) => { // Удаление рецептов мода railways event.remove({ mod: 'railways' }); - + registerRailwaysLocometalRecipes(event) // Семафор @@ -48,81 +48,81 @@ const registerRailWaysRecipes = (event) => { .EUt(28) //#region Couplers and Buffers - event.recipes.gtceu.assembler(`tfg:railways/screwlink_coupler`) - .itemInputs(`minecraft:tripwire_hook`, `#forge:plates/steel`, '#forge:screws/steel') - .circuit(1) - .itemOutputs(`railways:screwlink_coupler`) - .duration(200) - .EUt(28) + event.recipes.gtceu.assembler(`tfg:railways/screwlink_coupler`) + .itemInputs(`minecraft:tripwire_hook`, `#forge:plates/steel`, '#forge:screws/steel') + .circuit(1) + .itemOutputs(`railways:screwlink_coupler`) + .duration(200) + .EUt(28) - event.recipes.gtceu.assembler(`tfg:railways/copycat_headstock_screwlink_coupler`) - .itemInputs(`railways:screwlink_coupler`, `create:copycat_panel`) - .circuit(1) - .itemOutputs(`railways:copycat_headstock_screwlink_coupler`) - .duration(200) - .EUt(28) + event.recipes.gtceu.assembler(`tfg:railways/copycat_headstock_screwlink_coupler`) + .itemInputs(`railways:screwlink_coupler`, `create:copycat_panel`) + .circuit(1) + .itemOutputs(`railways:copycat_headstock_screwlink_coupler`) + .duration(200) + .EUt(28) - event.recipes.gtceu.assembler(`tfg:railways/buffer`) - .itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`) - .circuit(1) - .itemOutputs(`railways:buffer`) - .duration(200) - .EUt(28) + event.recipes.gtceu.assembler(`tfg:railways/buffer`) + .itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`) + .circuit(1) + .itemOutputs(`railways:buffer`) + .duration(200) + .EUt(28) - event.recipes.gtceu.assembler(`tfg:railways/small_buffer`) - .itemInputs(`railways:screwlink_coupler`, `#forge:ingots/steel`) - .circuit(1) - .itemOutputs(`railways:small_buffer`) - .duration(200) - .EUt(28) + event.recipes.gtceu.assembler(`tfg:railways/small_buffer`) + .itemInputs(`railways:screwlink_coupler`, `#forge:ingots/steel`) + .circuit(1) + .itemOutputs(`railways:small_buffer`) + .duration(200) + .EUt(28) - event.recipes.gtceu.assembler(`tfg:railways/big_buffer`) - .itemInputs(`railways:small_buffer`, `#forge:ingots/steel`) - .circuit(1) - .itemOutputs(`railways:big_buffer`) - .duration(200) - .EUt(28) + event.recipes.gtceu.assembler(`tfg:railways/big_buffer`) + .itemInputs(`railways:small_buffer`, `#forge:ingots/steel`) + .circuit(1) + .itemOutputs(`railways:big_buffer`) + .duration(200) + .EUt(28) //#endregion //#region conductor event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`) - .itemInputs('#gtceu:circuits/lv','#gtceu:electric_motors','2x #forge:string','#tfc:high_quality_cloth') + .itemInputs('#gtceu:circuits/lv', '#gtceu:electric_motors', '2x #forge:string', '#tfc:high_quality_cloth') .circuit(15) .itemOutputs('railways:white_conductor_cap') .duration(80) .inputFluids(Fluid.of('gtceu:glue', 200)) .EUt(16) - + event.recipes.tfc.barrel_sealed(1000) .inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288)) .outputItem(`railways:white_conductor_cap`) .id(`railways:barrel/cap_decolor`) + event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`) + .itemInputs('#tfg:colored_caps') + .inputFluids(Fluid.of('gtceu:chlorine', 20)) + .itemOutputs('railways:white_conductor_cap') + .duration(80) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + global.MINECRAFT_DYE_NAMES.forEach(dye => { - event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`) - .itemInputs('railways:white_conductor_cap') - .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) - .itemOutputs(`railways:${dye}_conductor_cap`) - .duration(200) - .EUt(4) - .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`) + .itemInputs('railways:white_conductor_cap') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) + .itemOutputs(`railways:${dye}_conductor_cap`) + .duration(200) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) if (dye != "white") { - event.recipes.tfc.barrel_sealed(1000) + event.recipes.tfc.barrel_sealed(1000) .inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288)) .outputItem(`railways:${dye}_conductor_cap`) .id(`railways:barrel/dyeing/${dye}_conductor_cap`) - - event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`) - .itemInputs('#tfg:colored_caps') - .inputFluids(Fluid.of('gtceu:chlorine',20)) - .itemOutputs('railways:white_conductor_cap') - .duration(80) - .EUt(4) - .category(GTRecipeCategories.CHEM_DYES) } }) - + //#endregion // Переключатель пути поезда из андезита From 64c4cce30a58dd04fd6e347306e22a709437a3b4 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Mon, 9 Jun 2025 16:11:34 -0500 Subject: [PATCH 22/48] Update piglin_disguise_block.json (#1151) Fixed loot table for piglin disguise Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --- kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json b/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json index 32e03b788..fbf0b9537 100644 --- a/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json +++ b/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "tfg:piglin_disguise_block" + "name": "tfg:piglin_disguise" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} From 8145a468f3f983b0c2915ab900cdfc6b2e6c4d02 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Mon, 9 Jun 2025 16:15:16 -0500 Subject: [PATCH 23/48] Updated changelog (#1152) * Update piglin_disguise_block.json Fixed loot table for piglin disguise Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b3cfae25..f24ad23b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ - Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie - Quest fixes (#1119, #1142) @TomPlop - Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz +- Fixed piglin disguise loot table giving the wrong item (#1151) @Redeix + ## [0.9.10] - 05.06.2025 ### New features From a17784d63be3872c13dfed8c24bb5ed769e7fc5d Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Mon, 9 Jun 2025 22:57:43 -0500 Subject: [PATCH 24/48] Update CHANGELOG.md Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f24ad23b3..f3e87654b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### New features - Added back the vanilla stonecutter @Pyritie - Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 +- Added create conductor recipes (#1144) @JeanRdSz ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix @@ -12,7 +13,7 @@ - Quest fixes (#1119, #1142) @TomPlop - Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz - Fixed piglin disguise loot table giving the wrong item (#1151) @Redeix - +- Fixed create encased large cogwheel drops (#1148) @Taskeren [Credit](https://github.com/ElytraServers/Greate-Encased-Cogwheel-Drop-Fix) ## [0.9.10] - 05.06.2025 ### New features From 09641378a337683f5e92288192371f91d511167c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 11:38:55 +0100 Subject: [PATCH 25/48] fixed using the wrong battery in the ultimate battery recipe --- kubejs/server_scripts/gregtech/recipes.machines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 2224f956b..83c352ad9 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -722,7 +722,7 @@ function registerGTCEuMachineRecipes(event) { event.recipes.gtceu.assembly_line('ultimate_battery') .itemInputs('16x #forge:double_plates/darmstadtium', '4x #gtceu:circuits/uhv', - '16x #gtceu:batteries/uv', + '16x gtceu:energy_cluster', '4x gtceu:uv_field_generator', '64x gtceu:uhpic_wafer', '64x gtceu:uhpic_wafer', From 75a6d3d87571dd59751b8811a0c9e86267f580e2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 16:32:32 +0100 Subject: [PATCH 26/48] fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too --- kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- kubejs/server_scripts/gregtech/recipes.removes.js | 7 +++++++ kubejs/server_scripts/gregtech/tags.js | 3 +++ kubejs/startup_scripts/gtceu/materials.js | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 1e63e277e..5b73e9b20 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -221,7 +221,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 288)) .duration(material.getMass()) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) } if (material.hasProperty(PropertyKey.DUST)) { diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index f0f6f6d77..800dca90f 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -644,4 +644,11 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' }) event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' }) + + event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down' }) + event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down_distilled_water' }) + event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down' }) + event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down_distilled_water' }) + event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down' }) + event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down_distilled_water' }) } diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 624ec754d..f5c85e1ef 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -118,4 +118,7 @@ const registerGTCEUFluidTags = (event) => { event.add('c:hidden_from_recipe_viewers', /gtceu.*potion.*/) + event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_black_steel') + event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_red_steel') + event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_blue_steel') } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index f284c6764..f92bc29b4 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -255,6 +255,11 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); + // Make these the lowest tier of EBF instead + GTMaterials.BlackSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000) + GTMaterials.RedSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000) + GTMaterials.BlueSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000) + // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) GTMaterials.BismuthBronze.setMaterialSecondaryARGB(0x203E2A) From a845d76657c2c56d990ce17ce2c5affeec897ed4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 16:32:43 +0100 Subject: [PATCH 27/48] added recipes for tfc-lunchbox! --- kubejs/server_scripts/main_server_script.js | 1 + kubejs/server_scripts/tfclunchbox/recipes.js | 59 +++++++++++++++++++ .../tfg/recipes.miscellaneous.js | 7 +++ 3 files changed, 67 insertions(+) create mode 100644 kubejs/server_scripts/tfclunchbox/recipes.js diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 7f77008b8..15d4d8c0c 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -207,6 +207,7 @@ ServerEvents.recipes(event => { registerTfceaRecipes(event) registerTFCRecipes(event) registerTFCBetterBFRecipes(event) + registerTFCLunchBoxRecipes(event) registerTFGRecipes(event) registerTFCGroomingStationRecipes(event) registerTFCTextileRecipes(event) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js new file mode 100644 index 000000000..6d2d3d954 --- /dev/null +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -0,0 +1,59 @@ +// priority: 0 + +function registerTFCLunchBoxRecipes(event) { + + event.shaped('tfclunchbox:lunchbox', [ + ' CE', + 'ABA', + 'DAD' + ], { + A: '#forge:plates/sterling_silver', + B: '#forge:chests/wooden', + C: '#forge:bolts/brass', + D: '#forge:screws/wrought_iron', + E: '#forge:tools/hammers' + }).id('tfclunchbox:lunchbox') + + event.shaped('tfclunchbox:cooling_lunchbox', [ + ' CE', + 'ABA', + 'DAD' + ], { + A: '#forge:plates/red_steel', + B: '#forge:chests/wooden', + C: '#forge:bolts/brass', + D: '#forge:screws/steel', + E: '#forge:tools/hammers' + }).id('tfclunchbox:cooling_lunchbox') + + event.shaped('tfclunchbox:cooling_lunchbox', [ + ' C ', + 'ABA' + ], { + A: '#forge:plates/red_steel', + B: 'tfclunchbox:lunchbox', + C: '#forge:tools/hammers' + }).id('tfclunchbox:upgrade_to_cooling_lunchbox') + + event.remove({ id: 'tfclunchbox:universal_capsule' }) + event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' }) + + event.recipes.gtceu.assembler('tfclunchbox:universal_capsule') + .itemInputs('1x #forge:plates/red_steel', '1x #forge:rings/sterling_silver') + .itemOutputs('tfclunchbox:universal_capsule') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') + .itemInputs('tfclunchbox:universal_capsule') + .inputFluids(Fluid.of('gtceu:ice', 144 * 9)) + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') + .itemInputs('tfclunchbox:universal_capsule', 'minecraft:packed_ice') + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 9c8e2ee1b..a6c58fdb0 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -253,6 +253,13 @@ function registerTFGMiscellaneousRecipes(event) { .duration(20) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.fluid_solidifier('tfg:ice') + .inputFluids(Fluid.of('minecraft:water', 144)) + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:ice') + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers']) // Cooling water From f53fb9b51baefb029283adabdc7ed6247c9e7eab Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 16:33:07 +0100 Subject: [PATCH 28/48] added tfc-lunchbox to pakku too --- pakku-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 4aabc5f2a..536198b0a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7890,6 +7890,48 @@ } ] }, + { + "pakku_id": "B9nXYwWrLGp1WG43", + "pakku_links": [ + "fMkiGcRPRv1DdRC1" + ], + "type": "MOD", + "slug": { + "curseforge": "tfc-lunch-box" + }, + "name": { + "curseforge": "TFC Lunch Box" + }, + "id": { + "curseforge": "1283445" + }, + "files": [ + { + "type": "curseforge", + "file_name": "tfclunchbox-1.20.1-1.0.0.10.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/6633/524/tfclunchbox-1.20.1-1.0.0.10.jar", + "id": "6633524", + "parent_id": "1283445", + "hashes": { + "sha1": "0b3dd4ed090848d136fc15586f5fb8212f1f19b0", + "md5": "c8835a37c829f86448b87601ac58cf9b" + }, + "required_dependencies": [ + "302973" + ], + "size": 93079, + "date_published": "2025-06-09T15:46:48.850Z" + } + ] + }, { "pakku_id": "O9o4v50wMwsyPZeQ", "pakku_links": [ From e1aec5977c32d2573f1721c2d39ba4e5bfdebb40 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 16:36:03 +0100 Subject: [PATCH 29/48] fixes warnings about metal bars in the cutter --- kubejs/server_scripts/gregtech/recipes.materials.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 5b73e9b20..f4ab5a5d1 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -843,7 +843,6 @@ function registerGTCEUMetalRecipes(event) { .itemOutputs(barsStack) .duration(100) .EUt(GTValues.VA[GTValues.LV]) - .circuit(1) } forEachMaterial(material => { From 01ce7e19fb9d6acc0e92e06484e46449caab4094 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 16:58:06 +0100 Subject: [PATCH 30/48] moved backpack size data to its own file, added lunchbox size data --- kubejs/server_scripts/main_server_script.js | 2 ++ kubejs/server_scripts/sophisticated_backpacks/data.js | 11 +++++++++++ kubejs/server_scripts/tfc/data.js | 5 ----- kubejs/server_scripts/tfclunchbox/data.js | 8 ++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 kubejs/server_scripts/sophisticated_backpacks/data.js create mode 100644 kubejs/server_scripts/tfclunchbox/data.js diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 15d4d8c0c..412b0ca10 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -126,8 +126,10 @@ TFCEvents.data(event => { registerTFCDataForChalk(event); registerTFCDataForGTCEU(event) registerTFCDataForImmersiveAircraft(event); + registerTFCDataForSophisticatedBackpacks(event) registerTFCDataForTFC(event) registerTFCDataForTFCBetterBF(event) + registerTFCDataForTFCLunchbox(event) registerTFCDataForWaterFlasks(event) registerTFCDataForFirmalife(event) }) diff --git a/kubejs/server_scripts/sophisticated_backpacks/data.js b/kubejs/server_scripts/sophisticated_backpacks/data.js new file mode 100644 index 000000000..bc840199c --- /dev/null +++ b/kubejs/server_scripts/sophisticated_backpacks/data.js @@ -0,0 +1,11 @@ +// priority: 0 + +function registerTFCDataForSophisticatedBackpacks(event) { + + event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size') + event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size') + event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size') + event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size') + event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size') + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index dfa3f8b19..e49817b46 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -186,11 +186,6 @@ const registerTFCKnappingTypes = (event) => { //#region registerTFCItemSize const registerTFCItemSize = (event) => { - event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size') - event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size') - event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size') - event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size') - event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size') global.MINECRAFT_DYE_NAMES.forEach (color => { event.itemSize(`tfg:decorative_vase/${color}`, 'normal', 'medium', `decorative_vase/${color}`) diff --git a/kubejs/server_scripts/tfclunchbox/data.js b/kubejs/server_scripts/tfclunchbox/data.js new file mode 100644 index 000000000..6cc843dd2 --- /dev/null +++ b/kubejs/server_scripts/tfclunchbox/data.js @@ -0,0 +1,8 @@ +// priority: 0 + +function registerTFCDataForTFCLunchbox(event) { + + event.itemSize('tfclunchbox:lunchbox', 'large', 'heavy', 'lunchbox_size') + event.itemSize('tfclunchbox:cooling_lunchbox', 'large', 'heavy', 'cooling_lunchbox_size') + +} \ No newline at end of file From c91f8efe0efecb0b38c859f7e6da9f6a80b98e81 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 17:06:14 +0100 Subject: [PATCH 31/48] changed LV optional quests to correctly have the heart icon --- config/ftbquests/quests/chapters/lv__low_voltage.snbt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index bed75d265..425ba06f9 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -117,7 +117,7 @@ description: ["{quests.low_voltage.lv_amp_explanation.desc}"] id: "7B0FF43022F6C2EC" optional: true - shape: "rsquare" + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_amp_explanation.subtitle}" tasks: [{ @@ -673,7 +673,8 @@ ] icon: "gtceu:fluid_cell" id: "292938760AB9A12B" - shape: "square" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.universal_cell.subtitle}" tasks: [{ @@ -691,6 +692,7 @@ icon: "gtceu:rotor_casting_mold" id: "115C4226F6473F0C" optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.mold_rotor.subtitle}" tasks: [ @@ -1112,6 +1114,7 @@ icon: "gtceu:lv_rock_crusher" id: "1F2359106FC95603" optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}" tasks: [{ @@ -1139,6 +1142,7 @@ icon: "gtceu:lv_charger_4x" id: "2DB259568F347C0E" optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_turbo_charge.subtitle}" tasks: [{ @@ -1166,6 +1170,7 @@ icon: "gtceu:lv_fisher" id: "3B26CA44EA955B07" optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_fisher.subtitle}" tasks: [{ @@ -1409,6 +1414,7 @@ icon: "tfg:lv_aqueous_accumulator" id: "47E6F8AC20D51814" optional: true + shape: "heart" subtitle: "{quests.low_voltage.lv_aqueous_accumulator.subtitle}" tasks: [{ id: "685FCAE71ECE04BC" From 4d492e261d5227caf53895aaffa2cd861776ac61 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 17:06:45 +0100 Subject: [PATCH 32/48] added lunchbox quest --- .../quests/chapters/queststfc_tips.snbt | 84 ++++++++++++++++--- kubejs/assets/tfg/lang/en_us.json | 6 +- 2 files changed, 78 insertions(+), 12 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 78062b116..a325d9661 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1228,6 +1228,7 @@ dependency_requirement: "one_completed" description: ["{quests.tfg_tips.refrigerator.desc}"] id: "58EC77A796979E68" + shape: "gear" size: 2.0d subtitle: "{quests.tfg_tips.refrigerator.subtitle}" tasks: [{ @@ -1236,8 +1237,8 @@ type: "item" }] title: "{quests.tfg_tips.refrigerator.title}" - x: 9.0d - y: -17.0d + x: 5.5d + y: -18.0d } { dependencies: ["2EFB241490502DB3"] @@ -1398,8 +1399,7 @@ dependency_requirement: "one_completed" description: ["{quests.tfg_tips.cellar.desc}"] id: "3D1FF501DE2E56FE" - shape: "gear" - size: 4.0d + size: 1.5d subtitle: "{quests.tfg_tips.cellar.subtitle}" tasks: [ { @@ -1422,8 +1422,8 @@ } ] title: "{quests.tfg_tips.cellar.title}" - x: 3.5d - y: -17.0d + x: 3.0d + y: -16.0d } { dependencies: ["3D1FF501DE2E56FE"] @@ -1443,8 +1443,8 @@ type: "item" }] title: "{quests.tfg_tips.cellar_blocks.title}" - x: 3.5d - y: -20.0d + x: 3.0d + y: -17.5d } { dependencies: ["2EFB241490502DB3"] @@ -1611,7 +1611,7 @@ }] title: "{quests.tfg_tips.passive_preservation.title}" x: 6.5d - y: -15.5d + y: -16.0d } { dependencies: ["4047EE998BC4CD03"] @@ -3637,8 +3637,8 @@ type: "item" }] title: "{quests.tfg_tips.vessel_preservation.title}" - x: 6.5d - y: -16.5d + x: 8.0d + y: -16.0d } { dependencies: ["173F6FA60A5B280B"] @@ -5314,6 +5314,68 @@ x: 4.75d y: -12.5d } + { + dependencies: ["13F7066858E923FF"] + description: ["{quests.tfg_tips.lunchbox.desc}"] + icon: { + Count: 1 + id: "tfclunchbox:lunchbox" + tag: { + SelectedSlot: 0 + } + } + id: "6C18E8F79A841620" + shape: "gear" + size: 2.0d + subtitle: "{quests.tfg_tips.lunchbox.subtitle}" + tasks: [ + { + id: "33971FCF02C81741" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfclunchbox:lunchbox)item(tfclunchbox:cooling_lunchbox))" + } + } + title: "{quests.tfg_tips.lunchbox.task}" + type: "item" + } + { + id: "5439AF9F5493A3D1" + item: { + Count: 1 + id: "tfclunchbox:universal_capsule" + tag: { + Damage: 0 + Durability: 10 + display: { + Name: "{\"translate\":\"item.tfclunchbox.universal_capsule.filled\"}" + } + } + } + match_nbt: false + optional_task: true + type: "item" + } + { + id: "134E8B8345E6DEE2" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfclunchbox:ice)" + } + } + optional_task: true + title: "Any #tfclunchbox:ice" + type: "item" + } + ] + title: "{quests.tfg_tips.lunchbox.title}" + x: 7.5d + y: -18.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 5454b4de1..f0a59c999 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2411,5 +2411,9 @@ "quests.tfg_tips.piglin_disguise.desc": "Do you feel like you don't belong?\n Do the &4Piglin&r attack you at your school because of your appearance?\n Try wearing a &aPiglin Disguise&r to ward off unwanted attention and blend right in.", "quests.tfg_tips.trowel.title": "Trowel", "quests.tfg_tips.trowel.subtitle": "Inspired by Quark!", - "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r." + "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r.", + "quests.tfg_tips.lunchbox.title": "Lunch Box", + "quests.tfg_tips.lunchbox.subtitle": "A refrigerator in your pocket!", + "quests.tfg_tips.lunchbox.desc": "Lunch boxes have 9 slots for food, keeping it cold and longer lasting.\nThe Cooling Lunchbox has a stronger effect than the regular one, but needs to be provided with ice or capsules that will thaw over time.", + "quests.tfg_tips.lunchbox.task": "Any Lunch Box" } \ No newline at end of file From 601e92427b3cd960b2dd3a945c76594317822fb9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 17:06:59 +0100 Subject: [PATCH 33/48] more lunchbox stuff --- CHANGELOG.md | 1 + kubejs/server_scripts/tfclunchbox/recipes.js | 4 ++-- kubejs/startup_scripts/gtceu/materials.js | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3e87654b..3cebabc1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added back the vanilla stonecutter @Pyritie - Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 - Added create conductor recipes (#1144) @JeanRdSz +- Added lunch boxes! They keep your food cool and you can even eat right out of them! @Thomasx0 ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 6d2d3d954..35c80caed 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -39,14 +39,14 @@ function registerTFCLunchBoxRecipes(event) { event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' }) event.recipes.gtceu.assembler('tfclunchbox:universal_capsule') - .itemInputs('1x #forge:plates/red_steel', '1x #forge:rings/sterling_silver') + .itemInputs('1x #forge:foils/red_steel', '1x #forge:rings/sterling_silver') .itemOutputs('tfclunchbox:universal_capsule') .duration(100) .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') .itemInputs('tfclunchbox:universal_capsule') - .inputFluids(Fluid.of('gtceu:ice', 144 * 9)) + .inputFluids(Fluid.of('gtceu:ice', 144)) .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index f92bc29b4..089d4e92f 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -37,7 +37,8 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_FRAME, GENERATE_PLATE, GENERATE_DENSE, - GENERATE_RING + GENERATE_RING, + GENERATE_FOIL } = $MATERIAL_FLAGS var metalTooling = [ @@ -194,7 +195,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); - GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); + GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); GTMaterials.Copper.addFlags(GENERATE_BOLT_SCREW); From 6e9f2401ac22d5867cf06bcb65035bb6e812c207 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 17:09:00 +0100 Subject: [PATCH 34/48] lunchbox adjustments --- kubejs/server_scripts/tfclunchbox/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 35c80caed..bc9ccb34c 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -52,7 +52,7 @@ function registerTFCLunchBoxRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') - .itemInputs('tfclunchbox:universal_capsule', 'minecraft:packed_ice') + .itemInputs('tfclunchbox:universal_capsule', 'minecraft:ice') .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) From 24da0baeb639ff9cba64895ab1a4bcffdc548f15 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 21:21:30 +0100 Subject: [PATCH 35/48] fixed steel millstone not actually needing steel, fixed its recycling recipe --- kubejs/server_scripts/greate/recipes.js | 9 +++++---- kubejs/server_scripts/greate/recipes.recycling.js | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index c7ecafb29..45d0527a5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -186,18 +186,19 @@ function registerGreateRecipes(event) { event.shaped('greate:steel_millstone', [ 'FBF', 'DCE', - 'AAA' + 'AGA' ], { A: '#forge:smooth_stone', B: 'gtceu:treated_wood_slab', - C: '#forge:small_gears/wrought_iron', + C: '#forge:small_gears/steel', D: '#forge:tools/hammers', E: '#forge:tools/wrenches', - F: '#forge:dusts/diamond' + F: '#forge:dusts/diamond', + G: 'greate:steel_shaft' }).id('greate:shaped/steel_millstone') event.recipes.gtceu.assembler('greate:steel_millstone') - .itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/wrought_iron', '2x #forge:dusts/diamond') + .itemInputs('2x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/steel', '2x #forge:dusts/diamond', 'greate:steel_shaft') .itemOutputs('greate:steel_millstone') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 2d07fee96..e6f7ce099 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -103,19 +103,20 @@ function registerGreateRecyclingRecipes(event) { event.recipes.gtceu.macerator('greate:steel_millstone') .itemInputs('greate:steel_millstone') .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1), + ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 10), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Stone, 2), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2), ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2)) - .duration(GTMaterials.Steel.getMass() * 4) + .duration(GTMaterials.Stone.getMass() * 4) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.arc_furnace('greate:steel_millstone') .itemInputs('greate:steel_millstone') .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1)) - .duration(GTMaterials.Steel.getMass() * 4) + ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 10), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)) + .duration(GTMaterials.Stone.getMass() * 4) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) From e037e0fcc8541c712fcf3c4c2c863a22b2da9e0e Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Wed, 11 Jun 2025 00:12:45 -0500 Subject: [PATCH 36/48] Update build.yml (#1155) Co-authored-by: Xikaro --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 318d69f90..bd9433bc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -388,12 +388,12 @@ jobs: fi echo "✔️ All artifacts found" - - name: 🚫 Сlose label "Done" - uses: Xikaro/close-issues-based-on-label@master - env: - LABEL: "Status: Done" - COMMENT: In ${{ needs.info.outputs.project_version }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: 🚫 Сlose label "Done" + # uses: Xikaro/close-issues-based-on-label@master + # env: + # LABEL: "Status: Done" + # COMMENT: In ${{ needs.info.outputs.project_version }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: 📄 Format diff id: format_diff From 390bdc3cba24fa9503a2c9d0ee8244ea591940a6 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Wed, 11 Jun 2025 01:30:43 -0500 Subject: [PATCH 37/48] Update pakku-lock (#1157) * - Added loot table to piglin disguise and updated its texture. - Reformated lootjs file * - Update pakku-lock.json --- pakku-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 536198b0a..20e40322a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -467,7 +467,7 @@ "files": [ { "type": "curseforge", - "file_name": "afc-1.0.17-1.20.1.jar", + "file_name": "afc-1.0.18-1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -476,18 +476,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6549/467/afc-1.0.17-1.20.1.jar", - "id": "6549467", + "url": "https://edge.forgecdn.net/files/6635/351/afc-1.0.18-1.20.1.jar", + "id": "6635351", "parent_id": "877545", "hashes": { - "sha1": "abd0379e85da6bce0e47341a5f51909cc57e1744", - "md5": "701563a64374eb0825c54e063fdd407d" + "sha1": "c2cfffcce7ff7c1c978326a674389fcbdfb61fd4", + "md5": "cb8183be65ca88c20b111e9ae9083dd7" }, "required_dependencies": [ "302973" ], - "size": 5105665, - "date_published": "2025-05-20T04:37:38.210Z" + "size": 5117468, + "date_published": "2025-06-10T03:09:58.637Z" } ] }, From a03ea2a556ec29fe11be54f098653b825c671aad Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 11 Jun 2025 19:43:20 +0100 Subject: [PATCH 38/48] hi hecuba --- .../endermanoverhaul/loot_tables/entities/cave_enderman.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json index 33a5fe22a..e57137623 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -31,7 +31,7 @@ "function": "minecraft:set_count" } ], - "name": "gtceu:raw_coal" + "name": "tfc:ore/normal_native_gold" }, { "type": "minecraft:item", From ff49260d5f27e46bc72a5998806703d0e77b8b70 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 11 Jun 2025 20:18:34 +0100 Subject: [PATCH 39/48] added cinnabar to the piglin barter table --- .../field_guide/en_us/entries/beneath/piglins.json | 4 ++-- .../minecraft/loot_tables/gameplay/piglin_bartering.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json index 531438937..0bb2ede69 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json @@ -18,11 +18,11 @@ { "type": "patchouli:text", "title": "Trade Results", - "text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)4-6 Sulfur Powder" + "text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)1 Cinnabar Gem" }, { "type": "patchouli:text", - "text": "$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks" + "text": "$(li)4-6 Sulfur Powder$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks" }, { "type": "patchouli:text", diff --git a/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json b/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json index 886d98ca0..51858e529 100644 --- a/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json +++ b/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json @@ -115,6 +115,11 @@ "name": "gtceu:nickel_ingot", "weight": 100 }, + { + "type": "minecraft:item", + "name": "gtceu:cinnabar_gem", + "weight": 100 + }, { "type": "minecraft:item", "name": "minecraft:leather", From 09a9891a8a7d86277731a851c4f2715c600b66de Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 11 Jun 2025 20:20:21 +0100 Subject: [PATCH 40/48] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cebabc1f..abc029763 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Added create conductor recipes (#1144) @JeanRdSz - Added lunch boxes! They keep your food cool and you can even eat right out of them! @Thomasx0 ### Changes +- Added cinnabar to piglin bartering and changed the deep cave enderman loot table to raw gold instead of coal @Pyritie ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie @@ -14,7 +15,7 @@ - Quest fixes (#1119, #1142) @TomPlop - Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz - Fixed piglin disguise loot table giving the wrong item (#1151) @Redeix -- Fixed create encased large cogwheel drops (#1148) @Taskeren [Credit](https://github.com/ElytraServers/Greate-Encased-Cogwheel-Drop-Fix) +- Fixed create encased large cogwheel drops (#1148) @Taskeren ## [0.9.10] - 05.06.2025 ### New features From cc26bf9fca15408b1a12625525297640aebe16e0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 11 Jun 2025 20:30:22 +0100 Subject: [PATCH 41/48] latex balance changes --- CHANGELOG.md | 2 + .../arborfirmacraft/tapping_index.json | 6 +-- kubejs/server_scripts/afc/recipes.js | 41 +++++++++---------- .../vintage_improvements/recipes.js | 6 +-- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc029763..ca77157fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Added lunch boxes! They keep your food cool and you can even eat right out of them! @Thomasx0 ### Changes - Added cinnabar to piglin bartering and changed the deep cave enderman loot table to raw gold instead of coal @Pyritie +- Nerfed extraction of latex from logs to encourage tree taps instead @Pyritie +- Adjusted temperature tolerance of latex trees, check the field guide for specifics @Pyritie ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json index cfcd8d059..aaa416ef1 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json @@ -47,7 +47,7 @@ "title": "Hevea", "item": "afc:wood/log/hevea,afc:wood/wood/hevea,afc:wood/leaves/hevea,afc:wood/sapling/hevea", "link_recipe": false, - "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 22°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb" + "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 8°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb" }, { "type": "patchouli:image", @@ -61,7 +61,7 @@ "title": "Rubber Fig", "item": "afc:wood/log/rubber_fig,afc:wood/wood/rubber_fig,afc:wood/leaves/rubber_fig,afc:wood/sapling/rubber_fig", "link_recipe": false, - "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb" + "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 4°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb" }, { "type": "patchouli:image", @@ -75,7 +75,7 @@ "title": "Kapok", "item": "tfc:wood/log/kapok,tfc:wood/wood/kapok,tfc:wood/leaves/kapok,tfc:wood/sapling/kapok", "link_recipe": false, - "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 1°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb" + "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb" }, { "type": "patchouli:image", diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 33701789a..c42ac322b 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -86,39 +86,36 @@ const registerAFCRecipes = (event) => { .id('tfg:heating/tree_tap') //Custom rubber and hevea tappings - //Hevea is the most efficient but requires the warmest temperatures - //Rubber fig requires average temperatures and its mildly efficient - event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea")) - .resultFluid(Fluid.of("tfg:latex", 3)) - .minTemp(22) - .requiresNaturalLog(true) - .id("tfg:tree_tapping/latex/hevea") - event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea")) - .resultFluid(Fluid.of("tfg:latex", 3)) - .minTemp(22) - .requiresNaturalLog(true) - .id("tfg:tree_tapping/latex/ancient_hevea") - event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/rubber_fig")) - .resultFluid(Fluid.of("tfg:latex", 2)) - .minTemp(12) + .resultFluid(Fluid.of("tfg:latex", 1)) + .minTemp(4) .requiresNaturalLog(true) .id("tfg:tree_tapping/latex/rubber_fig") event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_rubber_fig")) - .resultFluid(Fluid.of("tfg:latex", 2)) - .minTemp(12) + .resultFluid(Fluid.of("tfg:latex", 1)) + .minTemp(4) .requiresNaturalLog(true) .id("tfg:tree_tapping/latex/ancient_rubber_fig") - //Kapok Grandfathered, least efficient but works as long as the temperature is not freezing + event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea")) + .resultFluid(Fluid.of("tfg:latex", 2)) + .minTemp(8) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/latex/hevea") + event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea")) + .resultFluid(Fluid.of("tfg:latex", 2)) + .minTemp(8) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/latex/ancient_hevea") + event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/kapok")) - .resultFluid(Fluid.of("tfg:latex", 1)) - .minTemp(1) + .resultFluid(Fluid.of("tfg:latex", 3)) + .minTemp(12) .requiresNaturalLog(true) .id("tfg:tree_tapping/kapok_latex") event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok")) - .resultFluid(Fluid.of("tfg:latex", 1)) - .minTemp(1) + .resultFluid(Fluid.of("tfg:latex", 3)) + .minTemp(12) .requiresNaturalLog(true) .id("tfg:tree_tapping/ancient_kapok_latex") diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 2aa7f2704..14ef74306 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -575,21 +575,21 @@ function registerVintageImprovementsRecipes(event) { event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ tag: 'tfg:latex_logs' }], - results: [{ fluid: 'tfg:latex', amount: 250 }], + results: [{ fluid: 'tfg:latex', amount: 100 }], processingTime: 600 }).id('tfg:vi/vacuumizing/latex_from_rubber_logs') event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ tag: 'tfg:rubber_saplings' }], - results: [{ fluid: 'tfg:latex', amount: 100 }], + results: [{ fluid: 'tfg:latex', amount: 25 }], processingTime: 300 }).id('tfg:vi/vacuumizing/latex_from_rubber_sapling') event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ tag: 'tfg:rubber_leaves' }], - results: [{ fluid: 'tfg:latex', amount: 50 }], + results: [{ fluid: 'tfg:latex', amount: 10 }], processingTime: 150 }).id('tfg:vi/vacuumizing/latex_from_rubber_leaves') From 3dd247ab7ed601b990a0b96aff1b6f5342611df8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 11 Jun 2025 20:58:52 +0100 Subject: [PATCH 42/48] pakku updates --- pakku-lock.json | 119 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 20e40322a..981c19957 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -229,7 +229,7 @@ "files": [ { "type": "curseforge", - "file_name": "AdvancedPeripherals-1.20.1-0.7.43r.jar", + "file_name": "AdvancedPeripherals-1.20.1-0.7.44r.jar", "mc_versions": [ "1.20.1" ], @@ -238,18 +238,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6577/898/AdvancedPeripherals-1.20.1-0.7.43r.jar", - "id": "6577898", + "url": "https://edge.forgecdn.net/files/6623/216/AdvancedPeripherals-1.20.1-0.7.44r.jar", + "id": "6623216", "parent_id": "431725", "hashes": { - "sha1": "a6f544738d3c0bb38712dededf12d0e80bd357c7", - "md5": "3b54478098221219b35146ceac7c6133" + "sha1": "7dd9807debcc9eb475bc67a5156bca19a7b46578", + "md5": "8731f8e8503a6e7a5f9f87d59b96d13e" }, "required_dependencies": [ "282001" ], - "size": 885577, - "date_published": "2025-05-26T17:39:08.747Z" + "size": 885693, + "date_published": "2025-06-06T22:01:06.353Z" } ] }, @@ -389,7 +389,7 @@ "files": [ { "type": "curseforge", - "file_name": "appliedenergistics2-forge-15.4.4.jar", + "file_name": "appliedenergistics2-forge-15.4.5.jar", "mc_versions": [ "1.20.1" ], @@ -397,18 +397,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6605/410/appliedenergistics2-forge-15.4.4.jar", - "id": "6605410", + "url": "https://edge.forgecdn.net/files/6629/570/appliedenergistics2-forge-15.4.5.jar", + "id": "6629570", "parent_id": "223794", "hashes": { - "sha1": "8660d742d2f8d8b7bdadae76e84144587811e9d2", - "md5": "74cc19c79dd5dbfa3e511597c7fc0592" + "sha1": "7ee55608d1625ec1fb22d60bd73aa31fe80cc896", + "md5": "92d85cc2573550525f9b9a647f9f8459" }, "required_dependencies": [ "1173950" ], - "size": 8413070, - "date_published": "2025-06-01T14:46:39.523Z" + "size": 8413069, + "date_published": "2025-06-08T13:24:02.623Z" } ] }, @@ -722,6 +722,45 @@ } ] }, + { + "pakku_id": "oKnJXlzNyfYcMTcv", + "type": "MOD", + "slug": { + "curseforge": "baguettelib" + }, + "name": { + "curseforge": "BaguetteLib" + }, + "id": { + "curseforge": "1264423" + }, + "files": [ + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", + "mc_versions": [ + "1.20.2", + "1.20.3", + "1.20.1", + "1.20.4" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6523/425/baguettelib-1.20.1-Forge-1.0.0.jar", + "id": "6523425", + "parent_id": "1264423", + "hashes": { + "sha1": "bb17d8ed796efce38eb8fcc72ec477f3373e6c9f", + "md5": "f27a8d6a333579d93a9881100d559b56" + }, + "required_dependencies": [], + "size": 26550, + "date_published": "2025-05-12T19:47:40.637Z" + } + ] + }, { "pakku_id": "eIMAkTQ4QJiCSZSg", "type": "MOD", @@ -1822,7 +1861,7 @@ "files": [ { "type": "curseforge", - "file_name": "corpse-forge-1.20.1-1.0.20.jar", + "file_name": "corpse-forge-1.20.1-1.0.21.jar", "mc_versions": [ "1.20.1" ], @@ -1830,21 +1869,24 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6121/243/corpse-forge-1.20.1-1.0.20.jar", - "id": "6121243", + "url": "https://edge.forgecdn.net/files/6624/394/corpse-forge-1.20.1-1.0.21.jar", + "id": "6624394", "parent_id": "316582", "hashes": { - "sha1": "fc5cd03dd52f24467c879b44296ddc70b85398f4", - "md5": "143d3e76139de3b9186849f494a41af6" + "sha1": "fb68fba706e0a41f1e46492e0d54fde4945b8a05", + "md5": "346a9e592558c1fde772b39c10be4cdf" }, "required_dependencies": [], - "size": 244994, - "date_published": "2025-01-24T21:52:45.963Z" + "size": 245618, + "date_published": "2025-06-07T07:02:24.647Z" } ] }, { "pakku_id": "v5lo2gHNUaKnn445", + "pakku_links": [ + "oKnJXlzNyfYcMTcv" + ], "type": "MOD", "slug": { "curseforge": "corpse-x-curios-api-compat" @@ -1858,28 +1900,31 @@ "files": [ { "type": "curseforge", - "file_name": "corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", + "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar", "mc_versions": [ "1.20.2", "1.20.3", "1.20.1", - "1.20", "1.20.4" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6327/919/corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", - "id": "6327919", + "url": "https://edge.forgecdn.net/files/6616/671/corpsecurioscompat-1.20.x-Forge-3.0.2.jar", + "id": "6616671", "parent_id": "1138130", "hashes": { - "sha1": "1e00db91b74287eb63f389c6c8cb5a70df41f8e0", - "md5": "82d54c35a60a963f292dc3f3fd3b3af2" + "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac", + "md5": "f760be75a5b1c4c22c9327e72cd08a2c" }, - "required_dependencies": [], - "size": 9117, - "date_published": "2025-03-21T09:35:57.857Z" + "required_dependencies": [ + "309927", + "1264423", + "316582" + ], + "size": 12495, + "date_published": "2025-06-05T08:45:11.493Z" } ] }, @@ -4514,7 +4559,7 @@ "files": [ { "type": "curseforge", - "file_name": "guideme-20.1.7.jar", + "file_name": "guideme-20.1.8.jar", "mc_versions": [ "1.20.1" ], @@ -4522,16 +4567,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6489/464/guideme-20.1.7.jar", - "id": "6489464", + "url": "https://edge.forgecdn.net/files/6634/593/guideme-20.1.8.jar", + "id": "6634593", "parent_id": "1173950", "hashes": { - "sha1": "fc039093c479b3632b1ab60ea503e79b76b686f9", - "md5": "01ca90ca84ab2f886e4c5a2101934d00" + "sha1": "cc5e96b09949c5f1ad5d6aa5c45695f760715e95", + "md5": "38d8791dc9114d9cf6bcd5f2af1402e7" }, "required_dependencies": [], - "size": 9401162, - "date_published": "2025-05-03T00:27:09.520Z" + "size": 9401167, + "date_published": "2025-06-09T21:54:55.087Z" } ] }, From d12d2001c3d614e05975d95b5e0b412be9cc1eac Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Thu, 12 Jun 2025 02:27:08 -0500 Subject: [PATCH 43/48] Update lunch box recipe (#1159) * - Added loot table to piglin disguise and updated its texture. - Reformated lootjs file * - Update pakku-lock.json * Update recipes.js Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --- kubejs/server_scripts/tfclunchbox/recipes.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index bc9ccb34c..5be011186 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -45,15 +45,15 @@ function registerTFCLunchBoxRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') - .itemInputs('tfclunchbox:universal_capsule') - .inputFluids(Fluid.of('gtceu:ice', 144)) - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + .itemInputs('tfclunchbox:universal_capsule') + .inputFluids(Fluid.of('gtceu:ice', 6624)) + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') .itemInputs('tfclunchbox:universal_capsule', 'minecraft:ice') .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) -} \ No newline at end of file +} From d7d590ee7bdecbc2ddff1c8717dae42868530f46 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 12 Jun 2025 10:11:58 +0100 Subject: [PATCH 44/48] lunchbox capsule recipe tweaks --- kubejs/server_scripts/tfclunchbox/recipes.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 5be011186..0654a12b2 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -45,15 +45,15 @@ function registerTFCLunchBoxRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') - .itemInputs('tfclunchbox:universal_capsule') - .inputFluids(Fluid.of('gtceu:ice', 6624)) - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + .itemInputs('tfclunchbox:universal_capsule') + .inputFluids(Fluid.of('gtceu:ice', 45 * 144)) + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') - .itemInputs('tfclunchbox:universal_capsule', 'minecraft:ice') - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:10}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice') + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) } From db1907f1a5a959ed5cd01e5b0154fa3132cfdad1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 12 Jun 2025 20:38:22 +0100 Subject: [PATCH 45/48] pakku updates --- pakku-lock.json | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 981c19957..c9b4d2e92 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7953,7 +7953,7 @@ "files": [ { "type": "curseforge", - "file_name": "tfclunchbox-1.20.1-1.0.0.10.jar", + "file_name": "tfclunchbox-1.20.1-1.0.0.12.jar", "mc_versions": [ "1.20.1" ], @@ -7962,18 +7962,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6633/524/tfclunchbox-1.20.1-1.0.0.10.jar", - "id": "6633524", + "url": "https://edge.forgecdn.net/files/6643/499/tfclunchbox-1.20.1-1.0.0.12.jar", + "id": "6643499", "parent_id": "1283445", "hashes": { - "sha1": "0b3dd4ed090848d136fc15586f5fb8212f1f19b0", - "md5": "c8835a37c829f86448b87601ac58cf9b" + "sha1": "cc2de84c55a6857c49eb5b60a9d128a696b8915c", + "md5": "ce2f05409aedb7d6b7312e20a4baed23" }, - "required_dependencies": [ - "302973" - ], - "size": 93079, - "date_published": "2025-06-09T15:46:48.850Z" + "required_dependencies": [], + "size": 95743, + "date_published": "2025-06-12T12:57:40.230Z" } ] }, @@ -8382,7 +8380,7 @@ "files": [ { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.6.7.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.6.8.jar", "mc_versions": [ "1.20.1" ], @@ -8391,19 +8389,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6613/427/TerraFirmaGreg-Core-Modern-0.6.7.jar", - "id": "6613427", + "url": "https://edge.forgecdn.net/files/6641/343/TerraFirmaGreg-Core-Modern-0.6.8.jar", + "id": "6641343", "parent_id": "513402", "hashes": { - "sha1": "76662e65565207a7682cafd39ef068e4c0a98516", - "md5": "7c41c1ca1a8a9edf0e9fb72bdf5ebf44" + "sha1": "989c76bb022dd8fdc0363c6ff9bdaa1665ff6571", + "md5": "ada07963205a8b7089d6b9664c833286" }, "required_dependencies": [ - "302973", - "890405" + "890405", + "302973" ], - "size": 297697, - "date_published": "2025-06-04T11:47:57.083Z" + "size": 297767, + "date_published": "2025-06-11T20:08:19.890Z" } ] }, From 77d981c5fa206b04c4ba730d5679811df970c7f8 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Fri, 13 Jun 2025 11:43:34 -0500 Subject: [PATCH 46/48] Update pakku-lock.json for lunchbox fix (#1164) * - Update pakku-lock.json for lunchbox fix * - Update pakku-lock.json --- pakku-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index c9b4d2e92..033dbd515 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7953,7 +7953,7 @@ "files": [ { "type": "curseforge", - "file_name": "tfclunchbox-1.20.1-1.0.0.12.jar", + "file_name": "tfclunchbox-1.20.1-1.0.0.14.jar", "mc_versions": [ "1.20.1" ], @@ -7962,16 +7962,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6643/499/tfclunchbox-1.20.1-1.0.0.12.jar", - "id": "6643499", + "url": "https://edge.forgecdn.net/files/6646/846/tfclunchbox-1.20.1-1.0.0.14.jar", + "id": "6646846", "parent_id": "1283445", "hashes": { - "sha1": "cc2de84c55a6857c49eb5b60a9d128a696b8915c", - "md5": "ce2f05409aedb7d6b7312e20a4baed23" + "sha1": "de4051c4345290b9d99f2d26090ad466f112b3ec", + "md5": "ada6f65d0fc9785a34b9deb76c53e882" }, "required_dependencies": [], - "size": 95743, - "date_published": "2025-06-12T12:57:40.230Z" + "size": 95828, + "date_published": "2025-06-13T12:54:20.803Z" } ] }, From c8203a17ce5938ba80b02f34f97629064a7b1e14 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Fri, 13 Jun 2025 22:09:57 +0500 Subject: [PATCH 47/48] Update pakku-lock.json --- pakku-lock.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pakku-lock.json b/pakku-lock.json index 033dbd515..3ba80dea1 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2616,7 +2616,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6714,6 +6714,7 @@ "id": { "curseforge": "585406" }, + "export": false, "files": [ { "type": "curseforge", From a6a5810b7e405e30b65b92ea4b686e6954ad1fc7 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Fri, 13 Jun 2025 22:11:48 +0500 Subject: [PATCH 48/48] bump --- CHANGELOG.md | 6 ++++++ pakku.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca77157fe..ebb94f903 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog + ## [Unreleased] ### New features +### Bug fixes +### Changes + +## [0.9.11] - 13.06.2025 +### New features - Added back the vanilla stonecutter @Pyritie - Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 - Added create conductor recipes (#1144) @JeanRdSz diff --git a/pakku.json b/pakku.json index d6425913f..f3b69e9b5 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.10", + "version": "0.9.11", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [