Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Conflict issues fix (#1141)

Browse Source 
* 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>
This commit is contained in:
Jean Roberto de Souza
2025-06-08 18:21:46 -03:00
committed by GitHub
parent 0ab1572392
commit 8beb9ba090
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kubejs/server_scripts/tfc/recipes.machines.js
View File

@@ -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)

12
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View File

@@ -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])
}
}