Merge branch 'main' of github.com:Thorium-Sim/thorium into develop

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.12.3](https://github.com/Thorium-Sim/thorium/compare/2.12.2...2.12.3) (2020-06-23)
+
+
+### Bug Fixes
+
+* **Kiosk:** Fixes an issue that causes the kiosk to not load. Closes [#2985](https://github.com/Thorium-Sim/thorium/issues/2985) ([13274d0](https://github.com/Thorium-Sim/thorium/commit/13274d04a8930d5438a3b8a9e4c0317fe64bb32d))
+
 ## [2.12.2](https://github.com/Thorium-Sim/thorium/compare/2.12.1...2.12.2) (2020-06-19)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "thorium",
-  "version": "2.12.2",
+  "version": "2.12.3",
   "description": "Starship Simulator Controls",
   "private": true,
   "repository": {
@@ -65,9 +65,7 @@
   },
   "proxy": "http://localhost:3001",
   "nodemonConfig": {
-    "watch": [
-      "server/"
-    ],
+    "watch": ["server/"],
     "ignore": [
       ".git",
       "./src/*",
@@ -88,12 +86,8 @@
     }
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "eslint"
-    ],
-    "*.{css,scss}": [
-      "stylelint"
-    ],
+    "*.{js,jsx,ts,tsx}": ["eslint"],
+    "*.{css,scss}": ["stylelint"],
     "**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
       "prettier --write"
     ]
@@ -110,9 +104,7 @@
     "directories": {
       "output": "./packages"
     },
-    "publish": {
-      "provider": "github"
-    },
+    "publish": { "provider": "github" },
     "files": [
       "electron/**/*",
       "!**/node_modules/**/*",
@@ -141,15 +133,10 @@
       ]
     },
     "win": {
-      "target": [
-        "zip",
-        "portable"
-      ],
+      "target": ["zip", "portable"],
       "icon": "./public/icon.ico"
     },
-    "linux": {
-      "category": "Utility"
-    }
+    "linux": { "category": "Utility" }
   },
   "bin": "./server/index.js",
   "pkg": {
@@ -169,9 +156,7 @@
     ]
   },
   "release": {
-    "branches": [
-      "main"
-    ],
+    "branches": ["main"],
     "tagFormat": "${version}",
     "plugins": [
       "@semantic-release/commit-analyzer",