Release v0.12.4

changelog.txt

@@ -1,10 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+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:
     - 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

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

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

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"
 }

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

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