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-09-09 21:27:46 +01:00
commit 2e0406e8d6
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View file

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

15
kubejs/server_scripts/firmalife/recipes.js
View file

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