From a71db1ceaca40dde1136741526db31edea47f16f Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 29 May 2022 18:12:43 -0700 Subject: [PATCH] deadlock, prod modules --- aluminum-enriched.lua | 2 +- aluminum-recipe-modules.lua | 2 +- aluminum-recipe-updates.lua | 6 ++++++ changelog.txt | 6 ++++++ info.json | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/aluminum-enriched.lua b/aluminum-enriched.lua index 9cd5af6..5cfac5b 100644 --- a/aluminum-enriched.lua +++ b/aluminum-enriched.lua @@ -67,7 +67,7 @@ data:extend( allow_productivity = true, ingredients = { {"enriched-aluminum", 5} }, results = { {"alumina", 5} }, - order = "b[aluminum-plate]-b[enriched-aluminum-plate]" + order = "b[alumina]-b[enriched-alumina]", }, { type = "recipe", diff --git a/aluminum-recipe-modules.lua b/aluminum-recipe-modules.lua index 72f191e..6d0c66e 100644 --- a/aluminum-recipe-modules.lua +++ b/aluminum-recipe-modules.lua @@ -2,7 +2,7 @@ recipes = {"alumina", "aluminum-plate", "aluminum-cable", "acsr-cable", "spark-plug", "aluminum-2219", "aluminum-6061"} if mods["Krastorio2"] then - table.insert(recipes, "enriched-aluminum-plate") + table.insert(recipes, "enriched-alumina") table.insert(recipes, "enriched-aluminum") end if mods["space-exploration"] then diff --git a/aluminum-recipe-updates.lua b/aluminum-recipe-updates.lua index 8a6f45c..db0fe8f 100644 --- a/aluminum-recipe-updates.lua +++ b/aluminum-recipe-updates.lua @@ -75,6 +75,12 @@ util.multiply_recipe("glass-from-sand", 4) util.replace_some_ingredient("glass-from-sand", "sand", 3, "alumina", 1) -- se util.replace_some_ingredient("se-glass-vulcanite", "sand", 3, "alumina", 1) + +if not mods.Krastorio2 then + util.set_to_founding("glass") + util.set_to_founding("glass-from-sand") + util.set_to_founding("se-glass-vulcanite") +end -- End glass diff --git a/changelog.txt b/changelog.txt index 88f53ed..dd90e7f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.1.4 +Date: 2022-03-16 + Fixes: + - Fix possible deadlock with glass in SE + - Can now prod module alumina from enriched aluminum +--------------------------------------------------------------------------------------------------- Version: 0.1.3 Date: 2022-02-27 Fixes: diff --git a/info.json b/info.json index ef6a13b..cc376ca 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum", - "version": "0.1.3", + "version": "0.1.4", "factorio_version": "1.1", "title": "Aluminum", "author": "Brevven",