Merge remote-tracking branch 'upstream/main' into develop

package-lock.json

@@ -14,6 +14,7 @@
         "discord-rpc": "^4.0.1",
         "dotenv": "^17.2.3",
         "electron-updater": "^6.7.3",
+        "encoding": "^0.1.13",
         "fs-extra": "^11.3.3",
         "tar": "^7.5.7",
         "uuid": "^9.0.1"
@@ -2149,6 +2150,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.5",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -2823,7 +2834,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -4047,7 +4057,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/sanitize-filename": {

package.json

@@ -26,6 +26,7 @@
     "electron",
     "auto-update",
     "mod-manager"
+    
   ],
   "maintainers": [
     {
@@ -52,6 +53,7 @@
     "axios": "^1.6.0",
     "discord-rpc": "^4.0.1",
     "dotenv": "^17.2.3",
+    "encoding": "^0.1.13",
     "electron-updater": "^6.7.3",
     "fs-extra": "^11.3.3",
     "tar": "^7.5.7",