Merge branch 'master' into microsoft-auth

2025-12-16 12:13:50 +00:00 · 2021-08-29 14:18:02 +02:00
parent c8f598897d 8a276f367e
commit ba8b4b1bff
2 changed files with 53 additions and 53 deletions
--- a/package.json
+++ b/package.json
@@ -1,44 +1,44 @@
-{
-  "name": "altarik-launcher",
-  "author": "Altarik",
-  "version": "0.4.1",
-  "description": "Altarik Launcher",
-  "main": "src/server/main.js",
-  "repository": "AltarikMC/Launcher",
-  "bugs": "https://github.com/AltarikMC/Launcher/issues",
-  "keywords": [],
-  "contributors": [
-    "SexiestCHiba"
-  ],
-  "maintainers": [
-    "SexiestCHiba"
-  ],
-  "os": [
-    "win32"
-  ],
-  "license": "BSD-3-Clause",
-  "scripts": {
-    "start": "electron-forge start",
-    "test": "electron .",
-    "package": "electron-forge package",
-    "make": "electron-forge make"
-  },
-  "devDependencies": {
-    "@electron-forge/cli": "^6.0.0-beta.59",
-    "@electron-forge/maker-squirrel": "^6.0.0-beta.59",
-    "electron": "^13.1.9"
-  },
-  "dependencies": {
-    "axios": "^0.21.1",
-    "electron-is-dev": "^2.0.0",
-    "electron-log": "^4.4.1",
-    "electron-squirrel-startup": "^1.0.0",
-    "extract-zip": "^2.0.1",
-    "hasha": "^5.2.2",
-    "minecraft-launcher-core": "^3.16.7",
-    "msmc": "^2.2.0"
-  },
-  "config": {
-    "forge": "./config.forge.js"
-  }
-}
+{
+  "name": "altarik-launcher",
+  "author": "Altarik",
+  "version": "0.4.1",
+  "description": "Altarik Launcher",
+  "main": "src/server/main.js",
+  "repository": "AltarikMC/Launcher",
+  "bugs": "https://github.com/AltarikMC/Launcher/issues",
+  "keywords": [],
+  "contributors": [
+    "SexiestCHiba"
+  ],
+  "maintainers": [
+    "SexiestCHiba"
+  ],
+  "os": [
+    "win32"
+  ],
+  "license": "BSD-3-Clause",
+  "scripts": {
+    "start": "electron-forge start",
+    "test": "electron .",
+    "package": "electron-forge package",
+    "make": "electron-forge make"
+  },
+  "devDependencies": {
+    "@electron-forge/cli": "^6.0.0-beta.59",
+    "@electron-forge/maker-squirrel": "^6.0.0-beta.59",
+    "electron": "^13.2.1"
+  },
+  "dependencies": {
+    "axios": "^0.21.1",
+    "electron-is-dev": "^2.0.0",
+    "electron-log": "^4.4.1",
+    "electron-squirrel-startup": "^1.0.0",
+    "extract-zip": "^2.0.1",
+    "hasha": "^5.2.2",
+    "minecraft-launcher-core": "^3.16.7",
+    "msmc": "^2.2.0"
+  },
+  "config": {
+    "forge": "./config.forge.js"
+  }
+}