Merge branch 'develop'

jpanther · Apr 29, 2019 · e1f8c18 · e1f8c18
2 parents 5fa60b1 + 0474009
commit e1f8c18
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -103,19 +103,15 @@ Dectorio uses CrowdIn to allow the community to translate the mod from English i
 
 Special thanks to the translators below (in no particular order).
 
-Fully supported languages:
-* English
-
-Community translations:
 * Chinese Simplified (87%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
 * Chinese Traditional (29%)
-* Czech (64%) - [dereksp](https://crowdin.com/profile/dereksp) and [Meritic](https://crowdin.com/profile/Meritic).
+* Czech (70%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
 * French (87%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi).
 * German (100%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn) and [lpzockerx](https://crowdin.com/profile/lpzockerx).
 * Korean (87%) - [Xagros](https://crowdin.com/profile/GimoXagros).
 * Polish (54%) - [Tomirad](https://github.com/Tomirad).
 * Portuguese, Brazilian (100%) - [celaquila](https://crowdin.com/profile/celaquila).
-* Russian (94%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777) and [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd).
+* 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 (100%) - [notallme](https://crowdin.com/profile/notallme).
 
 ### Mod Compatibility

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.9.11
+Date: 29. 04. 2019
+  Added:
+    - Signal color support for Sulfur and KS Power mod's Diesel fuel fluid
+    - Ability to craft red and brown tree variants
+  Changed:
+    - Updated Concrete wall icons to match 0.17 style
+  Locales:
+    - Updated Czech translation (thanks to Treij)
+    - Updated Russian translation (thanks to 1avek1)
+---------------------------------------------------------------------------------------------------
 Version: 0.9.10
 Date: 29. 03. 2019
   Added:

diff --git a/config.lua b/config.lua
@@ -45,6 +45,7 @@ DECT.CONFIG.SIGNALS = {
 	{type="item", name="copper-ore", color={r=0.91,g=0.58,b=0.13,a=0.86}},              -- Carrot Orange
 	{type="item", name="copper-plate", color={r=0.92,g=0.59,b=0.46,a=0.86}},            -- Dark Salmon
 	{type="item", name="uranium-ore", color={r=0.69,g=0.96,b=0.18,a=0.86}},             -- Green Yellow
+	{type="item", name="sulfur", color={r=0.98,g=0.93, b=0.13,a=0.86}},                 -- Lemon
 	{type="item", name="automation-science-pack", color={r=0.71,g=0.05,b=0.09,a=1.00}}, -- Cornell Red
 	{type="item", name="logistic-science-pack", color={r=0.18,g=0.60,b=0.11,a=1.00}},   -- Forest Green
 	{type="item", name="chemical-science-pack", color={r=0.15,g=0.65,b=0.75,a=1.00}},   -- Blue Green
@@ -136,7 +137,7 @@ DECT.CONFIG.GRAVEL_VARIANTS = {
 -- When changing these tables, the migration scripts need to be adjusted to compensate!
 DECT.CONFIG.BASE_TILES = {"dry-dirt", "dirt-1", "dirt-2", "dirt-3", "dirt-4", "dirt-5", "dirt-6", "dirt-7", "sand-1", "sand-2", "sand-3", "grass-1", "grass-2", "grass-3", "grass-4", "red-desert-0", "red-desert-1", "red-desert-2", "red-desert-3"}
 DECT.CONFIG.BASE_WATER_TILES = {"water", "deepwater", "water-green", "deepwater-green"}
-DECT.CONFIG.BASE_TREES = {"tree-01", "tree-02", "tree-03", "tree-04", "tree-05", "tree-06", "tree-07", "tree-08", "tree-09", "dead-dry-hairy-tree", "dead-grey-trunk", "dead-tree-desert", "dry-hairy-tree", "dry-tree"}
+DECT.CONFIG.BASE_TREES = {"tree-01", "tree-02", "tree-03", "tree-04", "tree-05", "tree-06", "tree-07", "tree-08", "tree-09", "dead-dry-hairy-tree", "dead-grey-trunk", "dead-tree-desert", "dry-hairy-tree", "dry-tree", "tree-02-red", "tree-08-red", "tree-09-red", "tree-06-brown", "tree-08-brown", "tree-09-brown"}
 DECT.CONFIG.BASE_ROCKS = {"rock-huge", "rock-big", "sand-rock-big"}
 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", "dect%-sign", "dect%-base"}

diff --git a/graphics/icons/concrete-wall-from-stone-wall.png b/graphics/icons/concrete-wall-from-stone-wall.png
diff --git a/graphics/icons/concrete-wall.png b/graphics/icons/concrete-wall.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "Dectorio",
-    "version": "0.9.10",
+    "version": "0.9.11",
     "title": "Dectorio",
     "author": "PantherX",
     "contact": "",

diff --git a/prototypes/third-party/config.lua b/prototypes/third-party/config.lua
@@ -42,3 +42,10 @@ if mods["Arborium"] then
 	-- Disable tree crafting (as Arborium handles this)
 	DECT.CONFIG.BASE_TREES = {}
 end
+
+-- KS POWER
+-- ---------------------------------
+if mods["KS_Power"] then
+	-- Add signal support for Diesel fuel fluid
+	table.insert(DECT.CONFIG.SIGNALS, {type="fluid", name="diesel-fuel", color={r=0.70,g=0.70,b=0.00,a=0.68}})
+end