From ffcc45475ed7933c416e34561f9170802c57e017 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 20:51:36 +0100 Subject: [PATCH] #1625 and #1623 Related Work Items: #16, #1625 --- CHANGELOG.md | 2 ++ kubejs/server_scripts/gregtech/recipes.js | 13 ++++++++++--- kubejs/server_scripts/tfc/tags.js | 1 + kubejs/server_scripts/tfg/tags.js | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86de43061..35765aa48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie +- Firmalife mixing bowls can now be placed on tool racks (#1623) @Pyritie +- Fixed recipe for pyroxenite button (again) (#1625) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 2ddfce76e..4d7fc9cf0 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1378,12 +1378,19 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VA[GTValues.LV]) // Buttons - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_distilled_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') removeCutterRecipe(event, 'blackstone_button') removeCutterRecipe(event, 'blackstone_button_water') removeCutterRecipe(event, 'blackstone_button_distilled_water') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button_water') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button_distilled_water') + + event.recipes.gtceu.cutter('tfg:blackstone_button') + .itemInputs('minecraft:polished_blackstone_pressure_plate') + .itemOutputs('6x minecraft:polished_blackstone_button') + .EUt(7) + .duration(100) + event.replaceOutput({ id: 'gtceu:cutter/bamboo_button' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index dacd213d5..9b7427fe0 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -59,6 +59,7 @@ const registerTFCItemTags = (event) => { event.add('tfc:usable_on_tool_rack', 'waterflasks:iron_flask') event.add('tfc:usable_on_tool_rack', 'waterflasks:red_steel_flask') event.add('tfc:usable_on_tool_rack', 'tfc:wool_cloth') + event.add('tfc:usable_on_tool_rack', 'firmalife:mixing_bowl') // Ингредиенты для закваски event.add('tfg:ferments_to_rennet', 'tfc:food/soybean') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9ec621689..1e47a216e 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -296,6 +296,10 @@ const registerTFGItemTags = (event) => { event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') event.add('tfc:farmland', 'tfg:grass/mars_farmland') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_dirt') + event.add('minecraft:mineable/shovel', 'tfg:grass/amber_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_mycelium') // #endregion // Mars stone dust