diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d808d962..13a8c3cad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ Added TFC Gurman, which adds even more food and drink - Fixed some inconsistencies with gravel to sand recipe tiers (#2292) @Pyritie - Fixed the thorium-based glowing ink recipe (#2294) @Pyritie - Fixes crafting table output amount for salsa compared to the food processor (#2295) @Pyritie +- Added missing food processor recipe for cocoa butter @Pyritie +- Fixed recipe conflict with Epichlorohydrin and Sodium Hypochlorite (#2287) @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Japanese @sakura-gondra diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 0f2e9295d..31570b8db 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -111,7 +111,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/fire_charge' }) - + event.remove({ id: 'toomanyrecipeviewers:/greate/milling/integration/gtceu/macerator/macerate_cocoa' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'}) } diff --git a/kubejs/server_scripts/tfg/recipes.biochem.js b/kubejs/server_scripts/tfg/recipes.biochem.js index 6dbe31df1..c43cd7182 100644 --- a/kubejs/server_scripts/tfg/recipes.biochem.js +++ b/kubejs/server_scripts/tfg/recipes.biochem.js @@ -404,6 +404,7 @@ function registerTFGBiochemRecipes(event) { Fluid.of('minecraft:water', 1000) ) .itemOutputs(Item.of('gtceu:salt_dust')) + .circuit(1) .duration(10*20) .EUt(GTValues.VA[GTValues.HV]); diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index d67ea70c2..2b3753804 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -821,11 +821,19 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("cocoa_dust", 100, 4, { + circuit: 1, itemInputs: ["firmalife:food/roasted_cocoa_beans"], itemOutputs: ["gtceu:cocoa_dust"], itemOutputProvider: TFC.isp.of("gtceu:cocoa_dust") }) + processorRecipe("cocoa_butter", 100, 4, { + circuit: 2, + itemInputs: ["firmalife:food/roasted_cocoa_beans"], + itemOutputs: ["firmalife:food/cocoa_butter"], + itemOutputProvider: TFC.isp.of("firmalife:food/cocoa_butter") + }) + processorRecipe("red_grapes", 50, 8, { itemInputs: ["firmalife:food/red_grapes"], itemOutputs: ["firmalife:food/smashed_red_grapes"],