Merge branch 'master' into new-user-modals

Author: budak7273

backend/ficsitcli/wrapper.go

@@ -3,6 +3,7 @@ package ficsitcli
 import (
 	"fmt"
 	"log/slog"
+	"slices"
 	"sync"
 	"time"
 
@@ -45,6 +46,13 @@ func Init() error {
 	return nil
 }
 
+// With and without `.exe` variants in case it is missing on Linux
+var executableNames = []string{
+	"FactoryGame-Win64-Shipping.exe", "FactoryGame-Win64-Shipping",
+	"FactoryGameSteam-Win64-Shipping.exe", "FactoryGameSteam-Win64-Shipping",
+	"FactoryGameEGS-Win64-Shipping.exe", "FactoryGameEGS-Win64-Shipping",
+}
+
 func (f *ficsitCLI) StartGameRunningWatcher() {
 	gameRunningTicker := time.NewTicker(5 * time.Second)
 	go func() {
@@ -56,7 +64,7 @@ func (f *ficsitCLI) StartGameRunningWatcher() {
 			}
 			f.isGameRunning = false
 			for _, process := range processes {
-				if process.Executable() == "FactoryGame-Win64-Shipping.exe" || process.Executable() == "FactoryGame-Win64-Shipping" {
+				if slices.Contains(executableNames, process.Executable()) {
 					f.isGameRunning = true
 					break
 				}

backend/installfinders/common/types.go

@@ -3,6 +3,7 @@ package common
 type GameBranch string
 
 var (
+	// TODO rename to BranchRelease later https://github.com/satisfactorymodding/SatisfactoryModManager/pull/223#issuecomment-2342831142
 	BranchEarlyAccess  GameBranch = "Early Access"
 	BranchExperimental GameBranch = "Experimental"
 )

cspell.json

@@ -27,7 +27,8 @@
         "Unignore",
         "urql",
         "wailsjs",
-        "wailsjsdir"
+        "wailsjsdir",
+        "xsync"
     ],
     // flagWords - list of words to be always considered incorrect
     // This is useful for offensive words and common spelling errors.