From bd7b4042c97eab400c0c8c91b70a1c3f8d91fb8f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 21:50:04 +0000 Subject: [PATCH 01/14] Add files via upload Signed-off-by: Pyritie --- defaultconfigs/firmalife-server.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 defaultconfigs/firmalife-server.toml diff --git a/defaultconfigs/firmalife-server.toml b/defaultconfigs/firmalife-server.toml new file mode 100644 index 000000000..95913fda2 --- /dev/null +++ b/defaultconfigs/firmalife-server.toml @@ -0,0 +1,6 @@ + +[general] + #If true, the tumbler and the pumping station work magically with a redstone signal and no power required. + mechanicalPowerCheatMode = true + #If true, sprinkler will not accept firmalife pipes and will instead require something that exposes a fluid capability, eg. a barrel. + usePipesForSprinklers = false From 6b8a822028c1ba25b1c4b13b66577484f2a663c2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 21:50:43 +0000 Subject: [PATCH 02/14] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/firmalife/constants.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 27b131cf2..1d0e310b0 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -33,8 +33,7 @@ global.FIRMALIFE_DISABLED_ITEMS = [ 'firmalife:metal/block/stainless_steel_slab', // Other - 'firmalife:compost_tumbler', - 'firmalife:pumping_station' + 'firmalife:compost_tumbler' ]; global.FIRMALIFE_HIDED_ITEMS = [ @@ -130,4 +129,4 @@ global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [ { input: 'tfc:food/rice_dough', output: 'firmalife:food/rice_flatbread', name: 'rice_flatbread' }, { input: 'tfc:food/wheat_dough', output: 'firmalife:food/wheat_flatbread', name: 'wheat_flatbread' }, { input: 'firmalife:food/masa', output: 'firmalife:food/corn_tortilla', name: 'corn_tortilla' }, -]; \ No newline at end of file +]; From 64bd5bc8cfd2618041399eeb5806a537edadb78f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 21:53:33 +0000 Subject: [PATCH 03/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/firmalife/recipes.js | 34 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 0f45f300b..f1e1fc8dd 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -134,6 +134,32 @@ const registerFirmaLifeRecipes = (event) => { //#region Рецепты теплиц //#region Медная + + event.shaped('firmalife:pumping_station', + [ + ' B ', + 'ACA', + ' D ' + ], { + A: 'firmalife:copper_pipe', + B: 'gtceu:bronze_plate', + C: '#tfc:barrels', + D: 'create:mechanical_pump' + }).id('tfg:shaped/pumping_station') + + event.recipes.gtceu.bender('tfg:firmalife/copper_pipe') + .itemInputs('gtceu:copper_plate') + .itemOutputs('8x firmalife:copper_pipe') + .circuit(3) + .duration(40) + .EUt(8) + + event.recipes.gtceu.bender('tfg:firmalife/sprinkler') + .itemInputs('gtceu:copper_plate') + .itemOutputs('firmalife:sprinkler') + .circuit(4) + .duration(60) + .EUt(8) // Стена event.shaped('8x firmalife:copper_greenhouse_wall', [ @@ -204,7 +230,7 @@ const registerFirmaLifeRecipes = (event) => { }).id('firmalife:crafting/greenhouse/copper_greenhouse_door') // Порт - event.shaped('8x firmalife:copper_greenhouse_port', [ + event.shaped('firmalife:copper_greenhouse_port', [ 'AA', 'BC', 'AA' @@ -287,7 +313,7 @@ const registerFirmaLifeRecipes = (event) => { }).id('firmalife:crafting/greenhouse/iron_greenhouse_door') // Порт - event.shaped('8x firmalife:iron_greenhouse_port', [ + event.shaped('firmalife:iron_greenhouse_port', [ 'AA', 'BC', 'AA' @@ -411,6 +437,7 @@ const registerFirmaLifeRecipes = (event) => { .itemOutputs('firmalife:food/pumpkin_pie_dough') .duration(300) .EUt(16) + .circuit(2) event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)] ).id('firmalife:create/mixer/food/pumpkin_pie_dough') @@ -433,6 +460,7 @@ const registerFirmaLifeRecipes = (event) => { .itemOutputs('firmalife:food/pie_dough') .duration(300) .EUt(16) + .circuit(2) event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) .id('firmalife:create/mixer/food/pie_dough') @@ -454,6 +482,7 @@ const registerFirmaLifeRecipes = (event) => { .itemOutputs('4x firmalife:food/hardtack_dough') .duration(300) .EUt(16) + .circuit(2) event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) .id('firmalife:create/mixer/food/hardtack_dough') @@ -465,6 +494,7 @@ const registerFirmaLifeRecipes = (event) => { .outputFluids('firmalife:yeast_starter', 600) .duration(1200) .EUt(8) + .circuit(1) event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)]) .id('firmalife:create/mixer/yeast_starter') From ce3558feac4d3cfd8201685ec779e17f2b9803e8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 21:54:17 +0000 Subject: [PATCH 04/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/tfc/recipes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2e35f8952..08bc9908f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -3001,6 +3001,7 @@ const registerTFCRecipes = (event) => { .itemOutputs(element.output) .duration(300) .EUt(16) + .circuit(3) }) //#endregion From 6b81d711776a1cfe8c3459baa56207baba3b7dab Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 22:02:36 +0000 Subject: [PATCH 05/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/firmalife/recipes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index f1e1fc8dd..777078c34 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -393,6 +393,7 @@ const registerFirmaLifeRecipes = (event) => { .itemOutputs(element.output) .duration(300) .EUt(16) + .circuit(2) }) //#endregion From dde2ec68e92b9d30179661cf400752135f5d6124 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 22:26:02 +0000 Subject: [PATCH 06/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/firmalife/recipes.js | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 777078c34..d113b1c53 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -146,6 +146,30 @@ const registerFirmaLifeRecipes = (event) => { C: '#tfc:barrels', D: 'create:mechanical_pump' }).id('tfg:shaped/pumping_station') + + event.shaped('firmalife:pumping_station', + [ + ' B ', + 'ACA', + ' D ' + ], { + A: 'firmalife:copper_pipe', + B: 'gtceu:black_bronze_plate', + C: '#tfc:barrels', + D: 'create:mechanical_pump' + }).id('tfg:shaped/pumping_station2') + + event.shaped('firmalife:pumping_station', + [ + ' B ', + 'ACA', + ' D ' + ], { + A: 'firmalife:copper_pipe', + B: 'gtceu:bismuth_bronze_plate', + C: '#tfc:barrels', + D: 'create:mechanical_pump' + }).id('tfg:shaped/pumping_station3') event.recipes.gtceu.bender('tfg:firmalife/copper_pipe') .itemInputs('gtceu:copper_plate') From d2b75c170a7405ccb1cffbf134ce39caa509398e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 01:12:40 +0000 Subject: [PATCH 07/14] Add files via upload Signed-off-by: Pyritie --- kubejs/server_scripts/every_compat/recipes.js | 22 +++++++++++++++++++ kubejs/server_scripts/every_compat/tags.js | 9 ++++++++ kubejs/server_scripts/main_server_script.js | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 kubejs/server_scripts/every_compat/recipes.js create mode 100644 kubejs/server_scripts/every_compat/tags.js diff --git a/kubejs/server_scripts/every_compat/recipes.js b/kubejs/server_scripts/every_compat/recipes.js new file mode 100644 index 000000000..f6dfc5885 --- /dev/null +++ b/kubejs/server_scripts/every_compat/recipes.js @@ -0,0 +1,22 @@ +// priority: 0 + +const registerEveryCompatRecipes = (event) => { + + global.TFC_WOOD_TYPES.forEach(wood => + { + event.remove({ id: `everycomp:c/tfc/${wood}_window_pane` }) + + event.shapeless(`2x everycomp:c/tfc/${wood}_window_pane`, + [ + `everycomp:c/tfc/${wood}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:everycompat/shapeless/${wood}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`) + .itemInputs(`3x everycomp:c/tfc/${wood}_window`) + .itemOutputs(`8x everycomp:c/tfc/${wood}_window_pane`) + .duration(40) + .EUt(20) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/every_compat/tags.js b/kubejs/server_scripts/every_compat/tags.js new file mode 100644 index 000000000..f23cd60e8 --- /dev/null +++ b/kubejs/server_scripts/every_compat/tags.js @@ -0,0 +1,9 @@ +// priority: 0 + +const registerEveryCompatItemTags = (event) => { + + event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window') + event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window_pane') + event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window') + event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window_pane') +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 5adb7f640..6bd15580c 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -10,6 +10,7 @@ ServerEvents.tags('item', event => { registerComputerCraftItemTags(event) registerCreateItemTags(event) registerCreateAdditionsItemTags(event) + registerEveryCompatItemTags(event) registerExtendedAE2ItemTags(event) registerFirmaCivItemTags(event) registerFirmaLifeItemTags(event) @@ -118,6 +119,7 @@ ServerEvents.recipes(event => { registerCreateRecipes(event) registerCreateAdditionsRecipes(event) registerCreateConnectedRecipes(event) + registerEveryCompatRecipes(event) registerExtendedAE2Recipes(event) registerExposureRecipes(event) registerEtchedRecipes(event) From 18aac7cb5b44766bd61f3be8244278567f4ca720 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 01:13:48 +0000 Subject: [PATCH 08/14] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/create/constants.js | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 7e1358b06..90ab66cdb 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -322,33 +322,20 @@ global.CREATE_DISABLED_ITEMS = [ 'create:granite_pillar', // Shit Glass - 'create:tiled_glass', - 'create:framed_glass', - 'create:horizontal_framed_glass', - 'create:vertical_framed_glass', - 'create:tiled_glass_pane', - 'create:horizontal_framed_glass_pane', - 'create:vertical_framed_glass_pane', + 'create:crimson_window', + 'create:warped_window', 'create:oak_window', 'create:spruce_window', 'create:birch_window', 'create:jungle_window', 'create:acacia_window', - 'create:dark_oak_window', - 'create:mangrove_window', - 'create:crimson_window', - 'create:warped_window', - 'create:ornate_iron_window', 'create:oak_window_pane', 'create:spruce_window_pane', 'create:birch_window_pane', 'create:jungle_window_pane', 'create:acacia_window_pane', - 'create:dark_oak_window_pane', - 'create:mangrove_window_pane', - 'create:crimson_window_pane', + 'create:crimson_window_pane', 'create:warped_window_pane', - 'create:ornate_iron_window_pane', // Blocks 'create:zinc_block', @@ -468,6 +455,5 @@ global.CREATE_DISABLED_ITEMS = [ 'create:empty_blaze_burner', 'create:minecart_contraption', 'create:furnace_minecart_contraption', - 'create:chest_minecart_contraption', - 'create:framed_glass_pane' -]; \ No newline at end of file + 'create:chest_minecart_contraption' +]; From 478b9ff3f6878233d72b2b381b85b11540604e85 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 01:14:56 +0000 Subject: [PATCH 09/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/create/recipes.js | 92 +++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 1dc6a808d..5d91a39ca 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1217,4 +1217,96 @@ const registerCreateRecipes = (event) => { .EUt(20) //#endregion + + // #region So-called "Shit Glass" + + event.shaped('4x create:framed_glass', + [ + 'AA', + 'AA' + ], { + A: 'minecraft:glass' + }).id('tfg:create/framed_glass') + + event.shaped('4x create:tiled_glass', + [ + 'A A', + ' ', + 'A A' + ], { + A: 'minecraft:glass' + }).id('tfg:create/tiled_glass') + + event.shaped('4x create:horizontal_framed_glass', + [ + 'AA', + ' ', + 'AA' + ], { + A: 'minecraft:glass' + }).id('tfg:create/horizontal_framed_glass') + + event.shaped('4x create:vertical_framed_glass', + [ + 'A A', + 'A A' + ], { + A: 'minecraft:glass' + }).id('tfg:create/vertical_framed_glass') + + const CREATE_FRAMED_GLASS_WINDOWS = + [ + 'framed_glass', + 'tiled_glass', + 'horizontal_framed_glass', + 'vertical_framed_glass' + ] + + CREATE_FRAMED_GLASS_WINDOWS.forEach(x => { + event.shapeless(`2x create:${x}_pane`, + [ + `create:${x}`, + '#forge:tools/saws' + ]) + .id(`tfg:create/shapeless/${x}_pane`) + + event.recipes.gtceu.cutter(`tfg:create/${x}_pane`) + .itemInputs(`3x create:${x}`) + .itemOutputs(`8x create:${x}_pane`) + .duration(40) + .EUt(20) + }) + + const CREATE_OTHER_GLASS_WINDOWS = + [ + [ 'dark_oak', 'tfc:wood/lumber/hickory' ], + [ 'mangrove', 'tfc:wood/lumber/mangrove' ], + [ 'ornate_iron', 'gtceu:wrought_iron_rod' ] + ] + + CREATE_OTHER_GLASS_WINDOWS.forEach(x => { + event.shaped(`2x create:${x[0]}_window`, + [ + ' B ', + 'BAB' + ], { + A: 'minecraft:glass', + B: x[1] + }).id(`tfg:create/shaped/${x[0]}_window`) + + event.shapeless(`2x create:${x[0]}_window_pane`, + [ + `create:${x[0]}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:create/shapeless/${x[0]}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:create/${x[0]}_window_pane`) + .itemInputs(`3x create:${x[0]}_window`) + .itemOutputs(`8x create:${x[0]}_window_pane`) + .duration(40) + .EUt(20) + }) + + // #endregion } From 1a29e4cfa0bc4636373a87b13cabb04e0c69e1af Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 01:17:21 +0000 Subject: [PATCH 10/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/minecraft/recipes.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0aa85775f..6aeb55c12 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2206,9 +2206,8 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Тонированное стекло - event.recipes.gtceu.chemical_bath('tfg:minecraft/tinted_glass') - .itemInputs('minecraft:glass') - .inputFluids(Fluid.of('gtceu:black_dye', 144)) + event.recipes.gtceu.alloy_smelter('tfg:minecraft/tinted_glass') + .itemInputs('minecraft:glass', 'tfc:powder/amethyst') .itemOutputs('minecraft:tinted_glass') .duration(260) .EUt(16) From 11b5790bd32cce8072e9e66f73d10ef71e2fcd82 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 02:45:03 +0000 Subject: [PATCH 11/14] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/minecraft/recipes.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0aa85775f..de2638aa6 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -3270,4 +3270,8 @@ const registerMinecraftRecipes = (event) => { .EUt(32) //#endregion + + // Nether Brick + + event.smelting('minecraft:nether_brick', 'minecraft:netherrack') } From 529bcad07a930bec26398c59be5aae6e6efcb4cf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 14:16:28 +0000 Subject: [PATCH 12/14] fixed netherrack dust being hidden in jei Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/constants.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 95da95dae..7d4ac80ab 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -49,7 +49,5 @@ global.GTCEU_DISABLED_ITEMS = [ ]; global.GTCEU_HIDED_ITEMS = [ - 'gtceu:netherrack_dust', - 'gtceu:small_netherrack_dust', - 'gtceu:tiny_netherrack_dust' -]; \ No newline at end of file + +]; From dbf29787c9ac5625d2ba292290d45d651a29506c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 13 Jan 2025 15:15:05 +0000 Subject: [PATCH 13/14] Add files via upload Signed-off-by: Pyritie --- .../en_us/entries/firmalife/irrigation.json | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json new file mode 100644 index 000000000..33bbc83fd --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json @@ -0,0 +1,62 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "name": "Irrigation", + "category": "tfc:firmalife", + "icon": "firmalife:sprinkler", + "pages": [ + { + "type": "patchouli:text", + "text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above." + }, + { + "type": "tfc:anvil_recipe", + "recipe": "firmalife:anvil/sprinkler", + "text": "The sprinkler is made with a $(thing)Copper Plate$()." + }, + { + "type": "patchouli:text", + "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Copper Pipes$() to them. Copper Pipes transport water up to 32 blocks to a sprinkler. They are connected to $(thing)Pumping Stations$()." + }, + { + "type": "tfc:anvil_recipe", + "recipe": "firmalife:anvil/copper_pipe", + "text": "The copper pipe is made with a plate." + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "firmalife:pumping_station" + } + }, + "name": "", + "text": "", + "enable_visualize": false + }, + { + "type": "patchouli:crafting", + "recipe": "tfg:shaped/pumping_station", + "text": "Pumping stations must be above a source block of water in order to work. Activate them with a redstone signal." + }, + { + "type": "patchouli:crafting", + "recipe": "firmalife:crafting/oxidized_copper_pipe", + "text": "Oxidized pipes are the same as regular copper pipes, except they do not connect to the other kind of pipe." + }, + { + "type": "patchouli:crafting", + "recipe": "firmalife:crafting/greenhouse/iron_greenhouse_port", + "text": "Greenhouse ports have a single pipe inside of them. They can be used to pass water through the walls of greenhouses!" + } + ], + "read_by_default": true, + "sortnum": 8 +} \ No newline at end of file From 3455d440168243582f7bfd50ea0ad9b748140c2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:28:34 +0000 Subject: [PATCH 14/14] Bump actions/upload-artifact in the dependencies group Bumps the dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.5.0 to 4.6.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.5.0...v4.6.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 468bc64fe..aaeb5b66b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,7 +152,7 @@ jobs: - name: 📈 Upload Diff id: upload_diff if: ${{ steps.read_diff.outputs.diff != '' }} && steps.check_pakku_lock_prev.outputs.file_found == 'true' - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: Mods-diff path: PROJECTS_DIFF.md @@ -212,7 +212,7 @@ jobs: mv *.zip $(basename -s .zip *.zip)-curseforge.zip - name: 🚀 Upload artifact CurseForge - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: ${{ needs.info.outputs.project_full_name }}-curseforge path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip @@ -224,7 +224,7 @@ jobs: mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - name: 🚀 Upload artifact modrinth - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: ${{ needs.info.outputs.project_full_name }}-modrinth path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack @@ -267,7 +267,7 @@ jobs: mv *.zip $(basename -s .zip *.zip)-serverpack.zip - name: 🚀 Upload artifact server - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: ${{ needs.info.outputs.project_full_name }}-serverpack path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip @@ -317,7 +317,7 @@ jobs: zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - name: 🚀 Upload zip multimc - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: ${{ needs.info.outputs.project_full_name }}-multimc path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip