merge unconflict

package.json

@@ -35,14 +35,14 @@
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
         "@stylistic/eslint-plugin": "^4.2.0",
-        "@types/node": "^22.15.17",
+        "@types/node": "^22.15.18",
         "@types/react": "18.3.1",
         "@vencord/types": "^1.11.5",
         "dotenv": "^16.5.0",
-        "electron": "^36.2.0",
+        "electron": "^36.2.1",
         "electron-builder": "^26.0.12",
         "esbuild": "^0.25.4",
-        "eslint": "^9.26.0",
+        "eslint": "^9.27.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^2.1.0",
         "eslint-plugin-prettier": "^5.4.0",
@@ -121,7 +121,8 @@
                     "Type": "Application",
                     "Categories": "Network;InstantMessaging;Chat;",
                     "Keywords": "discord;vencord;nexulien;electron;chat;",
-                    "MimeType": "x-scheme-handler/discord"
+                    "MimeType": "x-scheme-handler/discord",
+                    "StartupWMClass": "nexop"
                 }
             }
         },