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] 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 +}