Merge pull request #68 from Roang-zero1/master

Fix crash on initial machine build pt. 2
troelsbjerre · Jan 25, 2020 · 7d03a48 · 7d03a48
2 parents 398bf21 + 469c1db
commit 7d03a48
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,25 +1,33 @@
 # Changelog
 
+## 0.11.2 (2020-01-26)
+
+### Bugfixes
+
+- Fix missing STYLE array on incomplete init by [Roang-zero1](https://github.com/Roang-zero1)
+
+---
+
 ## 0.11.1 (2020-01-24)
 
 ### Bugfixes
 
-- Fix crash on initial machine build
+- Fix crash on initial machine build by [Roang-zero1](https://github.com/Roang-zero1)
 
 ---
 
 ## 0.11.0 (2020-01-24)
 
 ### Features
 
-- Use 0.17 API to request entity status
-- Show rocket silo status
-- New Icon options
-- More customization options
+- Use 0.17 API to request entity status by [Roang-zero1](https://github.com/Roang-zero1)
+- Show rocket silo status by [Roang-zero1](https://github.com/Roang-zero1)
+- New Icon options by [Roang-zero1](https://github.com/Roang-zero1)
+- More customization options by [Roang-zero1](https://github.com/Roang-zero1)
 
 ### Bugfixes
 
-- Fix status lamps for laboratories
+- Fix status lamps for laboratories by [Roang-zero1](https://github.com/Roang-zero1)
 
 ---
 

diff --git a/changelog.json b/changelog.json
@@ -1,20 +1,53 @@
 {
+  "0.11.2": {
+    "date": "2020-01-26",
+    "Categories": {
+      "Bugfixes": [
+        {
+          "change": "Fix missing STYLE array on incomplete init",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        }
+      ]
+    }
+  },
   "0.11.1": {
     "date": "2020-01-24",
     "Categories": {
-      "Bugfixes": ["Fix crash on initial machine build"]
+      "Bugfixes": [
+        {
+          "change": "Fix crash on initial machine build",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        }
+      ]
     }
   },
   "0.11.0": {
     "date": "2020-01-24",
     "Categories": {
       "Features": [
-        "Use 0.17 API to request entity status",
-        "Show rocket silo status",
-        "New Icon options",
-        "More customization options"
+        {
+          "change": "Use 0.17 API to request entity status",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        },
+        {
+          "change": "Show rocket silo status",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        },
+        {
+          "change": "New Icon options",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        },
+        {
+          "change": "More customization options",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        }
       ],
-      "Bugfixes": ["Fix status lamps for laboratories"]
+      "Bugfixes": [
+        {
+          "change": "Fix status lamps for laboratories",
+          "by": { "Roang-zero1": "https://github.com/Roang-zero1" }
+        }
+      ]
     }
   },
   "0.10.5": {

diff --git a/changelog.txt b/changelog.txt
@@ -1,21 +1,27 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.11.2
+Date: 2020-01-26
+
+  Bugfixes:
+    - Fix missing STYLE array on incomplete init by Roang-zero1
+---------------------------------------------------------------------------------------------------
 Version: 0.11.1
 Date: 2020-01-24
 
   Bugfixes:
-    - Fix crash on initial machine build
+    - Fix crash on initial machine build by Roang-zero1
 ---------------------------------------------------------------------------------------------------
 Version: 0.11.0
 Date: 2020-01-24
 
   Features:
-    - Use 0.17 API to request entity status
-    - Show rocket silo status
-    - New Icon options
-    - More customization options
+    - Use 0.17 API to request entity status by Roang-zero1
+    - Show rocket silo status by Roang-zero1
+    - New Icon options by Roang-zero1
+    - More customization options by Roang-zero1
 
   Bugfixes:
-    - Fix status lamps for laboratories
+    - Fix status lamps for laboratories by Roang-zero1
 ---------------------------------------------------------------------------------------------------
 Version: 0.10.5
 Date: 2020-01-24

diff --git a/control.lua b/control.lua
@@ -238,6 +238,9 @@ local function init()
 end
 
 local function on_load()
+  if # STYLE == 0 then
+    update_settings(nil)
+  end
   register_conditional_events()
 end
 

diff --git a/info.json b/info.json
@@ -1,7 +1,7 @@
 {
   "name": "Bottleneck",
   "author": "Troels Bjerre Lund",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "factorio_version": "0.18",
   "title": "Bottleneck",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=144&t=28817",