diff --git a/changelog.txt b/changelog.txt index 9f59aff..6ae432f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.6 +Date: 2022-02-16 + Fixes: + - Fix for FE+ and 5dim's used together. +--------------------------------------------------------------------------------------------------- Version: 1.0.5 Date: 2022-02-11 Fixes: diff --git a/data-util.lua b/data-util.lua index b1ecbfc..84b7785 100644 --- a/data-util.lua +++ b/data-util.lua @@ -558,7 +558,7 @@ function util.add_crafting_category(entity_type, entity, category) if data.raw[entity_type][entity] then for i, existing in pairs(data.raw[entity_type][entity].crafting_categories) do if existing == category then - log(entity.." not adding "..new.." -- duplicate") + log(entity.." not adding "..category.." -- duplicate") return end end diff --git a/info.json b/info.json index 315efeb..9ccd7fc 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "1.0.5", + "version": "1.0.6", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/titanium-compressed.lua b/titanium-compressed.lua index 04f773b..9b13683 100644 --- a/titanium-compressed.lua +++ b/titanium-compressed.lua @@ -8,16 +8,16 @@ if simpleCompress then end if simpleCompress.plates then simpleCompress.currentSubgroup = "intermediate-product" - if data.raw.item["titanium-plate"] then - SimpleCompress_AddTintedItem("titanium-plate", "plates4-titanium", "plate3", {r=0.85, g=0.85, b=0.70}) - SimpleCompress_UnlockPlateTechAndRecipe("titanium-plate") + if data.raw.item[util.me.titanium_plate] then + SimpleCompress_AddTintedItem(util.me.titanium_plate, "plates4-titanium", "plate3", {r=0.85, g=0.85, b=0.70}) + SimpleCompress_UnlockPlateTechAndRecipe(util.me.titanium_plate) end local titaniumRecipe = data.raw.recipe["decompress-titanium-plate"] titaniumRecipe.order = "d[titanium-plate]" end if simpleCompress.smelting then - if data.raw.item["titanium-plate"] and data.raw.item["titanium-plate"] then - SimpleCompress_AddSmeltingRecipe("titanium-ore", "titanium-plate") + if data.raw.item[ util.me.titanium_plate] and data.raw.item[util.me.titanium_plate] then + SimpleCompress_AddSmeltingRecipe("titanium-ore",util.me.titanium_plate) SimpleCompress_UnlockOreSmeltingTech("titanium-ore") local titaniumRecipe = data.raw.recipe["smelt-compressed-titanium-ore"] titaniumRecipe.ingredients = {{"compressed-titanium-ore", 5}} diff --git a/titanium-enriched.lua b/titanium-enriched.lua index 0a42e0c..586c861 100644 --- a/titanium-enriched.lua +++ b/titanium-enriched.lua @@ -69,7 +69,7 @@ data:extend( { {"enriched-titanium", 10} }, - result = "titanium-plate", + result = util.me.titanium_plate, result_count = 5, order = "b[titanium-plate]-b[enriched-titanium-plate]" }, diff --git a/titanium-matter.lua b/titanium-matter.lua index 637d1c4..3b541f5 100644 --- a/titanium-matter.lua +++ b/titanium-matter.lua @@ -49,7 +49,7 @@ matter.createMatterRecipe(titanium_ore_matter) local titanium_plate_matter = { - item_name = "titanium-plate", + item_name = util.me.titanium_plate, minimum_conversion_quantity = 10, matter_value = 14, energy_required = 2, diff --git a/titanium-recipe-final-5d.lua b/titanium-recipe-final-5d.lua index dfecdb2..3091e81 100644 --- a/titanium-recipe-final-5d.lua +++ b/titanium-recipe-final-5d.lua @@ -2,8 +2,8 @@ local util = require("__bztitanium__.data-util"); if mods["5dim_core"] then - data.raw.item["titanium-plate"].subgroup = "plates-plates" - data.raw.recipe["titanium-plate"].subgroup = "plates-plates" + data.raw.item[util.me.titanium_plate].subgroup = "plates-plates" + data.raw.recipe[util.me.titanium_plate].subgroup = "plates-plates" data.raw.item["titanium-ore"].subgroup = "plates-ore" if mods["5dim_resources"] then @@ -95,7 +95,7 @@ if mods["5dim_core"] then if mods["5dim_automation"] then for i, name in ipairs( {"5d-assembling-machine-07","5d-assembling-machine-08","5d-lab-06","5d-lab-07"}) do - util.replace_ingredient(name, "steel-plate", "titanium-plate") + util.replace_ingredient(name, "steel-plate", util.me.titanium_plate) end end @@ -113,12 +113,12 @@ if mods["5dim_core"] then "5d-steam-turbine-09", "5d-steam-turbine-10" }) do - util.add_ingredient(name, "titanium-plate", 20) + util.add_ingredient(name, util.me.titanium_plate, 20) end end if mods["5dim_battlefield"] then - util.replace_ingredient(name, "steel-plate", "titanium-plate") + util.replace_ingredient(name, "steel-plate", util.me.titanium_plate) end end