Merge branch 'master' of https://github.com/Heath123/pakkit

Heath123 · Apr 12, 2021 · 9020872 · 9020872
2 parents ebae286 + 1475be8
commit 9020872
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -52,9 +52,9 @@
     "electron-window-state": "^5.0.3",
     "escape-html": "^1.0.3",
     "md5-file": "^5.0.0",
-    "minecraft-data": "^2.70.2",
+    "minecraft-data": "^2.80.0",
     "minecraft-folder-path": "^1.1.0",
-    "minecraft-protocol": "^1.22.0",
+    "minecraft-protocol": "^1.24.1",
     "node-eval": "^2.0.0",
     "source-map-support": "^0.5.19",
     "ws": "^7.4.1"

diff --git a/src/index.js b/src/index.js
@@ -27,8 +27,8 @@ const Store = require('electron-store')
 const store = new Store()
 
 let proxy // Defined later when an option is chosen
-const resourcesPath = fs.existsSync('resources/app')
-    ? 'resources/app/' // Packaged with electron-forge
+const resourcesPath = fs.existsSync(process.resourcesPath.concat('/app/'))
+    ? process.resourcesPath.concat('/app/') // Packaged with electron-forge
     : './' // npm start