diff --git a/CHANGELOG.md b/CHANGELOG.md index ed3374459..5678735c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Fixed river water not washing ores (#1785) - Added missing textures for placed Potin ingots/plates @Pyritie - Fixed recipe conflict with music labels and paper blocks @Pyritie +- Added missing helve hammer recipes for lead, potin, cobalt, cobalt brass, and invar @Pyritie +- Fixed black bronze requiring an LS millstone to macerate (#1786) @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Ukranian @MetEnBouldry diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index ce873bc29..56ddbd94c 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -119,12 +119,12 @@ const registerGTCEUMetals = (event) => { event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone') event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy') event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy') - event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead') + event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 1, 'tfg:lead') event.metal('gtceu:invar', 1494, 0.00741, '#forge:ingots/invar', '#forge:double_ingots/invar', '#forge:plates/invar', 3, 'tfg:invar') event.metal('gtceu:potin', 807, 0.0124, '#forge:ingots/potin', '#forge:double_ingots/potin', '#forge:plates/potin', 2, 'tfg:potin') event.metal('gtceu:cobalt', 1495, 0.00857, '#forge:ingots/cobalt', '#forge:double_ingots/cobalt', '#forge:plates/cobalt', 3, 'tfg:cobalt') event.metal('gtceu:cobalt_brass', 1060, 0.00857, '#forge:ingots/cobalt_brass', '#forge:double_ingots/cobalt_brass', '#forge:plates/cobalt_brass', 3, 'tfg:cobalt_brass') - event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate') + event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 3, 'tfg:aluminium_silicate') } function registerGTCEUBedrockFluidVeins(event) { diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 737505d4a..2d06b3c49 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -173,7 +173,8 @@ function registerVintageImprovementsRecipes(event) { { material: GTMaterials.Bismuth, blows: STARTING_BLOWS }, { material: GTMaterials.RoseGold, blows: STARTING_BLOWS }, { material: GTMaterials.SterlingSilver, blows: STARTING_BLOWS }, - { material: GTMaterials.Tin, blows: STARTING_BLOWS } + { material: GTMaterials.Tin, blows: STARTING_BLOWS }, + { material: GTMaterials.Lead, blows: STARTING_BLOWS } ] let HAMMERING_ITEMS = [ @@ -192,6 +193,7 @@ function registerVintageImprovementsRecipes(event) { HAMMERING_MATERIALS.push({ material: GTMaterials.BismuthBronze, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.Brass, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.RedAlloy, blows: STARTING_BLOWS }) + HAMMERING_MATERIALS.push({ material: GTMaterials.Potin, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.forEach(x => { generateHammeringRecipe(event, x.material, x.blows, 'bronze'); @@ -210,6 +212,9 @@ function registerVintageImprovementsRecipes(event) { HAMMERING_MATERIALS.push({ material: GTMaterials.TinAlloy, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.Iron, blows: STARTING_BLOWS }) HAMMERING_MATERIALS.push({ material: GTMaterials.WroughtIron, blows: STARTING_BLOWS }) + HAMMERING_MATERIALS.push({ material: GTMaterials.Invar, blows: STARTING_BLOWS }) + HAMMERING_MATERIALS.push({ material: GTMaterials.Cobalt, blows: STARTING_BLOWS }) + HAMMERING_MATERIALS.push({ material: GTMaterials.CobaltBrass, blows: STARTING_BLOWS }) HAMMERING_ITEMS.push({ input: 'tfc:metal/ingot/pig_iron', output: 'tfc:metal/ingot/high_carbon_steel', blows: STARTING_BLOWS }) HAMMERING_ITEMS.push({ input: 'tfc:metal/ingot/high_carbon_steel', output: 'gtceu:steel_ingot', blows: STARTING_BLOWS })