From 847eab20e102d99253ea7e0951977d6d20769c74 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 8 Sep 2021 14:02:06 +1000 Subject: [PATCH 1/4] Fix spelling in changelog --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9781c88..854fb43 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,7 +4,7 @@ Date: 08. 09. 2021 Added: - Higher resolution technology and signal icons - New Painted concrete and refined concrete icons - - Glowing lamps are now fast replacable with normal Lamps + - Glowing lamps are now fast replaceable with normal Lamps Changed: - Balancing - Wooden barricade no longer requires research to unlock - Balancing - Fixed fuel value of Wooden barricade being too overpowered From a493af7ad7ad220b598e87019af6de2471a62e69 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Thu, 9 Sep 2021 08:53:58 +1000 Subject: [PATCH 2/4] Remove space science pack when Space Exploration is present - Fixes #207 --- changelog.txt | 5 ++++ info.json | 4 ++-- prototypes/third-party/config.lua | 38 +++++++++++++++++++------------ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/changelog.txt b/changelog.txt index 854fb43..63848b5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.12.4 +Date: 09. 09. 2021 + Bugfixes: + - Fixed space science pack incompatibility when using Space Exploration mod +--------------------------------------------------------------------------------------------------- Version: 0.12.3 Date: 08. 09. 2021 Added: diff --git a/info.json b/info.json index c1289e1..95dc86c 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "Dectorio", - "version": "0.12.3", + "version": "0.12.4", "title": "Dectorio", "author": "PantherX", "contact": "", @@ -12,7 +12,7 @@ "(?) aai-industry >= 0.4.20", "(?) FactorioExtended-Plus-Weaponry >= 0.4.0", "(?) H2O >= 0.3.2", - "!Thaumaturgic-Machinations" + "! Thaumaturgic-Machinations" ], "license": "GNU GPLv3" } diff --git a/prototypes/third-party/config.lua b/prototypes/third-party/config.lua index 173dac4..40fb4ee 100644 --- a/prototypes/third-party/config.lua +++ b/prototypes/third-party/config.lua @@ -2,6 +2,22 @@ -- Configuration overrides for supporting various third-party mods +-- Function to remove items from config +local function removeIndexByName(tbl, name) + local index = nil + for i, v in ipairs(tbl) do + if (v.name == name) then + index = i + end + end + if index == nil then + log("Index not found for item named '" .. name .. "'") + else + log("Removing item named '" .. name .. "' at index " .. index) + table.remove(tbl, index) + end +end + -- ALIEN BIOMES -- --------------------------------- if mods["alien-biomes"] then @@ -318,20 +334,6 @@ end if mods["RealisticOres"] then -- Switch out iron, copper and uranium ore colors log("Realistic Ores detected, updating signal colors.") - local function removeIndexByName(tbl, name) - local index = nil - for i, v in ipairs(tbl) do - if (v.name == name) then - index = i - end - end - if index == nil then - log("Index not found for item named '" .. name .. "'") - else - log("Removing item named '" .. name .. "' at index " .. index) - table.remove(tbl, index) - end - end removeIndexByName(DECT.CONFIG.SIGNALS, "iron-ore") table.insert(DECT.CONFIG.SIGNALS, {type = "item", name = "iron-ore", color = {r = 0.61, g = 0.32, b = 0.25, a = 0.68}}) removeIndexByName(DECT.CONFIG.SIGNALS, "copper-ore") @@ -345,3 +347,11 @@ if mods["RealisticOres"] then {type = "item", name = "uranium-ore", color = {r = 0.72, g = 0.76, b = 0.20, a = 0.68}} ) end + +-- SPACE EXPLORATION +-- --------------------------------- +if mods["space-exploration"] then + -- Remove space science pack + log("Space Exploration detected, updating signal colors.") + removeIndexByName(DECT.CONFIG.SIGNALS, "space-science-pack") +end From d81211c388ce0fba637e8418d101b751bf4af0b9 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Thu, 9 Sep 2021 09:04:59 +1000 Subject: [PATCH 3/4] Update makefile --- control.lua | 5 +++-- data.lua | 5 +++-- makefile | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/control.lua b/control.lua index 82cd1d1..12c59fb 100644 --- a/control.lua +++ b/control.lua @@ -2,8 +2,9 @@ -- COPYRIGHT & LICENSE -- -------------------------- --- Dectorio, a Factorio mod --- Copyright (c) 2017-2020 James "PantherX" Panther +-- Dectorio, a mod for Factorio +-- https://github.com/jpanther/dectorio +-- Copyright (c) 2017-2021 James "PantherX" Panther -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/data.lua b/data.lua index 7b8a165..7235b81 100644 --- a/data.lua +++ b/data.lua @@ -2,8 +2,9 @@ -- COPYRIGHT & LICENSE -- -------------------------- --- Dectorio, a Factorio mod --- Copyright (c) 2017-2020 James "PantherX" Panther +-- Dectorio, a mod for Factorio +-- https://github.com/jpanther/dectorio +-- Copyright (c) 2017-2021 James "PantherX" Panther -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/makefile b/makefile index 7011ec9..ef4accf 100644 --- a/makefile +++ b/makefile @@ -56,7 +56,7 @@ release: git commit --all --allow-empty -m "Preparing Release v$(PACKAGE_VERSION)" git push git checkout master - git merge --no-ff develop + git merge --no-ff develop -m "Release v$(PACKAGE_VERSION)" git push git tag -f v$(PACKAGE_VERSION) git push --tags From f8804dc43801253b38c4366ebde37469a287f110 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Thu, 9 Sep 2021 09:27:23 +1000 Subject: [PATCH 4/4] Preparing Release v0.12.4