diff --git a/CHANGELOG.md b/CHANGELOG.md index e6af89a84..4b34d25ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Bug fixes +- Fixed yeast food processor conflict (#1310) @Redeix +- Fixed seed oil voiding in barrels (#1310) @Redeix +- Fixed inconsistent item sizes for sunflower_product and rapeseed_product (#1310) @Redeix ## [0.10.0] - 13.07.2025 - [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups! diff --git a/kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_964x_1024p.gif b/kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_964x_1024p.gif index 83af9cac6..54c6aa845 100644 Binary files a/kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_964x_1024p.gif and b/kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_964x_1024p.gif differ diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 54bcb47ae..defb35343 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -42,6 +42,9 @@ const registerTFGItemSize = (event) => { event.itemSize('tfg:fishing_net/tin_alloy', 'large', 'medium', 'tin_alloy_fishing_net') event.itemSize('tfg:fishing_net/magnalium', 'large', 'medium', 'magnalium_fishing_net') + event.itemSize('tfg:rapeseed_product', 'small', 'light', 'rapeseed_product') + event.itemSize('tfg:sunflower_product', 'small', 'light', 'sunflower_product') + } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 7df48f898..84cfdab8f 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -642,7 +642,7 @@ function registerTFGFoodRecipes(event) { }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) processorRecipe("yeast_starter", 1200, 8, { - circuit: 1, + circuit: 2, fluidInputs: [Fluid.of('firmalife:yeast_starter', 100)], fluidOutputs: [Fluid.of('firmalife:yeast_starter', 600)], itemInputs: ['#tfc:foods/flour'], diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 73eb22339..9c9284147 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -343,6 +343,7 @@ const registerTFGBlockTags = (event) => { // #endregion } +//#region Fluids const registerTFGFluidTags = (event) => { event.add('tfc:usable_in_pot', 'tfg:latex') @@ -367,10 +368,13 @@ const registerTFGFluidTags = (event) => { event.add('tfg:clean_water', 'tfc:river_water') event.add('tfg:clean_water', 'tfc:spring_water') + event.add('tfc:usable_in_barrel', 'gtceu:seed_oil') + global.BREATHABLE_COMPRESSED_AIRS.forEach(x => { event.add('tfg:breathable_compressed_air', x) }) } +//#endregion const registerTFGBiomeTags = (event) => {