diff --git a/CHANGELOG.md b/CHANGELOG.md index f97c6f266..48e98305b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,12 @@ ### Changes - Complete rework of prospector's picks. (#1594) @Redeix - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop +- Added mechanical press recipes to weld weak steels @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop +- Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie +- Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index c6cb6ddf9..f51c85dc5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -637,14 +637,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/mv', B: 'greate:aluminium_shaft', C: 'gtceu:mv_machine_hull', - D: '#forge:plates/vanadium_steel', + D: '#forge:plates/cobalt_brass', E: 'gtceu:aluminium_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/aluminium_mechanical_mixer') event.recipes.gtceu.assembler('greate:aluminium_mechanical_mixer') - .itemInputs('greate:aluminium_shaft', '2x #gtceu:circuits/mv', 'gtceu:mv_machine_hull', 'gtceu:aluminium_whisk', '2x #forge:plates/vanadium_steel') + .itemInputs('greate:aluminium_shaft', '2x #gtceu:circuits/mv', 'gtceu:mv_machine_hull', 'gtceu:aluminium_whisk', '2x #forge:plates/cobalt_brass') .itemOutputs('greate:aluminium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) @@ -657,14 +657,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/hv', B: 'greate:stainless_steel_shaft', C: 'gtceu:hv_machine_hull', - D: '#forge:plates/blue_alloy', + D: '#forge:plates/vanadium_steel', E: 'gtceu:stainless_steel_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/stainless_steel_mechanical_mixer') event.recipes.gtceu.assembler('greate:stainless_steel_mechanical_mixer') - .itemInputs('greate:stainless_steel_shaft', '2x #gtceu:circuits/hv', 'gtceu:hv_machine_hull', 'gtceu:stainless_steel_whisk', '2x #forge:plates/blue_alloy') + .itemInputs('greate:stainless_steel_shaft', '2x #gtceu:circuits/hv', 'gtceu:hv_machine_hull', 'gtceu:stainless_steel_whisk', '2x #forge:plates/vanadium_steel') .itemOutputs('greate:stainless_steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) @@ -677,14 +677,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/ev', B: 'greate:titanium_shaft', C: 'gtceu:ev_machine_hull', - D: '#forge:plates/ultimet', + D: '#forge:plates/blue_alloy', E: 'gtceu:titanium_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/titanium_mechanical_mixer') event.recipes.gtceu.assembler('greate:titanium_mechanical_mixer') - .itemInputs('greate:titanium_shaft', '2x #gtceu:circuits/ev', 'gtceu:ev_machine_hull', 'gtceu:titanium_whisk', '2x #forge:plates/ultimet') + .itemInputs('greate:titanium_shaft', '2x #gtceu:circuits/ev', 'gtceu:ev_machine_hull', 'gtceu:titanium_whisk', '2x #forge:plates/blue_alloy') .itemOutputs('greate:titanium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index d3503f3ac..2ddfce76e 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -525,10 +525,14 @@ const registerGTCEURecipes = (event) => { .EUt(5) // Исправление рецепта пыли серебра стерлинга - generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/silver'], [], '5x gtceu:sterling_silver_dust', 1, [], 500, 7, 64, 'sterling_silver') + event.remove({ id: 'gtceu:mixer/sterling_silver' }) + generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/silver'], [], '5x gtceu:sterling_silver_dust', + 1, [], 500, 7, 64, 'gtceu:mixer/sterling_silver') // Исправление рецепта пыли розовой бронзы - generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/gold'], [], '5x gtceu:rose_gold_dust', 3, [], 500, 7, 64, 'rose_gold') + event.remove({ id: 'gtceu:mixer/rose_gold' }) + generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/gold'], [], '5x gtceu:rose_gold_dust', + 3, [], 500, 7, 64, 'gtceu:mixer/rose_gold') //#region Рецепт ULV микросхемы diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index d201eb609..0a005c29c 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -162,6 +162,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая сталь + Чугун -> Высокоуглеродная черная сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_black_steel', + ['tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_black_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_black_steel') .itemInputs('tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron') .itemOutputs('2x tfc:metal/ingot/high_carbon_black_steel') @@ -169,6 +175,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая синяя сталь + Черная сталь -> Высокоуглеродная синяя сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_blue_steel', + ['tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_blue_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_blue_steel') .itemInputs('tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel') .itemOutputs('2x tfc:metal/ingot/high_carbon_blue_steel') @@ -176,6 +188,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая красная сталь + Черная сталь -> Высокоуглеродная красная сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_red_steel', + ['tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_red_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_red_steel') .itemInputs('tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel') .itemOutputs('2x tfc:metal/ingot/high_carbon_red_steel')