diff --git a/CHANGELOG.md b/CHANGELOG.md index d8345bda4..45f11c443 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Minor changes +- Added ice soup @Pyritie ### Bug fixes - Fixed yeast food processor conflict (#1310) @Redeix - Fixed seed oil voiding in barrels (#1310) @Redeix @@ -14,9 +16,11 @@ - Fixed texture issues found on some of the Extruder Mold textures @BlueBoat29 - Added default GUI Scale (#1313) @Redeix - Added Kelp and Seaweed drying to electric oven (#1315) @BlueBoat29 -- Added Lead Nugget anvil recipe and 45-70 bullet assembler recipe @BlueBoat29 +- Added Nugget anvil recipe and 45-70 bullet assembler recipe @BlueBoat29 @Pyritie - Fixed AFC wood stomping barrel recipes @BlueBoat29 - +- Fixed rotten cheese in moon quest reward @Pyritie +- Fixed create + greate configs (#1300) @HiddenOwlllll1 @Pyritie +- Fixed blue steel diving suit looking like netherite (#1293) @Pyritie ## [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/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 20c672a2d..04c21efd3 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -2609,6 +2609,7 @@ "metal.tfg.redstone": "Redstone", "metal.tfg.red_alloy": "Red Alloy", "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", "trim_material.tfc.almandine_tfc": "Almandine", "trim_material.tfc.andradite_tfc": "Andradite", "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", diff --git a/kubejs/assets/tfg/textures/block/metal/smooth/lead.png b/kubejs/assets/tfg/textures/block/metal/smooth/lead.png new file mode 100644 index 000000000..820378c3a Binary files /dev/null and b/kubejs/assets/tfg/textures/block/metal/smooth/lead.png differ diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index ab7f9ed32..3bf6b6017 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -112,6 +112,7 @@ 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') } diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index bc3e3ad7e..d0b60cccc 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -136,6 +136,9 @@ function generatePlatedBlockRecipe(event, material) { let platedSlab = ChemicalHelper.get(TFGTagPrefix.slabPlated, material, 1); let platedStair = ChemicalHelper.get(TFGTagPrefix.stairPlated, material, 1); + if (platedBlock == null) + return + let tfcMetalName = material.getName(); if (tfcMetalName == "iron") tfcMetalName = "cast_iron"; diff --git a/kubejs/server_scripts/tacz/recipes.ammo.js b/kubejs/server_scripts/tacz/recipes.ammo.js index 36842385f..36411d7ae 100644 --- a/kubejs/server_scripts/tacz/recipes.ammo.js +++ b/kubejs/server_scripts/tacz/recipes.ammo.js @@ -22,8 +22,6 @@ function registerTACZAmmoRecipes(event){ .EUt(GTValues.VA[GTValues.MV]) //Additives - event.recipes.tfc.anvil('6x #forge:nuggets/lead', '#forge:ingots/lead', ['punch_last', 'hit_second_last', 'punch_third_last']) - .tier(2).id('tfg:anvil/lead_nugget') event.recipes.gtceu.chemical_reactor('tfg_tacz:nitrocellulose_from_wood') .itemInputs('gtceu:thermochemically_treated_hardwood_dust') .inputFluids(Fluid.of('gtceu:nitric_acid', 200), Fluid.of('gtceu:sulfuric_acid', 400), Fluid.of('minecraft:water', 600)) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index d7e0cb962..631f9574a 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -300,14 +300,9 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_fishing_rod`) //#endregion - - } - // Plated Blocks - applies for everything with a double ingot (except tin/red alloy) - if (material != GTMaterials.TinAlloy && material != GTMaterials.RedAlloy) { - generatePlatedBlockRecipe(event, material); - } + generatePlatedBlockRecipe(event, material); } // Tools (From Double Ingots) @@ -594,6 +589,13 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:anvil/${material.getName()}_small_spring`) } + // Nugget + let nuggetItem = ChemicalHelper.get(TagPrefix.nugget, material, 6) + if (!nuggetItem.isEmpty()) { + event.recipes.tfc.anvil(nuggetItem, ingotItem, ['punch_last', 'hit_second_last', 'punch_third_last']) + .tier(tfcProperty.getTier()) + .id(`tfg:anvil/${material.getName()}_nugget`) + } } // Tools (From Ingot) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 8714ba581..0f8165dbc 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -482,6 +482,7 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy') event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy') + event.add('tfc:usable_in_ingot_mold', 'gtceu:lead') event.add('tfc:usable_in_bell_mold', 'gtceu:bronze') event.add('tfc:usable_in_bell_mold', 'gtceu:gold') diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 91a01a0c2..98328dfe4 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -81,6 +81,10 @@ const registerGTCEuMaterialModification = (event) => { /* TFC Проперти для материалов */ // TFC_PROPERTY = (forging temp, welding temp, melt temp, material, tier, percent of material) + // OR = (forging temp, welding temp, melt temp, tier) + // + // If registering a new material that you want to melt into a liquid in a vessel etc, + // make sure you add it to registerGTCEUMetals()! GTMaterials.Copper.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 1080, 1)); GTMaterials.BismuthBronze.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(591, 788, 985, 2)); @@ -177,6 +181,7 @@ const registerGTCEuMaterialModification = (event) => { // /* Имеют двойные слитки */ GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR); GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS); + GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS); // // /* Другое */