Merge branch 'update' of https://github.com/AvaLilac/for-desktop into update

Author: RaptorCoding

forge.config.ts

@@ -86,12 +86,15 @@ if (!process.env.PLATFORM) {
           "--filesystem=xdg-run/speech-dispatcher",
           "--talk-name=org.freedesktop.ScreenSaver",
           "--talk-name=org.freedesktop.Notifications",
+<<<<<<< HEAD
 <<<<<<< HEAD
           "--talk-name=org.kde.StatusNotifierWatcher",
           "--talk-name=com.canonical.AppMenu.Registrar",
           "--talk-name=com.canonical.indicator.application",
 =======
 >>>>>>> d32fd3b (Put inject.js into the same folder as main.js)
+=======
+>>>>>>> 74ba56962983c872ed91b63a6009c0e1b16905e5
           "--talk-name=com.canonical.Unity",
           "--env=XCURSOR_PATH=/run/host/user-share/icons:/run/host/share/icons",
           "--env=ELECTRON_TRASH=gio",

package.json

@@ -42,7 +42,10 @@
 =======
     "electron": "38.1.2",
     "electron-vite": "^5.0.0",
+<<<<<<< HEAD
 >>>>>>> da07582 (Install electron-vite to fix types warning)
+=======
+>>>>>>> 74ba56962983c872ed91b63a6009c0e1b16905e5
     "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.32.0",
     "json-schema-typed": "^8.0.1",