From 8af43a10aea4cb372feb2a6e1d0602315cbb79ea Mon Sep 17 00:00:00 2001 From: Xikaro Date: Tue, 9 Sep 2025 18:49:32 +0500 Subject: [PATCH 1/2] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1682173df..4fa558b54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -305,7 +305,7 @@ jobs: sed -i -e "s/DEV/${VERSION}/g" pakku.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - + sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json @@ -357,14 +357,15 @@ jobs: - name: 📁 Preparing the artifact multimc run: | - mkdir -p .pakku/multimc-overrides/flame .pakku/multimc-overrides/mods + mkdir -p .pakku/multimc-overrides/flame + mkdir -p .pakku/multimc-overrides/mods mv -vf .pakku/multimc-overrides ./build/multimc cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft - cp -rf ./mods ./build/multimc/.minecraft/mods + cp -rf ./mods ./build/multimc/.minecraft/ cd ./build/multimc/ zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ From 301701edfb88f838d8e62186e271583e253c226c Mon Sep 17 00:00:00 2001 From: TreyR9 <106098556+TreyR9@users.noreply.github.com> Date: Tue, 9 Sep 2025 11:24:59 -0500 Subject: [PATCH 2/2] Update recipes.js (#1779) Consistency change for sugar water in the vat/mixer Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com> --- kubejs/server_scripts/firmalife/recipes.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 15e27c0d3..d76fab95d 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -33,6 +33,9 @@ const registerFirmaLifeRecipes = (event) => { // Jar lid event.remove({ id: 'firmalife:heating/stainless_steel_jar_lid' }) + // Default Sugar Water + event.remove({ id: 'firmalife:vat/sugar_water' }) + // Plated Blocks event.remove({ id: 'firmalife:crafting/crafting/metal/block/stainless_steel' }) event.remove({ id: 'firmalife:crafting/metal/block/stainless_steel_slab' }) @@ -503,6 +506,14 @@ const registerFirmaLifeRecipes = (event) => { //#endregion + //#region Better Sugar Water + event.recipes.firmalife.vat() + .inputs('#tfc:sweetener', Fluid.of('minecraft:water', 2000)) + .outputFluid(Fluid.of('firmalife:sugar_water', 2000)) + .id('tfg:vat/sugar_water') + + //#endregion + //#region Replace existing dyes global.MINECRAFT_DYE_NAMES.forEach(dyeName => { @@ -533,8 +544,8 @@ const registerFirmaLifeRecipes = (event) => { event.recipes.gtceu.mixer('sugar_water') .itemInputs('#tfc:sweetener') - .inputFluids("#tfg:clean_water 1000") - .outputFluids(Fluid.of('firmalife:sugar_water', 500)) + .inputFluids("#tfg:clean_water 2000") + .outputFluids(Fluid.of('firmalife:sugar_water', 2000)) .circuit(5) .EUt(GTValues.VA[GTValues.ULV]) .duration(200)