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

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

Browse Source
This commit is contained in:
Pyritie
2025-09-28 00:34:46 +01:00
parent ce2e474264 3171c386c4
commit 15a3ae7d0b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kubejs/server_scripts/greate/recipes.removes.js
View File

@@ -66,6 +66,17 @@ function removeGreateRecipes(event) {
event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_shaft' })
event.remove({ id: 'gtceu:extractor/extract_andesite_alloy' })
event.remove({ id: 'gtceu:extractor/extract_steel_alloy '})
event.remove({ id: 'gtceu:extractor/extract_aluminium_alloy' })
event.remove({ id: 'gtceu:extractor/extract_stainless_steel_alloy' })
event.remove({ id: 'gtceu:extractor/extract_titanium_alloy' })
event.remove({ id: 'gtceu:extractor/extract_tungsten_steel_alloy' })
event.remove({ id: 'gtceu:extractor/extract_rhodium_plated_palladium_alloy' })
event.remove({ id: 'gtceu:extractor/extract_naquadah_alloy_alloy' })
event.remove({ id: 'gtceu:extractor/extract_darmstadtium_alloy' })
event.remove({ id: 'gtceu:extractor/extract_neutronium_alloy' })
removeMaceratorRecipe(event, 'macerate_andesite_alloy')
removeMaceratorRecipe(event, 'macerate_steel_alloy')
removeMaceratorRecipe(event, 'macerate_aluminium_alloy')

4
kubejs/startup_scripts/gtceu/machines.js
View File

@@ -456,7 +456,7 @@ const registerGTCEuMachines = (event) => {
.where('X', Predicates.controller(Predicates.blocks(definition.get())))
.where('A', Predicates.blocks('tfg:casings/machine_casing_mars')
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2)))
.where('B', Predicates.blocks('gtceu:high_temperature_smelting_casing'))
.where('B', Predicates.blocks('tfg:casings/machine_casing_ostrum_carbon'))
.where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake'))
.where('D', Predicates.blocks('gtceu:heat_vent'))
.where('E', Predicates.blocks('tfg:casings/machine_casing_mars')
@@ -478,7 +478,7 @@ const registerGTCEuMachines = (event) => {
.aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' )
.where('X', controller, Direction.SOUTH)
.where('A', Block.getBlock('tfg:casings/machine_casing_mars'))
.where('B', Block.getBlock('gtceu:high_temperature_smelting_casing'))
.where('B', Block.getBlock('tfg:casings/machine_casing_ostrum_carbon'))
.where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake'))
.where('D', Block.getBlock('gtceu:heat_vent'))
.where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH)