Merge branch 'master' into VersionPickerSeparator

Author: rhit-silkaijr

.github/actions/setup/action.yml

@@ -35,12 +35,12 @@ runs:
     - name: Install Wails
       if: ${{ inputs.backend == 'true' && inputs.skip-wails != 'true' }}
       shell: bash
-      run: go install github.com/wailsapp/wails/v2/cmd/wails@v2.9.2
+      run: go install github.com/wailsapp/wails/v2/cmd/wails@v2.10.2
 
     # Any go operation on linux will require these
     - name: Install additional dependencies
       if: ${{ runner.os == 'Linux' && inputs.backend == 'true' }}
       shell: bash
       run: |
         sudo apt update
-        sudo apt -y install libgtk-3-dev libwebkit2gtk-4.1-dev patchelf
+        sudo apt -y install libgtk-3-dev libwebkit2gtk-4.1-dev patchelf librsvg2-dev

README.md

@@ -41,7 +41,7 @@ for common issues and their solutions.
 * [Go 1.22](https://go.dev/doc/install)
 * [pnpm](https://pnpm.io/installation)
 * [nodejs](https://nodejs.org/en/download/)
-* Wails (`go install github.com/wailsapp/wails/v2/cmd/wails@latest`)
+* Wails (`go install github.com/wailsapp/wails/v2/cmd/wails@latest`) (or the version in [the Setup CI action](./.github/actions/setup/action.yml))
 * IDE of Choice. Goland or VSCode suggested.
 
 ### Configuration
@@ -82,10 +82,16 @@ while maintaining correct ESLint functionality.
 wails build
 ```
 
+To build a version that includes browser devtools (extending production debugging capabilities),:
+
+```bash
+wails build -devtools
+```
+
 ### Linting
 
-Install `golangci-lint` via the directions [here](https://golangci-lint.run/usage/install/#local-installation),
-but make sure to install the version specified in `.github/workflows/push.yaml` instead of whatever it suggests.
+Install `golangci-lint` via the directions [in the Golangci-lint documentation](https://golangci-lint.run/docs/welcome/install/#local-installation),
+but make sure to install the version specified in [`.github/workflows/push.yaml`](./.github/workflows/push.yml) instead of whatever it suggests.
 
 Then, to run it, use:
 
@@ -107,7 +113,7 @@ SMM handles localization through the Tolgee Svelte integration.
 This allows for [in-context translation](https://tolgee.io/js-sdk/) - simply alt-click on a translatable element to open the Tolgee interface.
 
 In order to edit translations in-context, you will need to provide a tolgee API key with edit permissions.
-You can create an API key for yourself [here](https://translate.ficsit.app/projects/4/integrate) once you're added to the project.
+You can create an API key for yourself [in our Tolgee instance](https://translate.ficsit.app/projects/4/integrate) once you're added to the project.
 To supply this API key at development time, create or edit `/frontend/.env.local` and supply the key in a similar format as `.env`.
 
 The in-context translation screenshot feature requires installing the _Tolgee Tools_ browser extension.

cspell.json

@@ -10,10 +10,12 @@
         "Favorited",
         "ficsit",
         "ficsitcli",
+        "GGOOS",
         "Goland",
         "golangci",
         "graphqlrc",
         "Konami",
+        "librsvg",
         "Maximised",
         "Minimised",
         "mircearoata",

frontend/src/lib/components/mods-list/ModsListItem.svelte

@@ -85,7 +85,7 @@
       return {
         icon: mdiLinkLock,
         iconHover: mdiLinkLock,
-        tooltip: $t('mod-list-item.dependency', 'This mod is installed as a dependency of another mod. It cannot be installed or removed on its own.'),
+        tooltip: $t('mod-list-item.dependency', 'This mod is already installed as a dependency of another mod. It cannot be uninstalled as long as other mods depend on it.'),
       };
     }
     if (queuedInstall) {

go.mod

@@ -1,31 +1,33 @@
 module github.com/satisfactorymodding/SatisfactoryModManager
 
-go 1.22
+go 1.22.0
+
+toolchain go1.22.6
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/andygrunwald/vdf v1.1.0
 	github.com/godbus/dbus/v5 v5.1.0
-	github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237
+	github.com/kbinani/screenshot v0.0.0-20250624051815-089614a94018
 	github.com/lmittmann/tint v1.0.3
 	github.com/minio/selfupdate v0.6.0
 	github.com/mitchellh/go-ps v1.0.0
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/puzpuzpuz/xsync/v3 v3.0.2
-	github.com/samber/lo v1.39.0
+	github.com/samber/lo v1.49.1
 	github.com/samber/slog-multi v1.0.2
 	github.com/satisfactorymodding/ficsit-cli v0.5.1-0.20241004172351-3640e5e70817
 	github.com/satisfactorymodding/ficsit-resolver v0.0.6
 	github.com/shirou/gopsutil/v3 v3.24.3
 	github.com/spf13/viper v1.18.1
 	github.com/tawesoft/golib/v2 v2.10.0
-	github.com/wailsapp/go-webview2 v1.0.16
-	github.com/wailsapp/wails/v2 v2.9.2
+	github.com/wailsapp/go-webview2 v1.0.19
+	github.com/wailsapp/wails/v2 v2.10.2
 	github.com/zishang520/engine.io v1.5.12
 	github.com/zishang520/socket.io v1.3.2
 	golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611
-	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.22.0
+	golang.org/x/sync v0.11.0
+	golang.org/x/sys v0.30.0
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	howett.net/plist v1.0.1
@@ -41,27 +43,27 @@ require (
 	github.com/avast/retry-go v3.0.0+incompatible // indirect
 	github.com/bep/debounce v1.2.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/gen2brain/shm v0.0.0-20230802011745-f2460f5984f7 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/gen2brain/shm v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/jezek/xgb v1.1.0 // indirect
+	github.com/jezek/xgb v1.1.1 // indirect
 	github.com/jlaffaye/ftp v0.2.0 // indirect
 	github.com/kr/fs v0.1.0 // indirect
-	github.com/labstack/echo/v4 v4.11.3 // indirect
-	github.com/labstack/gommon v0.4.1 // indirect
+	github.com/labstack/echo/v4 v4.13.3 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
-	github.com/leaanthony/gosod v1.0.3 // indirect
+	github.com/leaanthony/gosod v1.0.4 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
-	github.com/leaanthony/u v1.1.0 // indirect
+	github.com/leaanthony/u v1.1.1 // indirect
 	github.com/lxn/win v0.0.0-20210218163916-a377121e959e // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -73,9 +75,8 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/sftp v1.13.6 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/pterm/pterm v0.12.72 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -84,7 +85,7 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tkrajina/go-reflector v0.5.6 // indirect
+	github.com/tkrajina/go-reflector v0.5.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.17 // indirect
@@ -96,9 +97,9 @@ require (
 	github.com/zishang520/engine.io-go-parser v1.2.3 // indirect
 	github.com/zishang520/socket.io-go-parser v1.0.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
 	modernc.org/libc v1.55.3 // indirect