Merge branch 'develop'

jpanther · Nov 24, 2020 · 6377450 · 6377450
2 parents 7c672f9 + 5d9fcd2
commit 6377450
Show file tree

Hide file tree

Showing 40 changed files with 452 additions and 1,079 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -118,11 +118,15 @@ While I can't possibly test every combination of mods available, usually Dectori
 
 That's a pity, but that's the nature of modding. If you have a valid concern about something Dectorio is changing that seems contrary to the way something should work, feel free to [raise a new issue on GitHub](https://github.com/jpanther/Dectorio/issues) outlining your concern. If it is something that makes sense to change, I'll definitely look to adjust the mod in a future update. However, please note that Dectorio is designed to make it easy to decorate your factory, and the technology and recipe choices try to be somewhat realistic. The mod settings allow you to toggle individual changes on and off so you can customise it to your own play style. If you still don't like that, then simply don't use the mod! Requests that just whinge about things you don't agree with, without being constructive, will be ignored.
 
-## How do I play with Dectorio on Factorio 0.18.x 0.17.x, 0.16.x or 0.15.x?
+## How do I play with Dectorio on Factorio 1.0.x, 0.18.x, 0.17.x, 0.16.x or 0.15.x?
 
 The latest versions of Dectorio are designed to work with Factorio 1.0 and later. Due to the way the base game changes with each major release, there's no way to make the latest versions of Dectorio compatible with older versions of Factorio. However, old stable versions of Dectorio are kept available on the mod portal for each major Factorio release.
 
-For Factorio 0.18.x download Dectorio v0.10.9; Factorio 0.17.x download Dectorio v0.9.16; for Factorio 0.16.x download Dectorio v0.8.11; and for Factorio 0.15.x download Dectorio v0.7.6.
+- Factorio 1.0.x: Dectorio v0.11.1
+- Factorio 0.18.x: Dectorio v0.10.9
+- Factorio 0.17.x: Dectorio v0.9.16
+- Factorio 0.16.x: Dectorio v0.8.11
+- Factorio 0.15.x: Dectorio v0.7.6
 
 Note that these old versions of Dectorio will not be updated with new features, but they will occasionally have bugfixes if it's appropriate. You'll need to upgrade your Factorio version to take advantage of the latest changes.
 

diff --git a/README.md b/README.md
@@ -96,21 +96,21 @@ Dectorio uses CrowdIn to allow the community to translate the mod from English i
 
 Special thanks to the translators below (in no particular order).
 
-* Chinese Simplified (74%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
-* Chinese Traditional (31%) - [k98a](https://crowdin.com/profile/k98a).
-* Czech (76%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
-* French (96%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
-* German (100%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx), [Leridon](https://crowdin.com/profile/Leridon), [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs) and [adoa](https://crowdin.com/profile/adoa).
-* Hungarian (100%) - [mmnetworkteam](https://crowdin.com/profile/mmnetworkteam).
-* Korean (85%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
-* Polish (96%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
-* Portuguese, Brazilian (96%) - [celaquila](https://crowdin.com/profile/celaquila) and [Unknow0059](https://crowdin.com/profile/Unknow0059).
-* Russian (100%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1).
-* Spanish (87%) - [notallme](https://crowdin.com/profile/notallme).
+* Chinese Simplified (68%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
+* Chinese Traditional (29%) - [k98a](https://crowdin.com/profile/k98a).
+* Czech (71%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
+* French (98%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
+* German (98%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx), [Leridon](https://crowdin.com/profile/Leridon), [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs) and [adoa](https://crowdin.com/profile/adoa).
+* Hungarian (96%) - [mmnetworkteam](https://crowdin.com/profile/mmnetworkteam).
+* Korean (84%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
+* Polish (95%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
+* Portuguese, Brazilian (98%) - [celaquila](https://crowdin.com/profile/celaquila) and [Unknow0059](https://crowdin.com/profile/Unknow0059).
+* Russian (96%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1).
+* Spanish (86%) - [notallme](https://crowdin.com/profile/notallme).
 
 ### Mod Compatibility
 
-**Note:** If playing with Factorio 0.15, please download v0.7.6; for Factorio 0.16, please download v0.8.11; for Factorio 0.17, please download v0.9.16; for Factorio 0.18 please download v0.10.9, as these are the last stable versions supported on these base game releases. v0.11.0 and later are only supported on Factorio 1.0.
+**Note:** If playing on older versions of Factorio, check the FAQ page for the correct Dectorio version to use.
 
 Limited testing has been completed with other mods. Warnings will be shown in-game to highlight any known issues. If you come across a specific compatibility issue, please let me know and I'll see what I can do to fix it.
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,19 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.12.0
+Date: 24. 11. 2020
+  Added:
+    - Support for Factorio 1.1
+  Changed:
+    - Re-ordered signal colours to maintain vanilla priority order (thanks to dbiser99)
+    - Technology names now use their singular form
+    - Adjusted technology icons
+    - Stack sizes for flooring, landscaping and wall items now reflect vanilla stack sizes as these cause unintended balance issues in larger modpacks. The stack sizes can still be configured in mod settings.
+  Removed:
+    - Support for Factorio 1.0 (use Dectorio version 0.11.1 instead)
+    - Signs (use Industrial Display Plates or Text Plates as a replacement)
+  Locales:
+    - Updated German translation (thanks to adoa)
+---------------------------------------------------------------------------------------------------
 Version: 0.11.1
 Date: 24. 11. 2020
   Locales:

diff --git a/config.lua b/config.lua
@@ -15,25 +15,25 @@ DECT.CONFIG.SIGNALS = {
 	-- The order of the virtual signals is the order they will appear in-game
 	-- NOTE: New virtual signals will need localised names to be provided in '/locale/[language]/dectorio.cfg'
 	{type = "virtual", name = "signal-red", color = {r = 1.00, g = 0.16, b = 0.10, a = 1.00}},
-	{type = "virtual", name = "signal-orange", color = {r = 0.99, g = 0.44, b = 0.22, a = 1.00}},
-	{type = "virtual", name = "signal-tangerine", color = {r = 1.00, g = 0.58, b = 0.14, a = 1.00}},
-	{type = "virtual", name = "signal-yellow", color = {r = 1.00, g = 0.96, b = 0.27, a = 1.00}},
+	{type = "virtual", name = "signal-maroon", color = {r = 0.50, g = 0.00, b = 0.00, a = 1.00}},
+	{type = "virtual", name = "signal-emerald", color = {r = 0.17, g = 0.54, b = 0.25, a = 1.00}},
 	{type = "virtual", name = "signal-green", color = {r = 0.00, g = 0.95, b = 0.17, a = 1.00}},
-	{type = "virtual", name = "signal-cyan", color = {r = 0.01, g = 0.98, b = 1.00, a = 1.00}},
-	{type = "virtual", name = "signal-aqua", color = {r = 0.05, g = 0.67, b = 0.99, a = 1.00}},
+	{type = "virtual", name = "signal-olive", color = {r = 0.50, g = 0.50, b = 0.01, a = 1.00}},
 	{type = "virtual", name = "signal-blue", color = {r = 0.07, g = 0.35, b = 0.98, a = 1.00}},
-	{type = "virtual", name = "signal-purple", color = {r = 0.65, g = 0.38, b = 0.99, a = 1.00}},
+	{type = "virtual", name = "signal-yellow", color = {r = 1.00, g = 0.96, b = 0.27, a = 1.00}},
+	{type = "virtual", name = "signal-tangerine", color = {r = 1.00, g = 0.58, b = 0.14, a = 1.00}},
+	{type = "virtual", name = "signal-orange", color = {r = 0.99, g = 0.44, b = 0.22, a = 1.00}},
 	{type = "virtual", name = "signal-pink", color = {r = 1.00, g = 0.42, b = 0.99, a = 1.00}},
-	{type = "virtual", name = "signal-maroon", color = {r = 0.50, g = 0.00, b = 0.00, a = 1.00}},
-	{type = "virtual", name = "signal-brown", color = {r = 0.60, g = 0.39, b = 0.14, a = 1.00}},
-	{type = "virtual", name = "signal-olive", color = {r = 0.50, g = 0.50, b = 0.01, a = 1.00}},
-	{type = "virtual", name = "signal-emerald", color = {r = 0.17, g = 0.54, b = 0.25, a = 1.00}},
 	{type = "virtual", name = "signal-teal", color = {r = 0.28, g = 0.60, b = 0.56, a = 1.00}},
+	{type = "virtual", name = "signal-cyan", color = {r = 0.01, g = 0.98, b = 1.00, a = 1.00}},
+	{type = "virtual", name = "signal-aqua", color = {r = 0.05, g = 0.67, b = 0.99, a = 1.00}},
 	{type = "virtual", name = "signal-navy", color = {r = 0.00, g = 0.00, b = 0.50, a = 1.00}},
+	{type = "virtual", name = "signal-purple", color = {r = 0.65, g = 0.38, b = 0.99, a = 1.00}},
 	{type = "virtual", name = "signal-violet", color = {r = 0.56, g = 0.12, b = 0.70, a = 1.00}},
-	{type = "virtual", name = "signal-black", color = {r = 0.22, g = 0.13, b = 0.56, a = 1.00}},
-	{type = "virtual", name = "signal-grey", color = {r = 0.80, g = 0.80, b = 0.80, a = 1.00}},
+	{type = "virtual", name = "signal-brown", color = {r = 0.60, g = 0.39, b = 0.14, a = 1.00}},
 	{type = "virtual", name = "signal-white", color = {r = 1.00, g = 1.00, b = 1.00, a = 1.00}},
+	{type = "virtual", name = "signal-grey", color = {r = 0.80, g = 0.80, b = 0.80, a = 1.00}},
+	{type = "virtual", name = "signal-black", color = {r = 0.22, g = 0.13, b = 0.56, a = 1.00}},
 	{type = "item", name = "wood", color = {r = 0.57, g = 0.36, b = 0.12, a = 0.86}},
 	{type = "item", name = "coal", color = {r = 0.17, g = 0.17, b = 0.17, a = 0.86}},
 	{type = "item", name = "stone", color = {r = 0.64, g = 0.50, b = 0.30, a = 0.86}},
@@ -97,7 +97,6 @@ DECT.ENABLED = {
 	["concrete"] = settings.startup["dectorio-concrete"].value,
 	["gravel"] = settings.startup["dectorio-gravel"].value,
 	["painted-concrete"] = settings.startup["dectorio-painted-concrete"].value,
-	["signs"] = settings.startup["dectorio-signs"].value,
 	["decoratives"] = settings.startup["dectorio-decoratives"].value,
 	["lawnmower"] = settings.startup["dectorio-lawnmower"].value,
 	["item-group"] = settings.startup["dectorio-item-group"].value
@@ -198,32 +197,6 @@ DECT.CONFIG.BASE_COLORS = {
 	{name = "cyan", tint = {r = 0.335, g = 0.918, b = 0.866}},
 	{name = "acid", tint = {r = 0.708, g = 0.996, b = 0.134}}
 }
-DECT.CONFIG.SIGN_CATEGORIES = {"item", "fluid", "tool", "ammo", "armor", "capsule", "gun", "module"}
-DECT.CONFIG.SIGN_BLACKLIST = {
-	"barrel",
-	"loader",
-	"simple%-entity",
-	"player%-port",
-	"computer",
-	"coin",
-	"small%-plane",
-	"railgun",
-	"vehicle%-machine%-gun",
-	"tank%-machine%-gun",
-	"signpost",
-	"dect%-signal%-",
-	"infinity%-chest",
-	"infinity%-pipe",
-	"heat%-interface",
-	"pollution",
-	"escape%-pod%-power",
-	"dummy%-steel%-axe",
-	"atlas",
-	"crash%-site",
-	"dect%-sign",
-	"dect%-base"
-}
-DECT.CONFIG.SIGN_WHITELIST = {"empty-barrel"}
 
 DECT.INCOMPATIBLE = {}
 DECT.INCOMPATIBLE.MODS = {