illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-12-19 11:38:39 +00:00
commit cc4f34b405
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kubejs/server_scripts/tfg/powergen/recipes.boiler.js
View file

@ -34,15 +34,15 @@ function registerTFGBoilerRecipes(event) {
event.remove({ id: /gtceu:....._boiler\/.*loom.*/ })
event.remove({ id: /gtceu:....._boiler\/.*bowl.*/ })
event.remove({ id: /gtceu:....._boiler\/.*sticky_resin.*/ })
event.remove({ id: /gtceu:....._boiler\/.*plant_ball*/ })
event.remove({ id: /gtceu:....._boiler\/.*note_block*/ })
event.remove({ id: /gtceu:....._boiler\/.*smithing_table*/ })
event.remove({ id: /gtceu:....._boiler\/.*fiberboard*/ })
event.remove({ id: /gtceu:....._boiler\/.*wood*/ })
event.remove({ id: /gtceu:....._boiler\/.*sapling*/ })
event.remove({ id: /gtceu:....._boiler\/.*log*/ })
event.remove({ id: /gtceu:....._boiler\/.*stem*/ })
event.remove({ id: /gtceu:....._boiler\/.*mosaic*/ })
event.remove({ id: /gtceu:....._boiler\/.*plant_ball.*/ })
event.remove({ id: /gtceu:....._boiler\/.*note_block.*/ })
event.remove({ id: /gtceu:....._boiler\/.*smithing_table.*/ })
event.remove({ id: /gtceu:....._boiler\/.*fiberboard.*/ })
event.remove({ id: /gtceu:....._boiler\/.*wood.*/ })
event.remove({ id: /gtceu:....._boiler\/.*sapling.*/ })
event.remove({ id: /gtceu:....._boiler\/.*log.*/ })
event.remove({ id: /gtceu:....._boiler\/.*stem.*/ })
event.remove({ id: /gtceu:....._boiler\/.*mosaic.*/ })
//Re-add some recipes to the boiler under tags
event.recipes.gtceu.steam_boiler('tfg:logs')
@ -62,7 +62,7 @@ function registerTFGBoilerRecipes(event) {
// Small nerf to charcoal
event.forEachRecipe({ id: /gtceu:(steam_boiler|large_boiler)\/minecraft_charcoal/ }, recipe => {
event.forEachRecipe({ id: /gtceu:(steam_boiler|large_boiler)\/.*charcoal.*/ }, recipe => {
var newDuration = recipe.get("duration")
recipe.set("duration", newDuration/4*3)
})

4
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -546,7 +546,7 @@ function registerVintageImprovementsRecipes(event) {
.id('tfg:vi/vacuumizing/latex_from_rubber_plants')
// Vulc. latex to raw rubber pulp
event.recipes.vintageimprovements.pressurizing(Fluid.of('tfg:vulcanized_latex', 250), '#forge:dusts/raw_rubber')
event.recipes.vintageimprovements.pressurizing('#forge:dusts/raw_rubber', Fluid.of('tfg:vulcanized_latex', 250))
.heated()
.processingTime(60 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER)
.id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber')
@ -637,4 +637,4 @@ function generateHammeringRecipeFromItem(event, input, output, blows, anvil) {
.anvilBlock(`tfc:metal/anvil/${anvil}`)
.hammerBlows(blows)
.id(`tfg:vi/hammer/${input.replace(/[#:]/g, '_')}_on_${anvil}_anvil`)
}
}