From bfc78c38fa2fd10ea827a4abe440969bfcd973da Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Mar 2026 15:46:01 +0000 Subject: [PATCH] add circuits to concrete recipes #3264 --- CHANGELOG.md | 1 + kubejs/server_scripts/gregtech/recipes.removes.js | 5 ----- .../server_scripts/tfg/natural_blocks/recipes.concrete.js | 7 +++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83466a4da..5bc733448 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased ### Changes +- Liquid concrete mixer recipes now have circuits, to fix some conflicts (#3264) @Pyritie ### Bug fixes - Fixed crafting table recipes involving a knife being removed (#3291) @Pyritie - Fixed flint tools being uncraftable @Pyritie diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 488fac711..87ed684dd 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -926,11 +926,6 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:rock_breaker/obsidian' }) event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_magnesia_refractory_brick_to_nugget' }) - - event.remove({ id: 'gtceu:mixer/concrete_from_calcite' }) - event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_calcite' }) - event.remove({ id: 'gtceu:mixer/concrete_from_clay' }) - event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_clay' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js index 4e23c83d1..6ce2c753c 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.concrete.js @@ -4,6 +4,10 @@ function registerTFGConcreteRecipes(event) { event.remove({ id: 'gtceu:mixer/concrete_from_marble' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_marble' }) + event.remove({ id: 'gtceu:mixer/concrete_from_calcite' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_calcite' }) + event.remove({ id: 'gtceu:mixer/concrete_from_clay' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/concrete_from_clay' }) event.recipes.gtceu.mixer('tfg:concrete_from_marble') .itemInputs( @@ -12,6 +16,7 @@ function registerTFGConcreteRecipes(event) { 'gtceu:gypsum_dust') .inputFluids("#tfg:clean_water 1000") .outputFluids('gtceu:concrete 1152') + .circuit(1) .duration(40) .EUt(16) @@ -23,6 +28,7 @@ function registerTFGConcreteRecipes(event) { .inputFluids("#tfg:clean_water 500") .outputFluids('gtceu:concrete 576') .duration(40) + .circuit(2) .EUt(16) event.recipes.gtceu.mixer('tfg:concrete_from_calcite') @@ -33,6 +39,7 @@ function registerTFGConcreteRecipes(event) { .inputFluids("#tfg:clean_water 1000") .outputFluids('gtceu:concrete 1152') .duration(40) + .circuit(3) .EUt(16)