From 99a769d91760cf1ae93fe9639e70650e51f2820d Mon Sep 17 00:00:00 2001
From: root <root@factorio-sm.loc>
Date: Fri, 19 Jun 2026 16:08:05 +0000
Subject: [PATCH 001/112] Fix: Replace password auth with token auth for
 factorio.com API

---
 src/api/mod_portal_handler.go                 |  4 ++--
 src/factorio/mod_portal.go                    | 19 +++++++++++++++++++
 .../AddMod/components/FactorioLogin.jsx       |  8 ++++----
 ui/api/resources/mods.js                      |  4 ++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 076db45e..ba4cb813 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -105,14 +105,14 @@ func ModPortalLoginHandler(w http.ResponseWriter, r *http.Request) {
 
 	var data struct {
 		Username string `json:"username"`
-		Password string `json:"password"`
+		Token    string `json:"token"`
 	}
 	resp, err = ReadFromRequestBody(w, r, &data)
 	if err != nil {
 		return
 	}
 
-	err, statusCode := factorio.FactorioLogin(data.Username, data.Password)
+	err, statusCode := factorio.FactorioLoginWithToken(data.Username, data.Token)
 	w.WriteHeader(statusCode)
 	if err != nil {
 		resp = fmt.Sprintf("Error trying to login into Factorio: %s", err)
diff --git a/src/factorio/mod_portal.go b/src/factorio/mod_portal.go
index dd3d5deb..37db290c 100644
--- a/src/factorio/mod_portal.go
+++ b/src/factorio/mod_portal.go
@@ -145,3 +145,22 @@ func FactorioLogin(username string, password string) (error, int) {
 
 	return nil, http.StatusOK
 }
+
+// FactorioLoginWithToken saves credentials directly using a token from factorio.com/profile
+func FactorioLoginWithToken(username string, token string) (error, int) {
+	if username == "" || token == "" {
+		return errors.New("username and token are required"), http.StatusBadRequest
+	}
+
+	credentials := Credentials{
+		Username: username,
+		Userkey:  token,
+	}
+
+	err := credentials.Save()
+	if err != nil {
+		return err, http.StatusInternalServerError
+	}
+
+	return nil, http.StatusOK
+}
diff --git a/ui/App/views/Mods/components/AddMod/components/FactorioLogin.jsx b/ui/App/views/Mods/components/AddMod/components/FactorioLogin.jsx
index 7450333e..193d2885 100644
--- a/ui/App/views/Mods/components/AddMod/components/FactorioLogin.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/FactorioLogin.jsx
@@ -10,9 +10,9 @@ const FactorioLogin = ({setIsFactorioAuthenticated}) => {
     const {register, handleSubmit} = useForm();
     const [isLoading, setIsLoading] = useState(false);
 
-    const login = ({username, password}) => {
+    const login = ({username, token}) => {
         setIsLoading(true);
-        modsResource.portal.login(username, password)
+        modsResource.portal.login(username, token)
             .then(res => {
                 setIsFactorioAuthenticated(true)
             })
@@ -28,8 +28,8 @@ const FactorioLogin = ({setIsFactorioAuthenticated}) => {
                     <Input register={register('username',{required: true})}/>
                 </div>
                 <div className="w-1/2 ml-2">
-                    <Label text="Password" htmlFor="password"/>
-                    <Input type="password" register={register('password',{required: true})}/>
+                    <Label text="Token" htmlFor="password"/>
+                    <Input type="password" register={register('token',{required: true})}/>
                 </div>
             </div>
             <Button isSubmit={true} isLoading={isLoading}>Login</Button>
diff --git a/ui/api/resources/mods.js b/ui/api/resources/mods.js
index 33d74a78..8d35521d 100644
--- a/ui/api/resources/mods.js
+++ b/ui/api/resources/mods.js
@@ -34,10 +34,10 @@ const mods = {
     },
     downloadAllURL: '/api/mods/download',
     portal: {
-        login: async (username, password) => {
+        login: async (username, token) => {
             const response = await client.post('/api/mods/portal/login', {
                 username,
-                password
+                token
             });
             return response.data;
         },

From 437cd94e1b7227910bee3aa6042c5b789f4dde2c Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 03:15:11 +0000
Subject: [PATCH 002/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20FSM=20=E5=89=8D=E7=AB=AF=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specs/2026-06-21-fsm-i18n-design.md       | 735 ++++++++++++++++++
 1 file changed, 735 insertions(+)
 create mode 100644 docs/superpowers/specs/2026-06-21-fsm-i18n-design.md

diff --git a/docs/superpowers/specs/2026-06-21-fsm-i18n-design.md b/docs/superpowers/specs/2026-06-21-fsm-i18n-design.md
new file mode 100644
index 00000000..ad0a2e45
--- /dev/null
+++ b/docs/superpowers/specs/2026-06-21-fsm-i18n-design.md
@@ -0,0 +1,735 @@
+# FSM Frontend Internationalization (i18n) Design Spec
+
+**Date:** 2026-06-21
+**Project:** factorio-server-manager-joey
+**Branch:** feat/fsm-i18n
+**Status:** Draft / Approved for Implementation
+
+---
+
+## 1. Overview and Goals
+
+### 1.1 Problem
+
+The Factorio Server Manager (FSM) frontend has zero internationalization support. All UI strings are hardcoded English embedded in JSX components. This blocks adoption by non-English-speaking server operators, particularly the Chinese community where Factorio has a large player base.
+
+### 1.2 Goals
+
+- Enable the UI to render in Simplified Chinese (zh-CN) as the first translated locale.
+- Keep English as the authoritative fallback language (maintain existing strings as the source of truth).
+- Introduce a translation architecture that makes adding future locales trivial (single new JSON folder).
+- Minimize component refactoring: the `useTranslation()` Hook pattern mirrors existing React functional component style.
+- Zero backend changes. Go error messages, log entries, and RCON output are not translated.
+- Complete coverage of all ~200 UI strings across 9 view/page areas.
+
+### 1.3 Non-Goals (see also Section 10)
+
+- Translating Go backend strings, error messages, or Factorio server log output.
+- Runtime locale switching without page reload (nice-to-have, not required for MVP).
+- Right-to-left (RTL) language support.
+- Pluralization rules or ICU MessageFormat.
+- Integration with CI translation services (POEditor, Crowdin, etc.).
+
+---
+
+## 2. Architecture
+
+### 2.1 Framework: react-i18next + i18next
+
+Chosen over alternatives (react-intl, LinguiJS) because:
+
+- `useTranslation()` Hook matches the existing functional component + Hooks pattern perfectly.
+- No Redux or global state manager dependency (the app uses only `useState`).
+- Backend-agnostic: translations are loaded as static JSON at build time, no XHR needed.
+- `i18next-browser-languagedetector` provides zero-config language detection from `navigator.language`.
+
+### 2.2 Installation
+
+```bash
+npm install i18next react-i18next i18next-browser-languagedetector
+```
+
+All three packages are runtime dependencies. No additional Webpack plugins or loaders are required (JSON imports are already supported by Webpack 5 with the default `json` module type; the existing config resolves `.json` extensions via `resolve.extensions`).
+
+### 2.3 Initialization
+
+A single initialization module is created at `ui/i18n.js`:
+
+```js
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+
+import enCommon from './locales/en/common.json';
+import enLayout from './locales/en/layout.json';
+import enControls from './locales/en/controls.json';
+import enMods from './locales/en/mods.json';
+import enSaves from './locales/en/saves.json';
+import enServerSettings from './locales/en/serverSettings.json';
+import enLogs from './locales/en/logs.json';
+import enConsole from './locales/en/console.json';
+import enUserManagement from './locales/en/userManagement.json';
+
+import zhCommon from './locales/zh-CN/common.json';
+import zhLayout from './locales/zh-CN/layout.json';
+import zhControls from './locales/zh-CN/controls.json';
+import zhMods from './locales/zh-CN/mods.json';
+import zhSaves from './locales/zh-CN/saves.json';
+import zhServerSettings from './locales/zh-CN/serverSettings.json';
+import zhLogs from './locales/zh-CN/logs.json';
+import zhConsole from './locales/zh-CN/console.json';
+import zhUserManagement from './locales/zh-CN/userManagement.json';
+
+const resources = {
+  en: {
+    common: enCommon,
+    layout: enLayout,
+    controls: enControls,
+    mods: enMods,
+    saves: enSaves,
+    serverSettings: enServerSettings,
+    logs: enLogs,
+    console: enConsole,
+    userManagement: enUserManagement,
+  },
+  'zh-CN': {
+    common: zhCommon,
+    layout: zhLayout,
+    controls: zhControls,
+    mods: zhMods,
+    saves: zhSaves,
+    serverSettings: zhServerSettings,
+    logs: zhLogs,
+    console: zhConsole,
+    userManagement: zhUserManagement,
+  },
+};
+
+i18n
+  .use(LanguageDetector)
+  .use(initReactI18next)
+  .init({
+    resources,
+    fallbackLng: 'en',
+    defaultNS: 'common',
+    ns: [
+      'common', 'layout', 'controls', 'mods', 'saves',
+      'serverSettings', 'logs', 'console', 'userManagement',
+    ],
+    interpolation: {
+      escapeValue: false, // React already escapes output
+    },
+    detection: {
+      // Only check localStorage and navigator.language
+      order: ['localStorage', 'navigator'],
+      caches: ['localStorage'],
+      lookupLocalStorage: 'fsm_lang',
+    },
+  });
+
+export default i18n;
+```
+
+### 2.4 Provider Wrapping
+
+In `ui/index.js`, import the i18n instance and wrap `<App>` with `<Suspense>`:
+
+```jsx
+import './i18n'; // initialize i18n before rendering
+import React, { Suspense } from 'react';
+import ReactDOM from 'react-dom/client';
+import App from './App/App.jsx';
+
+window.flash = (message, color = 'gray-light') =>
+  Bus.emit('flash', ({ message, color }));
+
+const root = ReactDOM.createRoot(document.getElementById('app'));
+root.render(
+  <Suspense fallback={<div>Loading...</div>}>
+    <App />
+  </Suspense>
+);
+```
+
+`react-i18next` uses `Suspense` internally to delay rendering until translations are loaded. The `fallback` shows a brief loading indicator. For this app with static JSON imports, the Suspense resolves synchronously, so the fallback is a safety measure only.
+
+### 2.5 Translation File Structure
+
+```
+ui/locales/
+  en/
+    common.json
+    layout.json
+    controls.json
+    mods.json
+    saves.json
+    serverSettings.json
+    logs.json
+    console.json
+    userManagement.json
+  zh-CN/
+    common.json
+    layout.json
+    controls.json
+    mods.json
+    saves.json
+    serverSettings.json
+    logs.json
+    console.json
+    userManagement.json
+```
+
+Every namespace folder mirrors `en/` exactly. Missing keys in `zh-CN/*.json` automatically fall back to `en/*.json` at runtime (no crash, no missing string).
+
+---
+
+## 3. Component-Level i18n Integration Pattern
+
+### 3.1 Basic Pattern
+
+**Before** (hardcoded English):
+
+```jsx
+import React from 'react';
+import Button from '../components/Button';
+
+const Controls = ({ serverStatus }) => {
+  return (
+    <Button type="success" className="w-full">
+      Start Server
+    </Button>
+  );
+};
+```
+
+**After** (translated):
+
+```jsx
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import Button from '../components/Button';
+
+const Controls = ({ serverStatus }) => {
+  const { t } = useTranslation('controls');
+
+  return (
+    <Button type="success" className="w-full">
+      {t('startServer')}
+    </Button>
+  );
+};
+```
+
+### 3.2 Component with Multiple Namespaces
+
+When a view imports strings from `common` and its own namespace:
+
+```jsx
+const { t } = useTranslation(['mods', 'common']);
+// Usage:
+t('installMod')      // looks in 'mods' first
+t('save')             // looks in 'common' (fallback namespace)
+t('common:save')      // explicit namespace prefix
+```
+
+Explicit prefix (`'common:save'`) is preferred for clarity when mixing namespaces, except in trivial cases.
+
+### 3.3 Interpolation (Dynamic Values)
+
+For strings that embed variables (save names, usernames, version numbers):
+
+**Translation JSON** (`en/common.json`):
+```json
+{
+  "saveLastModified": "Last Modified: {{date}}",
+  "deleteConfirm": "Are you sure you want to delete \"{{name}}\"?",
+  "versionInfo": "Version {{version}}"
+}
+```
+
+**Component usage:**
+```jsx
+{t('saveLastModified', { date: save.last_mod })}
+{t('deleteConfirm', { name: save.name })}
+{t('versionInfo', { version: factorioVersion })}
+```
+
+### 3.4 No Changes to Pure Presentational Components
+
+Components like `Button`, `Panel`, `Input`, `Label`, `Modal` do NOT import `useTranslation`. They accept `children` or `text` props. The translation call happens at the call site.
+
+**Exception:** `ConfirmDialog` receives translated `title`, `content` props from its parent. Its own button labels ("Cancel", "Confirm") are translated inside the component via `useTranslation('common')`.
+
+### 3.5 Changes Outside JSX
+
+For the `window.flash()` calls in JavaScript logic (e.g., error toasts):
+
+```jsx
+import { useTranslation } from 'react-i18next';
+const { t } = useTranslation('common');
+
+// Before:
+window.flash("Login failed. Username or Password wrong.", "red");
+
+// After:
+window.flash(t('loginFailed'), "red");
+```
+
+For non-component files (api resources, utility modules) that display user-facing messages, they must either accept a `t` function as a parameter or the calling component must wrap the message.
+
+---
+
+## 4. Translation Key Naming Convention
+
+### 4.1 Rules
+
+- **Flat camelCase.** No dots, no nesting. Each JSON file is a single-level object.
+- **VerbPrefix for actions.** `startServer`, `stopServer`, `deleteSave`, `uploadMod`.
+- **NounOnly for labels.** `serverStatus`, `factorioVersion`, `lastModified`, `actions`.
+- **Status constants in SCREAMING_SNAKE.** `RUNNING`, `STOPPED`, `UNKNOWN`.
+- **Error messages:** `errorRequired`, `errorInvalidPort`, `loginFailed`.
+- **Confirm dialogs:** `confirmDeleteMod`, `confirmStopServer`.
+- **Placeholder text:** `placeholderUsername`, `placeholderPassword`.
+
+### 4.2 Examples per Category
+
+```
+# Controls
+"startServer"         "Start Server"
+"saveStopServer"      "Save & Stop Server"
+"killServer"          "Kill Server"
+"serverStatus"        "Server Status"
+"status"              "Status"
+"ip"                  "IP"
+"port"                "Port"
+"factorioVersion"     "Factorio Version"
+"save"                "Save"
+"RUNNING"             "Running"
+"STOPPED"             "Stopped"
+"UNKNOWN"             "Unknown"
+
+# Common
+"save"                "Save"
+"cancel"              "Cancel"
+"confirm"             "Confirm"
+"delete"              "Delete"
+"loading"             "Loading..."
+"errorOccurred"       "An error occurred"
+"loginFailed"         "Login failed. Username or Password wrong."
+"name"                "Name"
+"actions"             "Actions"
+```
+
+### 4.3 What NOT to Do
+
+```
+# BAD - deep nesting
+"server.controls.start"   "Start Server"
+
+# BAD - inconsistent casing
+"start_server"            "Start Server"
+"stopServer"              "Stop Server"
+
+# BAD - HTML in values
+"welcomeMessage"          "Welcome to <b>FSM</b>"
+```
+
+Values are plain strings. No HTML markup inside JSON values. Components use React elements if formatting is needed.
+
+---
+
+## 5. Language Detection and Switching UX
+
+### 5.1 Auto-Detection
+
+On first visit, `i18next-browser-languagedetector` checks `navigator.language`:
+
+| Browser Language | Selected Locale |
+|---|---|
+| `zh-CN`, `zh-TW`, `zh-HK`, `zh` | `zh-CN` |
+| Any other value | `en` |
+
+The check uses simple prefix matching: if `navigator.language` starts with `zh`, load `zh-CN`. Otherwise, load `en`.
+
+### 5.2 Persistence
+
+The selected language is stored in `localStorage` key `fsm_lang`. On subsequent visits, the stored preference takes priority over `navigator.language`.
+
+Clearing `localStorage` or using a private/incognito window triggers auto-detection again.
+
+### 5.3 Language Switcher UI
+
+A language toggle is added to the Layout sidebar, inside the "FSM Administration" section, below the Help link:
+
+```jsx
+// In Layout.jsx, after the Help link:
+<Link to="/user-management">Users</Link>
+<Link to="/help">Help</Link>
+{/* new */}
+<div className="mt-4 mx-4">
+  <select
+    className="w-full bg-gray-dark text-white border border-gray-light rounded px-2 py-1 text-sm"
+    value={i18n.language}
+    onChange={(e) => {
+      i18n.changeLanguage(e.target.value);
+    }}
+  >
+    <option value="en">English</option>
+    <option value="zh-CN">简体中文</option>
+  </select>
+</div>
+```
+
+The `<select>` uses `i18n.changeLanguage()` which triggers a re-render of all `useTranslation()` hooks. The language switcher does NOT reload the page.
+
+**Implementation note:** `i18n` instance must be imported in Layout.jsx:
+
+```jsx
+import i18n from '../../i18n';
+```
+
+### 5.4 Future Locales
+
+Adding a new locale (e.g., `ja`):
+
+1. Copy `ui/locales/en/` to `ui/locales/ja/`.
+2. Translate all JSON values (not keys).
+3. Add the import block and `ja` entry in `ui/i18n.js`.
+4. Add the `<option>` to the language switcher.
+
+No other code changes needed.
+
+---
+
+## 6. Namespace Scope and Examples
+
+### 6.1 `common` (Universal)
+
+**Scope:** Buttons, labels, messages, and statuses used across multiple views. Actions in `ConfirmDialog`, `Flash`, table headers.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `save` | Save | Button text |
+| `cancel` | Cancel | Button text (ConfirmDialog) |
+| `confirm` | Confirm | Button text (ConfirmDialog) |
+| `delete` | Delete | Button text, icon tooltip |
+| `loading` | Loading... | Fallback, async states |
+| `errorOccurred` | An error occurred | Generic error fallback |
+| `loginFailed` | Login failed. Username or Password wrong. | Login error flash |
+| `name` | Name | Table header column |
+| `actions` | Actions | Table header column |
+| `username` | Username | Login form label |
+| `password` | Password | Login form label, field label |
+| `email` | Email | User management header |
+| `role` | Role | User management header |
+| `required` | This field is required | Validation error message |
+| `signIn` | Sign In | Login button |
+| `logout` | Logout | Layout sidebar button |
+| `saveLastModified` | Last Modified | Saves table header |
+| `size` | Size | Saves table header |
+| `lastModifiedAt` | Last Modified At | Saves table header |
+
+### 6.2 `layout` (Navigation and Sidebar)
+
+**Scope:** Sidebar section headers, navigation links, page title areas.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `appTitle` | Factorio Server Manager | Sidebar header |
+| `serverStatus` | Server Status | Sidebar section heading |
+| `serverManagement` | Server Management | Sidebar section heading |
+| `fsmAdministration` | FSM Administration | Sidebar section heading |
+| `linkControls` | Controls | Nav link |
+| `linkSaves` | Saves | Nav link |
+| `linkMods` | Mods | Nav link |
+| `linkServerSettings` | Server Settings | Nav link |
+| `linkGameSettings` | Game Settings | Nav link |
+| `linkConsole` | Console | Nav link |
+| `linkLogs` | Logs | Nav link |
+| `linkUsers` | Users | Nav link |
+| `linkHelp` | Help | Nav link |
+
+### 6.3 `controls` (Server Control Panel)
+
+**Scope:** The main dashboard where operators start/stop/kill the Factorio server and see current status.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `serverStatus` | Server Status | Panel title |
+| `startServer` | Start Server | Button text (server stopped) |
+| `saveStopServer` | Save & Stop Server | Button text (server running) |
+| `killServer` | Kill Server | Button text (danger) |
+| `status` | Status | Field label |
+| `ip` | IP | Field label |
+| `port` | Port | Field label |
+| `factorioVersion` | Factorio Version | Field label |
+| `save` | Save | Field label |
+| `ipRequired` | IP is required and must be valid. | Validation error |
+| `portRequired` | Port is required within range 1-65535 | Validation error |
+| `saveRequired` | Save is required and must be valid. | Validation error |
+
+### 6.4 `mods` (Mod Management)
+
+**Scope:** Tab navigation for install/upload/load-from-save, mod list table, mod packs.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `mods` | Mods | Panel title |
+| `modPacks` | Mod packs | Panel title |
+| `installMod` | Install Mod | Tab title |
+| `uploadMod` | Upload Mod | Tab title |
+| `loadModsFromSave` | Load Mods from Save | Tab title |
+| `changingModsDisabled` | Changing mods is disabled while the server is running! | Warning banner |
+| `deleteAllMods` | Delete all Mods | Button text |
+| `updateAllMods` | Update all Mods | Button text |
+| `downloadAllMods` | Download all Mods | Link text |
+| `confirmDeleteMod` | Are you sure you want to delete this mod? | Confirm dialog |
+| `noModsInstalled` | No mods installed | Empty state |
+| `searchMods` | Search mods... | Search placeholder |
+
+### 6.5 `saves` (Save Game Management)
+
+**Scope:** Create/upload/delete save files, save listing table.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `createSave` | Create Save | Panel title |
+| `uploadSave` | Upload Save | Panel title |
+| `saves` | Saves | Panel title |
+| `createSaveDisabled` | Create a new Save is only possible if the Factorio server is not running. | Disabled state message |
+| `confirmDeleteSave` | Are you sure you want to delete this save? | Confirm dialog |
+| `downloadSave` | Download | Download link |
+| `noSavesFound` | No saves found | Empty state |
+
+### 6.6 `serverSettings` (Server Configuration)
+
+**Scope:** The server settings form (all dynamic fields generated from API).
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `serverSettings` | Server Settings | Panel title |
+| `saveSettings` | Save | Submit button text |
+| `settingsSaved` | Settings saved. | Flash success message |
+| `visibility` | Visibility | Visibility field label |
+
+The server settings form is largely data-driven: field labels and comments come from the API response. These are NOT translated. Only static UI chrome (panel title, submit button, flash messages) is in the translation file.
+
+### 6.7 `logs` (Log Viewer)
+
+**Scope:** The log tail viewer page.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `logs` | Logs | Panel title |
+| `noLogsAvailable` | No logs available | Empty state |
+
+### 6.8 `console` (RCON Console)
+
+**Scope:** The RCON command console.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `console` | Console | Panel title |
+| `consoleNotAvailable` | The console is not available, because Factorio is not running. | Disabled state message |
+| `inputPlaceholder` | Type a command... | Input placeholder |
+
+### 6.9 `userManagement` (User Administration)
+
+**Scope:** User list, create user, change password.
+
+| Key | EN Value | Usage |
+|---|---|---|
+| `listOfUsers` | List of Users | Panel title |
+| `changePassword` | Change Password | Panel title |
+| `createUser` | Create User | Panel title |
+| `confirmDeleteUser` | Are you sure you want to delete this user? | Confirm dialog |
+| `noUsersFound` | No users found | Empty state |
+
+---
+
+## 7. Build Considerations
+
+### 7.1 Webpack JSON Support
+
+Webpack 5 natively supports JSON imports as part of its default module types. The existing webpack config already includes `.json` in `resolve.extensions`:
+
+```js
+resolve: {
+  extensions: ['.js', '.json', '.jsx']
+}
+```
+
+No additional loaders or plugins are needed for the translation JSON files. Translations are bundled directly into the JS output. This is intentional for a single-page app served as Go embedded assets -- no async network requests for locale files.
+
+### 7.2 Bundle Size Impact
+
+Each namespace JSON file for English is roughly 0.5-1.5 KB (minified). The total for 9 English + 9 Chinese files is approximately 15-25 KB uncompressed, ~5-8 KB gzipped. This is negligible against the existing bundle.
+
+### 7.3 No Code Splitting by Locale
+
+For MVP, all locales are bundled into a single JS chunk. Future optimization (dynamic import per locale) can be added if the number of locales exceeds 5 or the translation data exceeds 100 KB.
+
+### 7.4 Build Verification
+
+After adding `ui/i18n.js` and all locale JSON files, run:
+
+```bash
+npm run build
+```
+
+The build must complete with zero errors. After build, verify that `app/bundle.js` contains translated strings (check by looking for a known zh-CN string in the minified output, or run a grep for `startServer` in the built bundle).
+
+---
+
+## 8. Rollout Strategy
+
+### 8.1 Implementation Order
+
+The work is divided into phases to reduce risk and enable incremental validation:
+
+| Phase | Scope | Files | Approx. Strings |
+|---|---|---|---|
+| **P1: Core infrastructure** | `ui/i18n.js`, `ui/index.js` change, `ui/locales/en/*` (complete), `ui/locales/zh-CN/*` (complete), `App.jsx` changes | 20 files | 200+ key definitions |
+| **P2: Layout + Controls** | Layout sidebar, server status panel, start/stop/kill buttons | `Layout.jsx`, `Controls.jsx` | ~30 |
+| **P3: Mods** | Mod management tabs, mod list, mod packs | `Mods.jsx`, child components | ~30 |
+| **P4: Saves** | Save listing, create/upload forms, delete confirm | `Saves.jsx`, child components | ~20 |
+| **P5: Settings + Console + Logs** | Server settings form chrome, game settings, console, log viewer | `ServerSettings.jsx`, `GameSettings.jsx`, `Console.jsx`, `Logs.jsx` | ~15 |
+| **P6: User Management + Login + Help** | User CRUD, login form, help page | `UserManagement.jsx`, `Login.jsx`, `Help.jsx` | ~25 |
+| **P7: Shared components** | `ConfirmDialog`, `Flash`, form validation errors | `ConfirmDialog.jsx`, shared form error strings | ~10 |
+
+### 8.2 Fallback Behavior
+
+During rollout (partial implementation), untranslated components continue to show hardcoded English strings. The i18n infrastructure is live from P1, but components are migrated one at a time.
+
+**After full rollout**, if a zh-CN user encounters a missing key (e.g., a newly added string that only exists in `en/`), i18next automatically falls back to the English value. No crash, no empty string, no flicker.
+
+### 8.3 Rollback
+
+Reverting is straightforward:
+
+1. In `ui/index.js`, remove the `import './i18n'` line and remove the `<Suspense>` wrapper.
+2. Delete `ui/i18n.js` and `ui/locales/`.
+3. Revert `t()` calls back to hardcoded strings across all components.
+
+---
+
+## 9. Testing and Verification Criteria
+
+### 9.1 Manual Verification
+
+After implementation on the `feat/fsm-i18n` branch:
+
+| Test | Steps | Expected Result |
+|---|---|---|
+| English default | Clear localStorage, load app with `navigator.language = 'en-US'` | All UI in English |
+| Chinese auto-detect | Clear localStorage, load app with `navigator.language = 'zh-CN'` | All UI in Simplified Chinese |
+| Language switch | Use the dropdown to switch between English and Chinese | UI language changes immediately, no page reload |
+| Persistence | Switch to Chinese, reload the page | UI loads in Chinese |
+| Partial key fallback | Temporarily remove a key from `zh-CN/controls.json`, load with Chinese | The removed key shows its English value |
+| All pages render | Navigate to every route (Controls, Saves, Mods, etc.) in both languages | Each page renders without errors, all strings localized |
+
+### 9.2 Build Verification
+
+```bash
+npm run build
+# Must exit 0 with no warnings related to i18n
+```
+
+### 9.3 Unit Testing (if applicable)
+
+No unit tests currently exist for this project (`"test": "echo no test specified"`). Creating tests for the i18n system is out of scope for this effort. Verification is manual.
+
+### 9.4 Edge Cases
+
+- **Browser with `navigator.language = 'zh-TW'`**: correctly maps to `zh-CN` (no separate Traditional Chinese locale for MVP).
+- **Browser with no `localStorage` (private mode)**: falls back to `navigator.language` on every page load.
+- **Language code with region subtag mismatch** (e.g., `zh-Hans-CN`): the language detector strips to `zh`, which matches the `zh-CN` resource bundle prefix.
+
+---
+
+## 10. Out of Scope
+
+The following are explicitly excluded from this specification and should not be implemented during the i18n effort:
+
+- **Backend translation.** Go server responses, error structs, and log output remain in English.
+- **Game content translation.** Factorio mod names, in-game item names, or save file metadata.
+- **Traditional Chinese (zh-TW).** Only Simplified Chinese is targeted. zh-TW can be added as a future locale.
+- **RTL languages.** Arabic, Hebrew, Persian, etc. No layout mirroring consideration.
+- **Pluralization.** `i18next` supports plural forms, but this app has no strings requiring `count`-based variants.
+- **CI integration.** No POEditor, Crowdin, Lokalise, or Weblate configuration.
+- **Translation memory / workflow.** No tooling for managing translation change diffs between releases.
+- **Dynamic locale loading.** All locales are bundled into the Webpack output, not fetched at runtime.
+- **Accessibility attributes.** `aria-label` translations are not covered; the existing app has minimal aria usage.
+- **Unit tests for i18n.** The project currently has no test framework; adding one is a separate effort.
+
+---
+
+## Appendix A: Full `en/common.json` Reference (Template)
+
+```json
+{
+  "save": "Save",
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "delete": "Delete",
+  "loading": "Loading...",
+  "errorOccurred": "An error occurred.",
+  "loginFailed": "Login failed. Username or Password wrong.",
+  "name": "Name",
+  "actions": "Actions",
+  "username": "Username",
+  "password": "Password",
+  "email": "Email",
+  "role": "Role",
+  "required": "This field is required",
+  "signIn": "Sign In",
+  "logout": "Logout",
+  "saveSettings": "Settings saved.",
+  "saveLastModified": "Last Modified",
+  "size": "Size",
+  "lastModifiedAt": "Last Modified At"
+}
+```
+
+## Appendix B: Complete File Change Inventory
+
+| File | Change |
+|---|---|
+| `ui/i18n.js` | **NEW** - i18next initialization, all locale imports |
+| `ui/index.js` | Import `./i18n`, wrap `<App>` with `<Suspense>` |
+| `ui/locales/en/common.json` | **NEW** - English common strings |
+| `ui/locales/en/layout.json` | **NEW** - English layout strings |
+| `ui/locales/en/controls.json` | **NEW** - English controls strings |
+| `ui/locales/en/mods.json` | **NEW** - English mods strings |
+| `ui/locales/en/saves.json` | **NEW** - English saves strings |
+| `ui/locales/en/serverSettings.json` | **NEW** - English server settings strings |
+| `ui/locales/en/logs.json` | **NEW** - English logs strings |
+| `ui/locales/en/console.json` | **NEW** - English console strings |
+| `ui/locales/en/userManagement.json` | **NEW** - English user management strings |
+| `ui/locales/zh-CN/common.json` | **NEW** - Chinese common strings |
+| `ui/locales/zh-CN/layout.json` | **NEW** - Chinese layout strings |
+| `ui/locales/zh-CN/controls.json` | **NEW** - Chinese controls strings |
+| `ui/locales/zh-CN/mods.json` | **NEW** - Chinese mods strings |
+| `ui/locales/zh-CN/saves.json` | **NEW** - Chinese saves strings |
+| `ui/locales/zh-CN/serverSettings.json` | **NEW** - Chinese server settings strings |
+| `ui/locales/zh-CN/logs.json` | **NEW** - Chinese logs strings |
+| `ui/locales/zh-CN/console.json` | **NEW** - Chinese console strings |
+| `ui/locales/zh-CN/userManagement.json` | **NEW** - Chinese user management strings |
+| `ui/App/App.jsx` | (No change needed if i18n init is in `index.js`) |
+| `ui/App/components/Layout.jsx` | Add language switcher dropdown, translate sidebar strings |
+| `ui/App/views/Controls.jsx` | Wrap all hardcoded strings with `t()` |
+| `ui/App/views/Mods/Mods.jsx` | Wrap all hardcoded strings with `t()` |
+| `ui/App/views/Saves/Saves.jsx` | Wrap all hardcoded strings with `t()` |
+| `ui/App/views/ServerSettings.jsx` | Translate panel title, button, flash message |
+| `ui/App/views/GameSettings.jsx` | Translate panel title |
+| `ui/App/views/Console.jsx` | Translate panel title, disabled message, placeholder |
+| `ui/App/views/Logs.jsx` | Translate panel title |
+| `ui/App/views/UserManagement/UserManagment.jsx` | Translate panel titles, table headers |
+| `ui/App/views/Login.jsx` | Translate form labels, placeholders, button, flash |
+| `ui/App/views/Help.jsx` | Translate panel title, section headings |
+| `ui/App/components/ConfirmDialog.jsx` | Translate Cancel/Confirm buttons |
+| `ui/App/components/Flash.jsx` | (May need adjustment if flash messages carry translated strings) |
+
+---
+
+*End of spec.*

From d9c93b261d7122dcc171b2ec043f8c0ee4d0e8f7 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 03:20:54 +0000
Subject: [PATCH 003/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20FSM=20=E5=89=8D=E7=AB=AF=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2026-06-21-fsm-i18n-implementation.md     | 307 ++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 docs/superpowers/plans/2026-06-21-fsm-i18n-implementation.md

diff --git a/docs/superpowers/plans/2026-06-21-fsm-i18n-implementation.md b/docs/superpowers/plans/2026-06-21-fsm-i18n-implementation.md
new file mode 100644
index 00000000..57dc8597
--- /dev/null
+++ b/docs/superpowers/plans/2026-06-21-fsm-i18n-implementation.md
@@ -0,0 +1,307 @@
+# Implementation Plan: FSM Frontend i18n with zh-CN Support
+
+**Date:** 2026-06-21
+**Spec:** `docs/superpowers/specs/2026-06-21-fsm-i18n-design.md`
+**Branch:** `feat/fsm-i18n`
+**Stack:** React 18, webpack 5, ~95 unique UI strings across 22 component/view files
+
+---
+
+## Task Dependency Graph
+
+| Task | Depends On | Reason |
+|------|------------|--------|
+| T1: Core infrastructure | None | i18n init must exist before any component uses `t()` |
+| T2: Install npm deps | T1 | deps needed before i18n.js can import |
+| T3: Create locale JSON (en) | None | can parallel with T1, T2 |
+| T4: Create locale JSON (zh-CN) | T3 | zh-CN mirrors en structure exactly |
+| T5: ConfirmDialog i18n | T1 | shared component used by Mods; must be ready before P3 |
+| T6: Layout sidebar i18n | T1 | includes language switcher + sidebar strings |
+| T7: Controls page i18n | T1 | standalone view |
+| T8: Mods page i18n | T1, T5 | uses ConfirmDialog; has 7 sub-components |
+| T9: Saves page i18n | T1, T5 | uses ConfirmDialog; has 2 sub-components |
+| T10: Settings + Console + Logs i18n | T1 | 4 simple view files + Flash |
+| T11: User Mgmt + Login + Help i18n | T1, T6 | Login uses Flash |
+| T12: Build verification | All | final integration test |
+| T13: Commit | T12 | atomic commit of all changes |
+
+---
+
+## Parallel Execution Waves
+
+**Wave 1** (Start immediately):
+- [ ] T1: Core infrastructure (i18n.js + index.js wrapping)
+- [ ] T3: Create en/ locale JSON files (9 files)
+
+**Wave 2** (After T1 + T3):
+- [ ] T2: Install npm deps
+- [ ] T4: Create zh-CN/ locale JSON files (9 files, mirroring en/)
+- [ ] T5: ConfirmDialog i18n
+- [ ] T6: Layout sidebar i18n + language switcher
+
+**Wave 3** (After T5):
+- [ ] T7: Controls page i18n
+- [ ] T8: Mods page i18n (7 sub-components)
+- [ ] T9: Saves page i18n (2 sub-components)
+- [ ] T10: Settings + Console + Logs i18n (4 files)
+
+**Wave 4** (After T6):
+- [ ] T11: User Management + Login + Help i18n (5 files)
+
+**Wave 5** (After all tasks):
+- [ ] T12: Build verification (`npm run build`)
+- [ ] T13: Commit
+
+**Critical Path:** T1 → T5 → T8 → T12 → T13
+
+---
+
+## Tasks
+
+### T1: Core Infrastructure — `ui/i18n.js` + `ui/index.js` wrapping
+
+**Status:** pending
+
+**Files to create/modify:**
+- `ui/i18n.js` — **NEW** — i18next initialization with all 9 namespaces, language detector, localStorage cache
+- `ui/index.js` — **MODIFY** — add `import './i18n'` + wrap `<App>` with `<Suspense>`
+
+**Verification:**
+- i18n.js exports configured i18n instance
+- All 9 namespaces registered for both `en` and `zh-CN`
+- index.js renders with Suspense wrapper
+- `npm run build` succeeds
+
+---
+
+### T2: Install npm Dependencies
+
+**Status:** pending
+
+**Command:**
+```bash
+npm install i18next react-i18next i18next-browser-languagedetector
+```
+
+**Verification:**
+- Three packages appear in `package.json` `dependencies`
+- `npm run build` succeeds after install
+- No webpack config changes needed
+
+---
+
+### T3: Create English Locale JSON Files (9 files)
+
+**Status:** pending
+
+**Directory:** `ui/locales/en/` (NEW)
+
+**Files:**
+
+1. `common.json` — save, cancel, confirm, delete, loading, errorOccurred, loginFailed, name, actions, username, password, email, role, required, signIn, logout, saveSettings, saveLastModified, size, lastModifiedAt, settingsSaved
+2. `layout.json` — appTitle, serverStatus, serverManagement, fsmAdministration, linkControls, linkSaves, linkMods, linkServerSettings, linkGameSettings, linkConsole, linkLogs, linkUsers, linkHelp
+3. `controls.json` — serverStatus, startServer, saveStopServer, killServer, status, ip, port, factorioVersion, save, ipRequired, portRequired, saveRequired, RUNNING, STOPPED, UNKNOWN
+4. `mods.json` — mods, modPacks, installMod, uploadMod, loadModsFromSave, changingModsDisabled, deleteAllMods, updateAllMods, downloadAllMods, confirmDeleteMod, noModsInstalled, searchMods, install, modPortal, loadingModList
+5. `saves.json` — createSave, uploadSave, saves, createSaveDisabled, confirmDeleteSave, downloadSave, noSavesFound, name, lastModifiedAt, size, actions
+6. `serverSettings.json` — serverSettings, gameSettings, saveSettings, settingsSaved, visibility
+7. `logs.json` — logs, noLogsAvailable
+8. `console.json` — console, consoleNotAvailable, inputPlaceholder, commandSent
+9. `userManagement.json` — listOfUsers, changePassword, createUser, confirmDeleteUser, noUsersFound, name, role, email, actions
+
+**Verification:**
+- All 9 files parse as valid JSON
+- Flat structure with camelCase keys
+- `npm run build` succeeds
+
+---
+
+### T4: Create zh-CN Locale JSON Files (9 files)
+
+**Status:** pending
+
+**Directory:** `ui/locales/zh-CN/` (NEW)
+
+All 9 files mirror `en/` exactly with Chinese translations. Key examples:
+- `common.json`: `"save": "保存"`, `"cancel": "取消"`, `"confirm": "确认"`, `"delete": "删除"`
+- `controls.json`: `"startServer": "启动服务器"`, `"saveStopServer": "保存并停止服务器"`, `"killServer": "强制停止服务器"`
+- `layout.json`: `"appTitle": "Factorio 服务器管理器"`, `"linkControls": "控制面板"`
+
+**Verification:**
+- Every key from en/ exists in zh-CN/
+- Values are plain strings, no HTML markup
+- `npm run build` succeeds
+
+---
+
+### T5: ConfirmDialog Component i18n
+
+**Status:** pending
+
+**File:** `ui/App/components/ConfirmDialog.jsx` (MODIFY)
+
+**Changes:**
+- Add `useTranslation('common')` hook
+- Replace `<Button>Cancel</Button>` → `<Button>{t('cancel')}</Button>`
+- Replace `<Button>Confirm</Button>` → `<Button>{t('confirm')}</Button>`
+
+**Verification:**
+- Buttons show translated text
+- Existing functionality preserved (isLoading, onSuccess, close)
+- `npm run build` succeeds
+
+---
+
+### T6: Layout Sidebar i18n + Language Switcher
+
+**Status:** pending
+
+**File:** `ui/App/components/Layout.jsx` (MODIFY)
+
+**Changes:**
+- Add `useTranslation(['layout', 'common', 'controls'])` hook
+- Replace all sidebar link texts with `t()` calls
+- Replace status indicator values (Running/Stopped/Unknown) with `t()` calls
+- Add language switcher `<select>` in FSM Administration section:
+  ```jsx
+  <select value={i18n.language} onChange={(e) => i18n.changeLanguage(e.target.value)}>
+    <option value="en">English</option>
+    <option value="zh-CN">简体中文</option>
+  </select>
+  ```
+
+**Verification:**
+- All sidebar strings render correctly
+- Language switcher toggles between en/zh-CN immediately
+- Language preference persists in localStorage
+- `npm run build` succeeds
+
+---
+
+### T7: Controls Page i18n
+
+**Status:** pending
+
+**File:** `ui/App/views/Controls.jsx` (MODIFY)
+
+**Changes:**
+- Add `useTranslation('controls')` hook
+- Replace panel title, field labels, button texts, error messages with `t()` calls
+- Keep dynamic values (bindip, port, savefile) unchanged
+
+**Verification:**
+- All hardcoded English strings replaced
+- Dynamic values preserved
+- `npm run build` succeeds
+
+---
+
+### T8: Mods Page i18n (7 files)
+
+**Status:** pending
+
+**Files (all MODIFY):**
+1. `ui/App/views/Mods/Mods.jsx` — panel titles, buttons, warning banner
+2. `ui/App/views/Mods/components/UploadMod.jsx` — form labels, buttons
+3. `ui/App/views/Mods/components/LoadMods.jsx` — form elements, ConfirmDialog, flash
+4. `ui/App/views/Mods/components/ModPack.jsx` — ConfirmDialog usage
+5. `ui/App/views/Mods/components/CreateModPack.jsx` — button, Modal title, form labels
+6. `ui/App/views/Mods/components/AddMod/components/AddModForm.jsx` — form labels, buttons
+7. `ui/App/views/Mods/components/AddMod/components/FactorioLogin.jsx` — form labels, button, flash
+8. `ui/App/views/Mods/components/AddMod/components/SelectVersionForm.jsx` — Modal title, table headers
+
+**Verification:**
+- All mods pages render with translated strings
+- Tab navigation works
+- ConfirmDialog shows translated buttons
+- `npm run build` succeeds
+
+---
+
+### T9: Saves Page i18n (3 files)
+
+**Status:** pending
+
+**Files (all MODIFY):**
+1. `ui/App/views/Saves/Saves.jsx` — panel titles, table headers, disabled state
+2. `ui/App/views/Saves/components/CreateSaveForm.jsx` — form labels, button, error
+3. `ui/App/views/Saves/components/UploadSaveForm.jsx` — form label, placeholder, error, button
+
+**Verification:**
+- All save pages render with translated strings
+- Delete confirmation shows proper strings
+- `npm run build` succeeds
+
+---
+
+### T10: Settings + Console + Logs i18n (4 files)
+
+**Status:** pending
+
+**Files (all MODIFY):**
+1. `ui/App/views/ServerSettings.jsx` — panel title, save button, flash message
+2. `ui/App/views/GameSettings.jsx` — panel title
+3. `ui/App/views/Console.jsx` — panel title, disabled message, input placeholder
+4. `ui/App/views/Logs.jsx` — panel title
+
+**Verification:**
+- All 4 pages render with translated strings
+- Flash message uses translated string
+- `npm run build` succeeds
+
+---
+
+### T11: User Management + Login + Help i18n (5 files)
+
+**Status:** pending
+
+**Files (all MODIFY):**
+1. `ui/App/views/UserManagement/UserManagment.jsx` — panel titles, table headers
+2. `ui/App/views/UserManagement/components/CreateUserForm.jsx` — labels, placeholders, errors, buttons
+3. `ui/App/views/UserManagement/components/ChangePasswordForm.jsx` — labels, placeholders, errors, buttons, flash
+4. `ui/App/views/Login.jsx` — panel title, form labels, placeholders, errors, buttons, flash
+5. `ui/App/views/Help.jsx` — panel title, section headings, body text
+
+**Verification:**
+- All pages render with translated strings
+- Flash messages use translated text
+- Form validation errors show translated text
+- `npm run build` succeeds
+
+---
+
+### T12: Build Verification
+
+**Status:** pending
+
+**Command:**
+```bash
+npm run build
+```
+
+**Checks:**
+- Build exits with code 0
+- No i18n-related warnings
+- Output files exist in `app/` directory
+
+---
+
+### T13: Atomic Commit
+
+**Status:** pending
+
+**Commit message:** `功能: 添加 FSM 前端国际化支持(zh-CN)`
+
+**Files staged:** ~30 files (new i18n config + 18 JSON locale files + ~12 modified components + package.json + package-lock.json)
+
+---
+
+## Success Criteria
+
+1. `npm run build` exits 0 with no i18n-related warnings
+2. All files modified/created as specified
+3. English locale loads by default
+4. Chinese locale auto-detects when `navigator.language = 'zh-CN'`
+5. Language switcher toggles between en/zh-CN immediately
+6. Language preference persists across page reload
+7. Missing zh-CN keys fall back to English gracefully
+8. All pages render without console errors in both languages

From 6e452f0edbb2ab6129061ad70e70aa370fde0673 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 03:22:30 +0000
Subject: [PATCH 004/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20i18n=20=E6=A0=B8=E5=BF=83=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=AE=BE=E6=96=BD=20+=20=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=889=20=E5=91=BD=E5=90=8D=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/i18n.js                        | 69 +++++++++++++++++++++++++++++++
 ui/index.js                       |  9 +++-
 ui/locales/en/common.json         | 42 +++++++++++++++++++
 ui/locales/en/console.json        |  8 ++++
 ui/locales/en/controls.json       | 20 +++++++++
 ui/locales/en/layout.json         | 21 ++++++++++
 ui/locales/en/logs.json           |  8 ++++
 ui/locales/en/mods.json           | 32 ++++++++++++++
 ui/locales/en/saves.json          | 13 ++++++
 ui/locales/en/serverSettings.json | 30 ++++++++++++++
 ui/locales/en/userManagement.json | 20 +++++++++
 11 files changed, 270 insertions(+), 2 deletions(-)
 create mode 100644 ui/i18n.js
 create mode 100644 ui/locales/en/common.json
 create mode 100644 ui/locales/en/console.json
 create mode 100644 ui/locales/en/controls.json
 create mode 100644 ui/locales/en/layout.json
 create mode 100644 ui/locales/en/logs.json
 create mode 100644 ui/locales/en/mods.json
 create mode 100644 ui/locales/en/saves.json
 create mode 100644 ui/locales/en/serverSettings.json
 create mode 100644 ui/locales/en/userManagement.json

diff --git a/ui/i18n.js b/ui/i18n.js
new file mode 100644
index 00000000..d730fa9e
--- /dev/null
+++ b/ui/i18n.js
@@ -0,0 +1,69 @@
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+
+// English locale files (fallback language)
+import enCommon from './locales/en/common.json';
+import enLayout from './locales/en/layout.json';
+import enControls from './locales/en/controls.json';
+import enMods from './locales/en/mods.json';
+import enSaves from './locales/en/saves.json';
+import enServerSettings from './locales/en/serverSettings.json';
+import enLogs from './locales/en/logs.json';
+import enConsole from './locales/en/console.json';
+import enUserManagement from './locales/en/userManagement.json';
+
+// Chinese locale files
+import zhCommon from './locales/zh-CN/common.json';
+import zhLayout from './locales/zh-CN/layout.json';
+import zhControls from './locales/zh-CN/controls.json';
+import zhMods from './locales/zh-CN/mods.json';
+import zhSaves from './locales/zh-CN/saves.json';
+import zhServerSettings from './locales/zh-CN/serverSettings.json';
+import zhLogs from './locales/zh-CN/logs.json';
+import zhConsole from './locales/zh-CN/console.json';
+import zhUserManagement from './locales/zh-CN/userManagement.json';
+
+const resources = {
+  en: {
+    common: enCommon,
+    layout: enLayout,
+    controls: enControls,
+    mods: enMods,
+    saves: enSaves,
+    serverSettings: enServerSettings,
+    logs: enLogs,
+    console: enConsole,
+    userManagement: enUserManagement,
+  },
+  'zh-CN': {
+    common: zhCommon,
+    layout: zhLayout,
+    controls: zhControls,
+    mods: zhMods,
+    saves: zhSaves,
+    serverSettings: zhServerSettings,
+    logs: zhLogs,
+    console: zhConsole,
+    userManagement: zhUserManagement,
+  },
+};
+
+i18n
+  .use(LanguageDetector)
+  .use(initReactI18next)
+  .init({
+    resources,
+    fallbackLng: 'en',
+    defaultNS: 'common',
+    detection: {
+      order: ['localStorage', 'navigator'],
+      lookupLocalStorage: 'fsm_lang',
+      caches: ['localStorage'],
+    },
+    interpolation: {
+      escapeValue: false,
+    },
+  });
+
+export default i18n;
diff --git a/ui/index.js b/ui/index.js
index 60afb9cd..27bed460 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -1,10 +1,15 @@
 import regeneratorRuntime from "regenerator-runtime"
+import './i18n';
 import Bus from "./notifications"
-import React from 'react';
+import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App/App.jsx';
 
 window.flash = (message, color="gray-light") => Bus.emit('flash', ({message, color}));
 
 const root = ReactDOM.createRoot(document.getElementById('app'));
-root.render(<App/>);
+root.render(
+  <Suspense fallback={<div>Loading...</div>}>
+    <App/>
+  </Suspense>
+);
diff --git a/ui/locales/en/common.json b/ui/locales/en/common.json
new file mode 100644
index 00000000..46e48a01
--- /dev/null
+++ b/ui/locales/en/common.json
@@ -0,0 +1,42 @@
+{
+  "save": "Save",
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "delete": "Delete",
+  "loading": "Loading...",
+  "errorOccurred": "An error occurred",
+  "loginFailed": "Login failed. Please check your credentials.",
+  "name": "Name",
+  "actions": "Actions",
+  "username": "Username",
+  "password": "Password",
+  "email": "Email",
+  "role": "Role",
+  "required": "Required",
+  "signIn": "Sign In",
+  "logout": "Logout",
+  "saveSettings": "Save Settings",
+  "saveLastModified": "Last Modified",
+  "size": "Size",
+  "lastModifiedAt": "Last Modified At",
+  "settingsSaved": "Settings saved.",
+  "download": "Download",
+  "upload": "Upload",
+  "search": "Search",
+  "close": "Close",
+  "back": "Back",
+  "ok": "OK",
+  "yes": "Yes",
+  "no": "No",
+  "enabled": "Enabled",
+  "disabled": "Disabled",
+  "unknown": "Unknown",
+  "none": "None",
+  "edit": "Edit",
+  "create": "Create",
+  "remove": "Remove",
+  "add": "Add",
+  "update": "Update",
+  "refresh": "Refresh",
+  "status": "Status"
+}
diff --git a/ui/locales/en/console.json b/ui/locales/en/console.json
new file mode 100644
index 00000000..c0a119ac
--- /dev/null
+++ b/ui/locales/en/console.json
@@ -0,0 +1,8 @@
+{
+  "console": "Console",
+  "consoleNotAvailable": "Console is not available when the server is not running.",
+  "inputPlaceholder": "Enter command...",
+  "commandSent": "Command sent.",
+  "rconNotAvailable": "RCON is not available.",
+  "send": "Send"
+}
diff --git a/ui/locales/en/controls.json b/ui/locales/en/controls.json
new file mode 100644
index 00000000..39cd8602
--- /dev/null
+++ b/ui/locales/en/controls.json
@@ -0,0 +1,20 @@
+{
+  "serverStatus": "Server Status",
+  "startServer": "Start Server",
+  "saveStopServer": "Save & Stop Server",
+  "killServer": "Kill Server",
+  "status": "Status",
+  "ip": "IP",
+  "port": "Port",
+  "factorioVersion": "Factorio Version",
+  "save": "Save",
+  "ipRequired": "IP is required and must be valid.",
+  "portRequired": "Port is required within range 1-65535",
+  "saveRequired": "Save is required and must be valid.",
+  "RUNNING": "Running",
+  "STOPPED": "Stopped",
+  "UNKNOWN": "Unknown",
+  "saveBeforeStop": "Save before stopping?",
+  "confirmStop": "Are you sure you want to stop the server?",
+  "confirmKill": "Are you sure you want to kill the server? This may cause data loss."
+}
diff --git a/ui/locales/en/layout.json b/ui/locales/en/layout.json
new file mode 100644
index 00000000..3b744066
--- /dev/null
+++ b/ui/locales/en/layout.json
@@ -0,0 +1,21 @@
+{
+  "appTitle": "Factorio Server Manager",
+  "serverStatus": "Server Status",
+  "serverManagement": "Server Management",
+  "fsmAdministration": "FSM Administration",
+  "linkControls": "Controls",
+  "linkSaves": "Saves",
+  "linkMods": "Mods",
+  "linkServerSettings": "Server Settings",
+  "linkGameSettings": "Game Settings",
+  "linkConsole": "Console",
+  "linkLogs": "Logs",
+  "linkUsers": "Users",
+  "linkHelp": "Help",
+  "languageLabel": "Language",
+  "helpTitle": "Help",
+  "helpBugsAndHelp": "Bugs and Help",
+  "helpDescription": "For bug reports, feature requests, or help with Factorio Server Manager, please visit the following resources:",
+  "helpResources": "Resources",
+  "helpWiki": "Wiki"
+}
diff --git a/ui/locales/en/logs.json b/ui/locales/en/logs.json
new file mode 100644
index 00000000..3b699aeb
--- /dev/null
+++ b/ui/locales/en/logs.json
@@ -0,0 +1,8 @@
+{
+  "logs": "Logs",
+  "noLogsAvailable": "No logs available.",
+  "factorioLog": "Factorio Log",
+  "factorioCurrentLog": "Factorio Current Log",
+  "factorioPreviousLog": "Factorio Previous Log",
+  "fsmLog": "FSM Log"
+}
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
new file mode 100644
index 00000000..6c8e3904
--- /dev/null
+++ b/ui/locales/en/mods.json
@@ -0,0 +1,32 @@
+{
+  "mods": "Mods",
+  "modPacks": "Mod Packs",
+  "installMod": "Install Mod",
+  "uploadMod": "Upload Mod",
+  "loadModsFromSave": "Load Mods from Save",
+  "changingModsDisabled": "Changing mods is disabled while the server is running. Please stop the server before making changes.",
+  "deleteAllMods": "Delete all Mods",
+  "updateAllMods": "Update all Mods",
+  "downloadAllMods": "Download all Mods",
+  "confirmDeleteMod": "Are you sure you want to delete this mod?",
+  "noModsInstalled": "No mods installed.",
+  "searchMods": "Search mods...",
+  "install": "Install",
+  "modPortal": "Mod Portal",
+  "loadingModList": "Loading mod list...",
+  "uploadModTitle": "Upload Mod",
+  "selectModFile": "Select a mod file",
+  "createModPack": "Create Mod Pack",
+  "modPackName": "Mod Pack Name",
+  "modsInThisPack": "Mods in this pack",
+  "factorioLogin": "Factorio.com Login",
+  "token": "Token",
+  "login": "Login",
+  "selectVersion": "Select Version",
+  "version": "Version",
+  "loadMods": "Load Mods",
+  "loadModsTitle": "Load Mods from Save",
+  "selectSave": "Select a save file",
+  "modsLoaded": "Mods loaded from save.",
+  "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed."
+}
diff --git a/ui/locales/en/saves.json b/ui/locales/en/saves.json
new file mode 100644
index 00000000..b3f52b7c
--- /dev/null
+++ b/ui/locales/en/saves.json
@@ -0,0 +1,13 @@
+{
+  "createSave": "Create Save",
+  "uploadSave": "Upload Save",
+  "saves": "Saves",
+  "createSaveDisabled": "Creating saves is disabled while the server is running.",
+  "confirmDeleteSave": "Are you sure you want to delete this save?",
+  "downloadSave": "Download",
+  "noSavesFound": "No saves found.",
+  "savefileName": "Save File Name",
+  "saveFile": "Save File",
+  "selectFile": "Select File ...",
+  "saveNameRequired": "Save name is required."
+}
diff --git a/ui/locales/en/serverSettings.json b/ui/locales/en/serverSettings.json
new file mode 100644
index 00000000..1e85bf1b
--- /dev/null
+++ b/ui/locales/en/serverSettings.json
@@ -0,0 +1,30 @@
+{
+  "serverSettings": "Server Settings",
+  "gameSettings": "Game Settings",
+  "saveSettings": "Save Settings",
+  "settingsSaved": "Settings saved.",
+  "visibility": "Visibility",
+  "public": "Public",
+  "lan": "LAN",
+  "hidden": "Hidden",
+  "requireUserVerification": "Require User Verification",
+  "maxPlayers": "Max Players",
+  "gamePassword": "Game Password",
+  "description": "Description",
+  "tags": "Tags",
+  "autoPause": "Auto Pause",
+  "onlyAdminsCanPause": "Only admins can pause",
+  "autosaveInterval": "Autosave Interval (minutes)",
+  "autosaveSlots": "Autosave Slots",
+  "afkAutokickInterval": "AFK Auto-kick Interval (minutes)",
+  "allowCommands": "Allow Commands",
+  "resourcePatchSize": "Resource Patch Size",
+  "resourceFrequency": "Resource Frequency",
+  "resourceRichness": "Resource Richness",
+  "enemyBaseSize": "Enemy Base Size",
+  "enemyBaseFrequency": "Enemy Base Frequency",
+  "startingAreaSize": "Starting Area Size",
+  "peacefulMode": "Peaceful Mode",
+  "researchQueue": "Research Queue",
+  "technologyPriceMultiplier": "Technology Price Multiplier"
+}
diff --git a/ui/locales/en/userManagement.json b/ui/locales/en/userManagement.json
new file mode 100644
index 00000000..8b9b6e83
--- /dev/null
+++ b/ui/locales/en/userManagement.json
@@ -0,0 +1,20 @@
+{
+  "listOfUsers": "List of Users",
+  "changePassword": "Change Password",
+  "createUser": "Create User",
+  "confirmDeleteUser": "Are you sure you want to delete this user?",
+  "noUsersFound": "No users found.",
+  "passwordConfirmation": "Password Confirmation",
+  "oldPassword": "Old Password",
+  "newPassword": "New Password",
+  "newPasswordConfirmation": "New Password Confirmation",
+  "passwordRequired": "Password is required.",
+  "passwordMismatch": "Passwords do not match.",
+  "passwordChanged": "Password changed.",
+  "usernameRequired": "Username is required.",
+  "roleRequired": "Role is required.",
+  "emailRequired": "Email is required.",
+  "userCreated": "User created.",
+  "userDeleted": "User deleted.",
+  "change": "Change"
+}

From af63fe9efc0244b30a24ff2837bf831842d0d722 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 03:30:20 +0000
Subject: [PATCH 005/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20i18n=20=E4=BE=9D=E8=B5=96=20+=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6=EF=BC=88?=
 =?UTF-8?q?9=20=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                    | 172 ++++++++++++++++++++++-----
 package.json                         |   3 +
 ui/locales/zh-CN/common.json         |  42 +++++++
 ui/locales/zh-CN/console.json        |   8 ++
 ui/locales/zh-CN/controls.json       |  20 ++++
 ui/locales/zh-CN/layout.json         |  21 ++++
 ui/locales/zh-CN/logs.json           |   8 ++
 ui/locales/zh-CN/mods.json           |  32 +++++
 ui/locales/zh-CN/saves.json          |  13 ++
 ui/locales/zh-CN/serverSettings.json |  30 +++++
 ui/locales/zh-CN/userManagement.json |  20 ++++
 11 files changed, 341 insertions(+), 28 deletions(-)
 create mode 100644 ui/locales/zh-CN/common.json
 create mode 100644 ui/locales/zh-CN/console.json
 create mode 100644 ui/locales/zh-CN/controls.json
 create mode 100644 ui/locales/zh-CN/layout.json
 create mode 100644 ui/locales/zh-CN/logs.json
 create mode 100644 ui/locales/zh-CN/mods.json
 create mode 100644 ui/locales/zh-CN/saves.json
 create mode 100644 ui/locales/zh-CN/serverSettings.json
 create mode 100644 ui/locales/zh-CN/userManagement.json

diff --git a/package-lock.json b/package-lock.json
index eae1b4f2..9e09ea4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,10 @@
         "@fortawesome/react-fontawesome": "^0.2.0",
         "axios": "^1.6.0",
         "fuse.js": "^7.0.0",
+        "i18next": "^26.3.1",
+        "i18next-browser-languagedetector": "^8.2.1",
         "react-hook-form": "^7.47.0",
+        "react-i18next": "^17.0.8",
         "regenerator-runtime": "^0.14.0",
         "semver": "^7.3.7",
         "tailwindcss": "^3.3.5"
@@ -1831,23 +1834,14 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz",
-      "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-      "dev": true
-    },
     "node_modules/@babel/template": {
       "version": "7.22.15",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
@@ -3923,6 +3917,52 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "license": "MIT",
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
+    "node_modules/i18next": {
+      "version": "26.3.1",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz",
+      "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://www.locize.com/i18next"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.locize.com"
+        }
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": "^5 || ^6"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/i18next-browser-languagedetector": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.1.tgz",
+      "integrity": "sha512-bZg8+4bdmaOiApD7N7BPT9W8MLZG+nPTOFlLiJiT8uzKXFjhxw4v2ierCXOwB5sFDMtuA5G4kgYZ0AznZxQ/cw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2"
+      }
+    },
     "node_modules/icss-utils": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
@@ -5410,6 +5450,33 @@
         "react": "^16.8.0 || ^17 || ^18"
       }
     },
+    "node_modules/react-i18next": {
+      "version": "17.0.8",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.8.tgz",
+      "integrity": "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.29.2",
+        "html-parse-stringify": "^3.0.1",
+        "use-sync-external-store": "^1.6.0"
+      },
+      "peerDependencies": {
+        "i18next": ">= 26.2.0",
+        "react": ">= 16.8.0",
+        "typescript": "^5 || ^6"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -6258,11 +6325,29 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -7722,21 +7807,9 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz",
-      "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.11",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-          "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-          "dev": true
-        }
-      }
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw=="
     },
     "@babel/template": {
       "version": "7.22.15",
@@ -9245,6 +9318,28 @@
         "function-bind": "^1.1.2"
       }
     },
+    "html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "requires": {
+        "void-elements": "3.1.0"
+      }
+    },
+    "i18next": {
+      "version": "26.3.1",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz",
+      "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==",
+      "requires": {}
+    },
+    "i18next-browser-languagedetector": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.1.tgz",
+      "integrity": "sha512-bZg8+4bdmaOiApD7N7BPT9W8MLZG+nPTOFlLiJiT8uzKXFjhxw4v2ierCXOwB5sFDMtuA5G4kgYZ0AznZxQ/cw==",
+      "requires": {
+        "@babel/runtime": "^7.23.2"
+      }
+    },
     "icss-utils": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
@@ -10228,6 +10323,16 @@
       "integrity": "sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==",
       "requires": {}
     },
+    "react-i18next": {
+      "version": "17.0.8",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.8.tgz",
+      "integrity": "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==",
+      "requires": {
+        "@babel/runtime": "^7.29.2",
+        "html-parse-stringify": "^3.0.1",
+        "use-sync-external-store": "^1.6.0"
+      }
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -10807,11 +10912,22 @@
         "punycode": "^2.1.0"
       }
     },
+    "use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "requires": {}
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
+    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/package.json b/package.json
index c0abfe46..a47ad41e 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,10 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "axios": "^1.6.0",
     "fuse.js": "^7.0.0",
+    "i18next": "^26.3.1",
+    "i18next-browser-languagedetector": "^8.2.1",
     "react-hook-form": "^7.47.0",
+    "react-i18next": "^17.0.8",
     "regenerator-runtime": "^0.14.0",
     "semver": "^7.3.7",
     "tailwindcss": "^3.3.5"
diff --git a/ui/locales/zh-CN/common.json b/ui/locales/zh-CN/common.json
new file mode 100644
index 00000000..b4becf0b
--- /dev/null
+++ b/ui/locales/zh-CN/common.json
@@ -0,0 +1,42 @@
+{
+  "save": "保存",
+  "cancel": "取消",
+  "confirm": "确认",
+  "delete": "删除",
+  "loading": "加载中...",
+  "errorOccurred": "发生错误",
+  "loginFailed": "登录失败，请检查凭据。",
+  "name": "名称",
+  "actions": "操作",
+  "username": "用户名",
+  "password": "密码",
+  "email": "邮箱",
+  "role": "角色",
+  "required": "必填",
+  "signIn": "登录",
+  "logout": "退出登录",
+  "saveSettings": "保存设置",
+  "saveLastModified": "最后修改",
+  "size": "大小",
+  "lastModifiedAt": "最后修改时间",
+  "settingsSaved": "设置已保存。",
+  "download": "下载",
+  "upload": "上传",
+  "search": "搜索",
+  "close": "关闭",
+  "back": "返回",
+  "ok": "确定",
+  "yes": "是",
+  "no": "否",
+  "enabled": "已启用",
+  "disabled": "已禁用",
+  "unknown": "未知",
+  "none": "无",
+  "edit": "编辑",
+  "create": "创建",
+  "remove": "移除",
+  "add": "添加",
+  "update": "更新",
+  "refresh": "刷新",
+  "status": "状态"
+}
diff --git a/ui/locales/zh-CN/console.json b/ui/locales/zh-CN/console.json
new file mode 100644
index 00000000..4a43e043
--- /dev/null
+++ b/ui/locales/zh-CN/console.json
@@ -0,0 +1,8 @@
+{
+  "console": "控制台",
+  "consoleNotAvailable": "服务器未运行时控制台不可用。",
+  "inputPlaceholder": "输入指令...",
+  "commandSent": "指令已发送。",
+  "rconNotAvailable": "RCON 不可用。",
+  "send": "发送"
+}
diff --git a/ui/locales/zh-CN/controls.json b/ui/locales/zh-CN/controls.json
new file mode 100644
index 00000000..d1420efe
--- /dev/null
+++ b/ui/locales/zh-CN/controls.json
@@ -0,0 +1,20 @@
+{
+  "serverStatus": "服务器状态",
+  "startServer": "启动服务器",
+  "saveStopServer": "保存并停止服务器",
+  "killServer": "强制停止服务器",
+  "status": "状态",
+  "ip": "IP 地址",
+  "port": "端口",
+  "factorioVersion": "Factorio 版本",
+  "save": "存档",
+  "ipRequired": "IP 地址为必填项且必须有效。",
+  "portRequired": "端口为必填项，范围 1-65535",
+  "saveRequired": "存档为必填项且必须有效。",
+  "RUNNING": "运行中",
+  "STOPPED": "已停止",
+  "UNKNOWN": "未知",
+  "saveBeforeStop": "停止前保存游戏？",
+  "confirmStop": "确认停止服务器？",
+  "confirmKill": "确认强制停止服务器？这可能导致数据丢失。"
+}
diff --git a/ui/locales/zh-CN/layout.json b/ui/locales/zh-CN/layout.json
new file mode 100644
index 00000000..84353f39
--- /dev/null
+++ b/ui/locales/zh-CN/layout.json
@@ -0,0 +1,21 @@
+{
+  "appTitle": "Factorio 服务器管理器",
+  "serverStatus": "服务器状态",
+  "serverManagement": "服务器管理",
+  "fsmAdministration": "FSM 管理",
+  "linkControls": "控制面板",
+  "linkSaves": "存档",
+  "linkMods": "模组",
+  "linkServerSettings": "服务器设置",
+  "linkGameSettings": "游戏设置",
+  "linkConsole": "控制台",
+  "linkLogs": "日志",
+  "linkUsers": "用户",
+  "linkHelp": "帮助",
+  "languageLabel": "语言",
+  "helpTitle": "帮助",
+  "helpBugsAndHelp": "Bug 与帮助",
+  "helpDescription": "报告 Bug、请求新功能或获取 Factorio 服务器管理器的帮助，请访问以下资源：",
+  "helpResources": "资源",
+  "helpWiki": "Wiki"
+}
diff --git a/ui/locales/zh-CN/logs.json b/ui/locales/zh-CN/logs.json
new file mode 100644
index 00000000..9570d675
--- /dev/null
+++ b/ui/locales/zh-CN/logs.json
@@ -0,0 +1,8 @@
+{
+  "logs": "日志",
+  "noLogsAvailable": "暂无日志。",
+  "factorioLog": "Factorio 日志",
+  "factorioCurrentLog": "Factorio 当前日志",
+  "factorioPreviousLog": "Factorio 历史日志",
+  "fsmLog": "FSM 日志"
+}
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
new file mode 100644
index 00000000..833e7cd3
--- /dev/null
+++ b/ui/locales/zh-CN/mods.json
@@ -0,0 +1,32 @@
+{
+  "mods": "模组",
+  "modPacks": "模组合集",
+  "installMod": "安装模组",
+  "uploadMod": "上传模组",
+  "loadModsFromSave": "从存档加载模组",
+  "changingModsDisabled": "服务器运行中无法更改模组。请先停止服务器。",
+  "deleteAllMods": "删除所有模组",
+  "updateAllMods": "更新所有模组",
+  "downloadAllMods": "下载所有模组",
+  "confirmDeleteMod": "确认删除此模组？",
+  "noModsInstalled": "未安装任何模组。",
+  "searchMods": "搜索模组...",
+  "install": "安装",
+  "modPortal": "模组门户",
+  "loadingModList": "正在加载模组列表...",
+  "uploadModTitle": "上传模组",
+  "selectModFile": "选择一个模组文件",
+  "createModPack": "创建模组合集",
+  "modPackName": "模组合集名称",
+  "modsInThisPack": "此合集中的模组",
+  "factorioLogin": "Factorio.com 登录",
+  "token": "令牌",
+  "login": "登录",
+  "selectVersion": "选择版本",
+  "version": "版本",
+  "loadMods": "加载模组",
+  "loadModsTitle": "从存档加载模组",
+  "selectSave": "选择一个存档文件",
+  "modsLoaded": "已从存档加载模组。",
+  "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。"
+}
diff --git a/ui/locales/zh-CN/saves.json b/ui/locales/zh-CN/saves.json
new file mode 100644
index 00000000..ea9af1b6
--- /dev/null
+++ b/ui/locales/zh-CN/saves.json
@@ -0,0 +1,13 @@
+{
+  "createSave": "创建存档",
+  "uploadSave": "上传存档",
+  "saves": "存档",
+  "createSaveDisabled": "服务器运行中无法创建存档。",
+  "confirmDeleteSave": "确认删除此存档？",
+  "downloadSave": "下载",
+  "noSavesFound": "未找到存档。",
+  "savefileName": "存档文件名",
+  "saveFile": "存档文件",
+  "selectFile": "选择文件 ...",
+  "saveNameRequired": "存档名称为必填项。"
+}
diff --git a/ui/locales/zh-CN/serverSettings.json b/ui/locales/zh-CN/serverSettings.json
new file mode 100644
index 00000000..d49ca1f9
--- /dev/null
+++ b/ui/locales/zh-CN/serverSettings.json
@@ -0,0 +1,30 @@
+{
+  "serverSettings": "服务器设置",
+  "gameSettings": "游戏设置",
+  "saveSettings": "保存设置",
+  "settingsSaved": "设置已保存。",
+  "visibility": "可见性",
+  "public": "公开",
+  "lan": "局域网",
+  "hidden": "隐藏",
+  "requireUserVerification": "需要用户验证",
+  "maxPlayers": "最大玩家数",
+  "gamePassword": "游戏密码",
+  "description": "描述",
+  "tags": "标签",
+  "autoPause": "自动暂停",
+  "onlyAdminsCanPause": "仅管理员可暂停",
+  "autosaveInterval": "自动保存间隔（分钟）",
+  "autosaveSlots": "自动保存槽位",
+  "afkAutokickInterval": "AFK 自动踢出间隔（分钟）",
+  "allowCommands": "允许指令",
+  "resourcePatchSize": "资源矿脉大小",
+  "resourceFrequency": "资源频率",
+  "resourceRichness": "资源富饶度",
+  "enemyBaseSize": "虫巢大小",
+  "enemyBaseFrequency": "虫巢频率",
+  "startingAreaSize": "起始区域大小",
+  "peacefulMode": "和平模式",
+  "researchQueue": "研究队列",
+  "technologyPriceMultiplier": "科技价格倍率"
+}
diff --git a/ui/locales/zh-CN/userManagement.json b/ui/locales/zh-CN/userManagement.json
new file mode 100644
index 00000000..23a8b199
--- /dev/null
+++ b/ui/locales/zh-CN/userManagement.json
@@ -0,0 +1,20 @@
+{
+  "listOfUsers": "用户列表",
+  "changePassword": "修改密码",
+  "createUser": "创建用户",
+  "confirmDeleteUser": "确认删除此用户？",
+  "noUsersFound": "未找到用户。",
+  "passwordConfirmation": "确认密码",
+  "oldPassword": "旧密码",
+  "newPassword": "新密码",
+  "newPasswordConfirmation": "确认新密码",
+  "passwordRequired": "密码为必填项。",
+  "passwordMismatch": "两次输入的密码不一致。",
+  "passwordChanged": "密码已修改。",
+  "usernameRequired": "用户名为必填项。",
+  "roleRequired": "角色为必填项。",
+  "emailRequired": "邮箱为必填项。",
+  "userCreated": "用户已创建。",
+  "userDeleted": "用户已删除。",
+  "change": "修改"
+}

From a2b7376fa0fb5c0902f46940698a21ea12d5b492 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 04:25:39 +0000
Subject: [PATCH 006/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20ConfirmDialog=20+?=
 =?UTF-8?q?=20Layout=20=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=88=E5=90=AB?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2=E5=99=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/ConfirmDialog.jsx |  6 ++--
 ui/App/components/Layout.jsx        | 48 +++++++++++++++++++----------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/ui/App/components/ConfirmDialog.jsx b/ui/App/components/ConfirmDialog.jsx
index 7f96c9bc..3e902068 100644
--- a/ui/App/components/ConfirmDialog.jsx
+++ b/ui/App/components/ConfirmDialog.jsx
@@ -1,9 +1,11 @@
 import React, {useState} from 'react';
+import { useTranslation } from 'react-i18next';
 import Modal from "./Modal";
 import Button from "./Button";
 
 function ConfirmDialog({title, content, isOpen, close, onSuccess}) {
 
+    const { t } = useTranslation('common');
     const [isLoading, setIsLoading] = useState(false);
 
     const confirm = () => {
@@ -21,8 +23,8 @@ function ConfirmDialog({title, content, isOpen, close, onSuccess}) {
             content={content}
             actions={
                 <>
-                    <Button size="sm" type="danger" className="mr-2" onClick={close}>Cancel</Button>
-                    <Button size="sm" isLoading={isLoading} type="success" onClick={confirm}>Confirm</Button>
+                    <Button size="sm" type="danger" className="mr-2" onClick={close}>{t('cancel')}</Button>
+                    <Button size="sm" isLoading={isLoading} type="success" onClick={confirm}>{t('confirm')}</Button>
                 </>
             }
             isOpen={isOpen}
diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 2f47a676..87ccd14f 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -1,4 +1,6 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
+import i18n from '../../i18n';
 import {NavLink, Outlet} from "react-router-dom";
 import Button from "./Button";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
@@ -7,18 +9,19 @@ import {Flash} from "./Flash";
 
 const Layout = ({handleLogout, serverStatus}) => {
 
+    const { t } = useTranslation(['layout', 'common', 'controls']);
     const [isNavCollapsed, setIsNavCollapsed] = useState(true);
 
     const Status = ({info}) => {
 
-        let text = 'Unknown';
+        let text = t('UNKNOWN', { ns: 'controls' });
         let color = 'gray-light';
 
         if (info && info.running) {
-            text = 'Running';
+            text = t('RUNNING', { ns: 'controls' });
             color = 'green';
         } else if (info && !info.running) {
-            text = 'Stopped';
+            text = t('STOPPED', { ns: 'controls' });
             color = 'red';
         }
 
@@ -48,7 +51,7 @@ const Layout = ({handleLogout, serverStatus}) => {
             <div className="w-full md:w-88 md:fixed md:top-0 md:left-0 bg-gray-dark md:h-screen overflow-y-auto">
                 <div className="py-4 px-2 accentuated">
                     <div className="mx-4 justify-between flex text-center">
-                        <span className="text-dirty-white text-xl">Factorio Server Manager</span>
+                        <span className="text-dirty-white text-xl">{t('appTitle', { ns: 'layout' })}</span>
                         <button
                             className="md:hidden cursor-pointer text-white hover:text-dirty-white"
                             onClick={() => setIsNavCollapsed(!isNavCollapsed)}
@@ -59,33 +62,44 @@ const Layout = ({handleLogout, serverStatus}) => {
                 </div>
                 <div className={isNavCollapsed ? "hidden md:block" : "block"}>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">Server Status</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t('serverStatus', { ns: 'layout' })}</h1>
                         <div className="mx-4 mb-4 text-center">
                             <Status info={serverStatus}/>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">Server Management</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t('serverManagement', { ns: 'layout' })}</h1>
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Link to="/">Controls</Link>
-                            <Link to="/saves">Saves</Link>
-                            <Link to="/mods">Mods</Link>
-                            <Link to="/server-settings">Server Settings</Link>
-                            <Link to="/game-settings">Game Settings</Link>
-                            <Link to="/console">Console</Link>
-                            <Link to="/logs" last={true}>Logs</Link>
+                            <Link to="/">{t('linkControls', { ns: 'layout' })}</Link>
+                            <Link to="/saves">{t('linkSaves', { ns: 'layout' })}</Link>
+                            <Link to="/mods">{t('linkMods', { ns: 'layout' })}</Link>
+                            <Link to="/server-settings">{t('linkServerSettings', { ns: 'layout' })}</Link>
+                            <Link to="/game-settings">{t('linkGameSettings', { ns: 'layout' })}</Link>
+                            <Link to="/console">{t('linkConsole', { ns: 'layout' })}</Link>
+                            <Link to="/logs" last={true}>{t('linkLogs', { ns: 'layout' })}</Link>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">FSM Administration</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t('fsmAdministration', { ns: 'layout' })}</h1>
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Link to="/user-management">Users</Link>
-                            <Link to="/help" last={true}>Help</Link>
+                            <Link to="/user-management">{t('linkUsers', { ns: 'layout' })}</Link>
+                            <Link to="/help" last={true}>{t('linkHelp', { ns: 'layout' })}</Link>
+                        </div>
+                        <div className="mt-4 mx-4">
+                            <label className="text-dirty-white text-sm block mb-1">{t('languageLabel', { ns: 'layout' })}</label>
+                            <select
+                                className="w-full bg-gray-dark text-white border border-gray-light rounded px-2 py-1 text-sm"
+                                value={i18n.language}
+                                onChange={(e) => { i18n.changeLanguage(e.target.value); }}
+                            >
+                                <option value="en">English</option>
+                                <option value="zh-CN">简体中文</option>
+                            </select>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Button type="danger" className="w-full" onClick={handleLogout}>Logout</Button>
+                            <Button type="danger" className="w-full" onClick={handleLogout}>{t('logout', { ns: 'common' })}</Button>
                         </div>
                     </div>
                     <div className="accentuated-t accentuated-x md:block hidden"/>

From b0ee691a90e586f27c517eea4310ed658cbd85f0 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 04:29:30 +0000
Subject: [PATCH 007/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20FSM=20=E5=89=8D=E7=AB=AF=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=88zh-CN=20=E4=B8=AD=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/build-release.sh                       |  0
 docker/build.sh                               |  0
 docker/entrypoint.sh                          |  0
 ui/App/views/Console.jsx                      |  7 +++-
 ui/App/views/Controls.jsx                     | 42 ++++++++++---------
 ui/App/views/GameSettings.jsx                 |  5 ++-
 ui/App/views/Help.jsx                         | 10 +++--
 ui/App/views/Login.jsx                        | 18 ++++----
 ui/App/views/Logs.jsx                         |  5 ++-
 ui/App/views/Mods/Mods.jsx                    | 25 ++++++-----
 .../AddMod/components/AddModForm.jsx          | 14 ++++---
 .../AddMod/components/SelectVersionForm.jsx   | 13 +++---
 .../views/Mods/components/CreateModPack.jsx   | 13 +++---
 ui/App/views/Mods/components/LoadMods.jsx     | 13 +++---
 ui/App/views/Mods/components/ModList.jsx      | 14 ++++---
 ui/App/views/Mods/components/ModPack.jsx      |  7 +++-
 ui/App/views/Mods/components/UploadMod.jsx    |  8 ++--
 ui/App/views/Saves/Saves.jsx                  | 20 +++++----
 .../views/Saves/components/CreateSaveForm.jsx |  8 ++--
 .../views/Saves/components/UploadSaveForm.jsx | 10 +++--
 ui/App/views/ServerSettings.jsx               |  8 ++--
 ui/App/views/UserManagement/UserManagment.jsx | 17 ++++----
 .../components/ChangePasswordForm.jsx         | 24 ++++++-----
 .../components/CreateUserForm.jsx             | 34 ++++++++-------
 ui/locales/en/mods.json                       |  5 ++-
 ui/locales/zh-CN/mods.json                    |  5 ++-
 26 files changed, 191 insertions(+), 134 deletions(-)
 mode change 100755 => 100644 docker/build-release.sh
 mode change 100755 => 100644 docker/build.sh
 mode change 100755 => 100644 docker/entrypoint.sh

diff --git a/docker/build-release.sh b/docker/build-release.sh
old mode 100755
new mode 100644
diff --git a/docker/build.sh b/docker/build.sh
old mode 100755
new mode 100644
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
old mode 100755
new mode 100644
diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index 16d633f4..173fa82b 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -1,9 +1,12 @@
 import Panel from "../components/Panel";
 import React, {useEffect, useRef, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import socket from "../../api/socket";
 
 const Console = ({serverStatus}) => {
 
+    const { t } = useTranslation('console');
+
     const [logs, setLogs] = useState([]);
     const consoleInput = useRef(null);
 
@@ -25,7 +28,7 @@ const Console = ({serverStatus}) => {
 
     return (
         <Panel
-            title="Console"
+            title={t('console')}
             content={
                 serverStatus.running
                     ? <>
@@ -44,7 +47,7 @@ const Console = ({serverStatus}) => {
                         />
                     </>
                     : <p className="text-red-light pt-4">
-                        The console is not available, because Factorio is not running.
+                        {t('consoleNotAvailable')}
                     </p>
             }
         />
diff --git a/ui/App/views/Controls.jsx b/ui/App/views/Controls.jsx
index 62b31d9e..44a46af2 100644
--- a/ui/App/views/Controls.jsx
+++ b/ui/App/views/Controls.jsx
@@ -1,4 +1,5 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import Panel from "../components/Panel";
 import Button from "../components/Button";
 import server from "../../api/resources/server";
@@ -10,7 +11,8 @@ import Error from "../components/Error";
 
 const Controls = ({serverStatus}) => {
 
-    const factorioVersion = serverStatus.fac_version ? serverStatus.fac_version : 'Unknown';
+    const { t } = useTranslation('controls');
+    const factorioVersion = serverStatus.fac_version ? serverStatus.fac_version : t('UNKNOWN');
     const [saves, setSaves] = useState([]);
     const [isDisabled, setIsDisabled] = useState(true);
     const [isStopping, setIsStopping] = useState(false);
@@ -48,48 +50,48 @@ const Controls = ({serverStatus}) => {
     return (
         <form onSubmit={handleSubmit(startServer)}>
         <Panel
-            title="Server Status"
+            title={t('serverStatus')}
             content={
                 <div className="lg:flex">
                     { serverStatus.running
                         ? <>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Status</div>
-                                <div>{serverStatus.running ? 'Running' : 'Stopped'}</div>
+                                <div className="font-bold">{t('status')}</div>
+                                <div>{serverStatus.running ? t('RUNNING') : t('STOPPED')}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">IP</div>
+                                <div className="font-bold">{t('ip')}</div>
                                 <div>{serverStatus.bindip}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Port</div>
+                                <div className="font-bold">{t('port')}</div>
                                 <div>{serverStatus.port}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Factorio Version</div>
+                                <div className="font-bold">{t('factorioVersion')}</div>
                                 <div>{factorioVersion}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Save</div>
+                                <div className="font-bold">{t('save')}</div>
                                 <div>{serverStatus.savefile}</div>
                             </div>
                         </>
                         : <>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Status</div>
-                                <div>{serverStatus.running ? 'Running' : 'Stopped'}</div>
+                                <div className="font-bold">{t('status')}</div>
+                                <div>{serverStatus.running ? t('RUNNING') : t('STOPPED')}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">IP</div>
+                                <div className="font-bold">{t('ip')}</div>
                                 <Input
                                     defaultValue={"0.0.0.0"}
                                     disabled={isDisabled}
                                     register={register('ip',{required: true, pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/})}
                                 />
-                                <Error error={errors.ip} message="IP is required and must be valid."/>
+                                <Error error={errors.ip} message={t('ipRequired')}/>
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">Port</div>
+                                <div className="font-bold">{t('port')}</div>
                                 <Input
                                     type="number"
                                     min={1}
@@ -98,14 +100,14 @@ const Controls = ({serverStatus}) => {
                                     disabled={isDisabled}
                                     register={register('port',{required: true, min: 1, max: 65535})}
                                 />
-                                <Error error={errors.port} message="Port is required within range 1-65535"/>
+                                <Error error={errors.port} message={t('portRequired')}/>
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">Factorio Version</div>
+                                <div className="font-bold">{t('factorioVersion')}</div>
                                 <div>{factorioVersion}</div>
                             </div>
                             <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">Save</div>
+                                <div className="font-bold">{t('save')}</div>
                                 <div className="relative">
                                     <Select
                                         register={register('save',{required: true})}
@@ -116,7 +118,7 @@ const Controls = ({serverStatus}) => {
                                             name: save.name
                                         }))}
                                     />
-                                    <Error error={errors.save} message="Save is required and must be valid."/>
+                                    <Error error={errors.save} message={t('saveRequired')}/>
                                 </div>
                             </div>
                         </>
@@ -127,10 +129,10 @@ const Controls = ({serverStatus}) => {
                 <div className="md:flex">
                     {serverStatus.running
                         ? <>
-                            <Button onClick={stopServer} isLoading={isStopping} isDisabled={isKilling} size="sm" className="w-full md:w-auto mb-2 md:mb-0 md:mr-2" type="default">Save & Stop Server</Button>
-                            <Button onClick={killServer} isLoading={isKilling} isDisabled={isStopping} size="sm" type="danger" className="w-full md:w-auto">Kill Server</Button>
+                            <Button onClick={stopServer} isLoading={isStopping} isDisabled={isKilling} size="sm" className="w-full md:w-auto mb-2 md:mb-0 md:mr-2" type="default">{t('saveStopServer')}</Button>
+                            <Button onClick={killServer} isLoading={isKilling} isDisabled={isStopping} size="sm" type="danger" className="w-full md:w-auto">{t('killServer')}</Button>
                         </>
-                        : <Button isSubmit={true} isDisabled={isDisabled} isLoading={isStarting} size="sm" type="success" className="w-full md:w-auto">Start Server</Button>
+                        : <Button isSubmit={true} isDisabled={isDisabled} isLoading={isStarting} size="sm" type="success" className="w-full md:w-auto">{t('startServer')}</Button>
                     }
                 </div>
             }
diff --git a/ui/App/views/GameSettings.jsx b/ui/App/views/GameSettings.jsx
index 1169c16c..536f17b4 100644
--- a/ui/App/views/GameSettings.jsx
+++ b/ui/App/views/GameSettings.jsx
@@ -1,9 +1,12 @@
 import Panel from "../components/Panel";
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import settingsResource from "../../api/resources/settings";
 
 const GameSettings = () => {
 
+    const { t } = useTranslation('serverSettings');
+
     const [settingsCategories, setSettingsCategories] = useState();
 
     const fetchSettings = async () => {
@@ -18,7 +21,7 @@ const GameSettings = () => {
     return (
         <Panel
             className="mb-4"
-            title="Game Settings"
+            title={t('gameSettings')}
             content={
                 <>
                     {settingsCategories && Object.keys(settingsCategories).map(key => {
diff --git a/ui/App/views/Help.jsx b/ui/App/views/Help.jsx
index 8c36f44b..7fb64027 100644
--- a/ui/App/views/Help.jsx
+++ b/ui/App/views/Help.jsx
@@ -1,19 +1,21 @@
 import Panel from "../components/Panel";
 import React from "react";
+import { useTranslation } from 'react-i18next';
 
 const Help = () => {
+    const { t } = useTranslation('layout');
     return (
         <Panel
-            title="Help"
+            title={t('helpTitle')}
             content={
                 <>
-                    <h1 className="text-xl text-dirty-white">Factorio Server Manager</h1>
+                    <h1 className="text-xl text-dirty-white">{t('appTitle')}</h1>
                     <p className="mb-2">The Factorio Server Manager (FSM) is an open source project and is not affiliated to the game Factorio or Wube Software.</p>
 
-                    <h2 className="text-dirty-white">Bugs and Help</h2>
+                    <h2 className="text-dirty-white">{t('helpBugsAndHelp')}</h2>
                     <p className="mb-4">Please use the <a className="text-blue hover:text-blue-light" target="_blank" href="https://github.com/OpenFactorioServerManager/factorio-server-manager/issues">GitHub repository</a> to report bugs or seek for help.</p>
 
-                    <h1 className="mb-1 text-xl text-dirty-white">Helpful Resources</h1>
+                    <h1 className="mb-1 text-xl text-dirty-white">{t('helpResources')}</h1>
                     <p className="mb-2"><a className="text-blue hover:text-blue-light" target="_blank" href="https://wiki.factorio.com/Multiplayer">Official Factorio Wiki about Multiplayer</a></p>
                 </>
             }
diff --git a/ui/App/views/Login.jsx b/ui/App/views/Login.jsx
index d3450b9a..b9f3dfa5 100644
--- a/ui/App/views/Login.jsx
+++ b/ui/App/views/Login.jsx
@@ -1,4 +1,5 @@
 import React, {useEffect} from 'react';
+import { useTranslation } from 'react-i18next';
 import {useForm} from "react-hook-form";
 import user from "../../api/resources/user";
 import Button from "../components/Button";
@@ -10,6 +11,7 @@ import {Flash} from "../components/Flash";
 import Error from "../components/Error";
 
 const Login = ({handleLogin}) => {
+    const { t } = useTranslation('common');
     const {register, handleSubmit, formState: { errors }} = useForm();
     const navigate = useNavigate();
     const location = useLocation();
@@ -23,7 +25,7 @@ const Login = ({handleLogin}) => {
             }
         } catch (e) {
             console.log(e);
-            window.flash("Login failed. Username or Password wrong.", "red");
+            window.flash(t('loginFailed'), "red");
             throw e;
         }
     };
@@ -42,25 +44,25 @@ const Login = ({handleLogin}) => {
     return (
         <div className="h-screen overflow-hidden flex items-center justify-center bg-black">
             <Panel
-                title="Login"
+                title={t('signIn')}
                 content={
                     <form onSubmit={handleSubmit(onSubmit)}>
                         <div className="mb-4">
-                            <Label text="Username" htmlFor="username"/>
-                            <Input register={register('username', {required: true})} placeholder="Username"/>
-                            <Error error={errors.username} message="Username is required"/>
+                            <Label text={t('username')} htmlFor="username"/>
+                            <Input register={register('username', {required: true})} placeholder={t('username')}/>
+                            <Error error={errors.username} message={t('usernameRequired', { ns: 'userManagement' })}/>
                         </div>
                         <div className="mb-6">
-                            <Label text="Password" htmlFor="password"/>
+                            <Label text={t('password')} htmlFor="password"/>
                             <Input
                                 register={register('password',{required: true})}
                                 type="password"
                                 placeholder="******************"
                             />
-                            <Error error={errors.password} message="Password is required"/>
+                            <Error error={errors.password} message={t('passwordRequired', { ns: 'userManagement' })}/>
                         </div>
                         <div className="text-center">
-                            <Button type="success" className="w-full" isSubmit={true}>Sign In</Button>
+                            <Button type="success" className="w-full" isSubmit={true}>{t('signIn')}</Button>
                         </div>
                     </form>
                 }
diff --git a/ui/App/views/Logs.jsx b/ui/App/views/Logs.jsx
index e416402a..5ecd0022 100644
--- a/ui/App/views/Logs.jsx
+++ b/ui/App/views/Logs.jsx
@@ -1,9 +1,12 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import log from "../../api/resources/log";
 import Panel from "../components/Panel";
 
 const Logs = () => {
 
+    const { t } = useTranslation('logs');
+
     const [logs, setLogs] = useState([])
 
     useEffect(() => {
@@ -15,7 +18,7 @@ const Logs = () => {
 
     return (
         <Panel
-            title="Logs"
+            title={t('logs')}
             content={
                 <ul>
                     {logs.map((log,index) => (<li key={index}>{log}</li>))}
diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 6376ae0a..23158e6e 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -1,5 +1,6 @@
 import Panel from "../../components/Panel";
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import modsResource from "../../../api/resources/mods";
 import Button from "../../components/Button";
 import server from "../../../api/resources/server";
@@ -15,6 +16,8 @@ import ModList from "./components/ModList";
 
 const Mods = ({serverStatus}) => {
 
+    const { t } = useTranslation('mods');
+
     const [installedMods, setInstalledMods] = useState([]);
     const [modPacks, setModPacks] = useState([])
     const [factorioVersion, setFactorioVersion] = useState(null);
@@ -110,26 +113,26 @@ const Mods = ({serverStatus}) => {
             {disabled ?
                 <Panel className="mb-6"
                        content={
-                           <div className="text-red font-bold text-xl">
-                               Changing mods is disabled while the server is running!
-                           </div>
+                            <div className="text-red font-bold text-xl">
+                                {t('changingModsDisabled')}
+                            </div>
                        }
                 />
                 :
                 <TabControl>
-                    <Tab title="Install Mod">
+                    <Tab title={t('installMod')}>
                         <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse}/>
                     </Tab>
-                    <Tab title="Upload Mod">
+                    <Tab title={t('uploadMod')}>
                         <UploadMod refetchInstalledMods={fetchInstalledMods}/>
                     </Tab>
-                    <Tab title="Load Mods from Save">
+                    <Tab title={t('loadModsFromSave')}>
                         <LoadMods refreshMods={fetchInstalledMods}/>
                     </Tab>
                 </TabControl>
             }
             <Panel
-                title="Mods"
+                title={t('mods')}
                 className="mb-6"
                 content={
                     <ModList addUpdatableMod={addUpdatableMod}
@@ -146,18 +149,18 @@ const Mods = ({serverStatus}) => {
                         {
                             !disabled &&
                             <Button size="sm" className="mr-2" type="danger" isLoading={isDeletingAllMods}
-                                    onClick={deleteAllMods}>Delete all Mods</Button> &&
+                                    onClick={deleteAllMods}>{t('deleteAllMods')}</Button> &&
                             <Button size="sm" className="mr-2" isLoading={isUpdatingAllMods}
-                                    onClick={updateAllMods}>Update all Mods</Button>
+                                    onClick={updateAllMods}>{t('updateAllMods')}</Button>
                         }
                         <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
-                           href={modsResource.downloadAllURL}>Download all Mods</a>
+                           href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
                     </>
                 }
             />
 
             <Panel
-                title="Mod packs"
+                title={t('modPacks')}
                 className="mb-6"
                 content={
                     modPacks.map(
diff --git a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
index c5a75f2d..3b93a35e 100644
--- a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
@@ -1,4 +1,5 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import modsResource from "../../../../../../api/resources/mods";
 import Button from "../../../../../components/Button";
 import Label from "../../../../../components/Label";
@@ -10,12 +11,13 @@ import {faSpinner} from "@fortawesome/free-solid-svg-icons";
 import SelectVersionForm from "./SelectVersionForm";
 
 const LinkModPortal = () => {
-    return <a href="https://mods.factorio.com" target="_blank" className="px-2 text-blue hover:text-blue-light">Mod
-        Portal <FontAwesomeIcon icon={faExternalLinkAlt}/></a>
+    const { t } = useTranslation('mods');
+    return <a href="https://mods.factorio.com" target="_blank" className="px-2 text-blue hover:text-blue-light">{t('modPortal')} <FontAwesomeIcon icon={faExternalLinkAlt}/></a>
 }
 
 const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) => {
 
+    const { t } = useTranslation('mods');
     const {register, watch, setValue, handleSubmit} = useForm();
     const [suggestedMods, setSuggestedMods] = useState([]);
     const [selectedMod, setSelectedMod] = useState(null);
@@ -101,11 +103,11 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) =>
         <form onSubmit={handleSubmit(openSelectVersionModal)}>
             <SelectVersionForm isOpen={isModalOpen} releases={releases} install={install} close={() => setIsModalOpen(false)}/>
             <div className="mb-4 relative" >
-                <Label text="Mod" htmlFor="mod"/>
+                <Label text={t('mods')} htmlFor="mod"/>
                 { typeof fuse !== "undefined"
                     ? <Input register={register('mod',{required: true})} hasAutoComplete={false} onKeyDown={handleKeyDown}/>
                     : <div className="border border-gray-medium w-full py-2 px-3 text-white">
-                        <FontAwesomeIcon icon={faSpinner} spin={true}/> Loading List of Mods from <LinkModPortal/>
+                        <FontAwesomeIcon icon={faSpinner} spin={true}/> {t('loadingModList')} <LinkModPortal/>
                     </div>
                 }
                 {suggestedMods.length > 0 &&
@@ -114,8 +116,8 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) =>
                     </ul>
                 }
             </div>
-            <Button isDisabled={selectedMod === null} isSubmit={true} onClick={() => setIsModalOpen(true)} className="mr-2">Install</Button>
-            <Button onClick={logout} type="danger" className="mr-2">Logout</Button>
+            <Button isDisabled={selectedMod === null} isSubmit={true} onClick={() => setIsModalOpen(true)} className="mr-2">{t('install')}</Button>
+            <Button onClick={logout} type="danger" className="mr-2">{t('logout', { ns: 'common' })}</Button>
             <LinkModPortal/>
         </form>
     )
diff --git a/ui/App/views/Mods/components/AddMod/components/SelectVersionForm.jsx b/ui/App/views/Mods/components/AddMod/components/SelectVersionForm.jsx
index dd2815f9..2569b7a1 100644
--- a/ui/App/views/Mods/components/AddMod/components/SelectVersionForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/SelectVersionForm.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from 'react-i18next';
 import Modal from "../../../../../components/Modal";
 import Button from "../../../../../components/Button";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
@@ -8,6 +9,8 @@ import {faTimes} from "@fortawesome/free-solid-svg-icons/faTimes";
 
 const SelectVersionForm = ({releases, isOpen, close, install}) => {
 
+    const { t } = useTranslation(['mods', 'common']);
+
     const download = release => {
         install(release)
         close()
@@ -16,15 +19,15 @@ const SelectVersionForm = ({releases, isOpen, close, install}) => {
     return (
         <Modal
             isOpen={isOpen}
-            title="Select Version"
+            title={t('selectVersion', { ns: 'mods' })}
             content={
                 <div className="h-64 overflow-y-auto">
                     <table className="w-full">
                         <thead>
                         <tr className="text-left py-1">
-                            <th>Version</th>
-                            <th>Compatibility</th>
-                            <th>Actions</th>
+                            <th>{t('version', { ns: 'mods' })}</th>
+                            <th>{t('compatibility', { ns: 'mods' })}</th>
+                            <th>{t('actions', { ns: 'common' })}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -45,7 +48,7 @@ const SelectVersionForm = ({releases, isOpen, close, install}) => {
                 </div>
             }
             actions={
-                <Button onClick={close} size="sm" type="danger">Cancel</Button>
+                <Button onClick={close} size="sm" type="danger">{t('cancel', { ns: 'common' })}</Button>
             }
         />
     )
diff --git a/ui/App/views/Mods/components/CreateModPack.jsx b/ui/App/views/Mods/components/CreateModPack.jsx
index 94262200..5323ba49 100644
--- a/ui/App/views/Mods/components/CreateModPack.jsx
+++ b/ui/App/views/Mods/components/CreateModPack.jsx
@@ -1,4 +1,5 @@
 import React, {useState} from "react";
+import { useTranslation } from 'react-i18next';
 import Button from "../../../components/Button";
 import Modal from "../../../components/Modal";
 import Label from "../../../components/Label";
@@ -8,6 +9,8 @@ import modsResource from "../../../../api/resources/mods";
 
 const CreateModPack = ({onSuccess}) => {
 
+    const { t } = useTranslation(['mods', 'common']);
+
     const [isCreating, setIsCreating] = useState(false);
     const [isOpen, setIsOpen] = useState(false);
 
@@ -26,18 +29,18 @@ const CreateModPack = ({onSuccess}) => {
     }
 
     return <>
-        <Button size="sm" onClick={() => setIsOpen(true)}>Add ModPack with current installed Mods</Button>
-        <Modal title="Create Mod Pack" isOpen={isOpen} content={
+        <Button size="sm" onClick={() => setIsOpen(true)}>{t('createModPack')}</Button>
+        <Modal title={t('createModPack')} isOpen={isOpen} content={
             <form onSubmit={handleSubmit(createModPack)}>
                 <div className="mb-4">
-                    <Label text="Name" htmlFor="name"/>
+                    <Label text={t('name', { ns: 'common' })} htmlFor="name"/>
                     <Input register={register('name',{required: true})}/>
                 </div>
-                <Button size="sm" isLoading={isCreating} isSubmit={true}>Create</Button>
+                <Button size="sm" isLoading={isCreating} isSubmit={true}>{t('create', { ns: 'common' })}</Button>
             </form>
         }
         actions={
-            <Button onClick={() => setIsOpen(false)} size="sm" type="danger">Cancel</Button>
+            <Button onClick={() => setIsOpen(false)} size="sm" type="danger">{t('cancel', { ns: 'common' })}</Button>
         }
         />
     </>
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 331c3527..06609467 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,4 +1,5 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import savesResource from "../../../../api/resources/saves";
 import Select from "../../../components/Select";
 import Label from "../../../components/Label";
@@ -11,6 +12,8 @@ import ConfirmDialog from "../../../components/ConfirmDialog";
 
 const LoadMods = ({refreshMods}) => {
 
+    const { t } = useTranslation(['mods', 'common']);
+
     const [saves, setSaves] = useState([]);
     const {register, reset, handleSubmit} = useForm();
     const [isLoading, setIsLoading] = useState(false);
@@ -46,7 +49,7 @@ const LoadMods = ({refreshMods}) => {
         await modResource.portal.installMultiple(mods)
             .then(() => {
                 refreshMods();
-                window.flash(`Mods are loaded from save file ${data.save}.`, "green");
+                window.flash(t('modsLoaded').replace('{save}', data.save), "green");
             }).finally(() => {
                 setIsLoading(false);
                 setLoadModsData(undefined);
@@ -55,7 +58,7 @@ const LoadMods = ({refreshMods}) => {
 
     return isFactorioAuthenticated
         ? <form onSubmit={handleSubmit(loadModsRequested)}>
-            <Label text="Save" htmlFor="save"/>
+            <Label text={t('save', { ns: 'common' })} htmlFor="save"/>
             <Select
                 register={register('save')}
                 className="mb-4"
@@ -65,10 +68,10 @@ const LoadMods = ({refreshMods}) => {
                     value: save.name
                 }))}
             />
-            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>Load</Button>
+            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>{t('loadMods')}</Button>
             <ConfirmDialog
-                title="Load Mods from Save"
-                content={`Loading the Mods from Save "${loadModsData?.save}" will remove all currently installed Mods.`}
+                title={t('loadModsTitle')}
+                content={t('deleteExistingMods')}
                 isOpen={loadModsData !== undefined}
                 close={() => {
                     setIsLoading(false);
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 1cb67270..7c9c1881 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -1,18 +1,20 @@
 import Mod from "./Mod";
 import React from "react";
-
+import { useTranslation } from 'react-i18next';
 
 const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
 
+    const { t } = useTranslation('mods');
+
     return (
         <table className="w-full">
             <thead>
             <tr className="text-left py-1">
-                <th>Name</th>
-                <th>Enabled</th>
-                <th>Compatibility</th>
-                <th>Mod Version</th>
-                <th>Factorio Version</th>
+                <th>{t('name', { ns: 'common' })}</th>
+                <th>{t('enabled', { ns: 'common' })}</th>
+                <th>{t('compatibility')}</th>
+                <th>{t('modVersion')}</th>
+                <th>{t('factorioVersion')}</th>
                 <th/>
             </tr>
             </thead>
diff --git a/ui/App/views/Mods/components/ModPack.jsx b/ui/App/views/Mods/components/ModPack.jsx
index 1b8bca0a..254f8268 100644
--- a/ui/App/views/Mods/components/ModPack.jsx
+++ b/ui/App/views/Mods/components/ModPack.jsx
@@ -1,4 +1,5 @@
 import React, {useState} from "react";
+import { useTranslation } from 'react-i18next';
 import {faSpinner, faTrashAlt, faUpload} from "@fortawesome/free-solid-svg-icons";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import modsResource from "../../../../api/resources/mods";
@@ -7,6 +8,8 @@ import ConfirmDialog from "../../../components/ConfirmDialog";
 
 const ModPack = ({modPack, reloadModPacks, factorioVersion, reloadMods, disabled = false}) => {
 
+    const { t } = useTranslation('mods');
+
     const [isLoading, setIsLoading] = useState(false);
     const [isLoadModPackDialogOpen, setIsLoadModPackDialogOpen] = useState(false);
 
@@ -63,8 +66,8 @@ const ModPack = ({modPack, reloadModPacks, factorioVersion, reloadMods, disabled
                                              icon={isLoading ? faSpinner : faUpload}
                             />
                             <ConfirmDialog
-                                title="Load ModPack"
-                                content={`Loading the ModPack ${modPack.name} will remove all installed Mods.`}
+                                title={t('loadModsTitle')}
+                                content={t('deleteExistingMods')}
                                 isOpen={isLoadModPackDialogOpen}
                                 close={() => setIsLoadModPackDialogOpen(false)}
                                 onSuccess={() => loadModPack(modPack.name)}
diff --git a/ui/App/views/Mods/components/UploadMod.jsx b/ui/App/views/Mods/components/UploadMod.jsx
index f1083508..c31661db 100644
--- a/ui/App/views/Mods/components/UploadMod.jsx
+++ b/ui/App/views/Mods/components/UploadMod.jsx
@@ -1,4 +1,5 @@
 import React, {useState} from "react";
+import { useTranslation } from 'react-i18next';
 import Button from "../../../components/Button";
 import Label from "../../../components/Label";
 import {useForm} from "react-hook-form";
@@ -6,7 +7,8 @@ import modsResource from "../../../../api/resources/mods";
 
 const UploadMod = ({refetchInstalledMods}) => {
 
-    const defaultFileName = 'Select File ...'
+    const { t } = useTranslation('mods');
+    const defaultFileName = t('selectModFile')
     const [fileName, setFileName] = useState(defaultFileName);
     const {register, handleSubmit} = useForm();
     const [isUploading, setIsUploading] = useState(false);
@@ -24,7 +26,7 @@ const UploadMod = ({refetchInstalledMods}) => {
 
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
-            <Label text="Save" htmlFor="mod_file"/>
+            <Label text={t('save', { ns: 'common' })} htmlFor="mod_file"/>
             <div className="relative bg-white shadow text-black h-full w-full mb-4">
                 <input
                     {...register('mod_file')}
@@ -36,7 +38,7 @@ const UploadMod = ({refetchInstalledMods}) => {
                 />
                 <div className="px-2 py-2">{fileName}</div>
             </div>
-            <Button isLoading={isUploading} isSubmit={true}>Upload</Button>
+            <Button isLoading={isUploading} isSubmit={true}>{t('upload', { ns: 'common' })}</Button>
         </form>
     )
 }
diff --git a/ui/App/views/Saves/Saves.jsx b/ui/App/views/Saves/Saves.jsx
index fa8adeb1..b5205904 100644
--- a/ui/App/views/Saves/Saves.jsx
+++ b/ui/App/views/Saves/Saves.jsx
@@ -1,4 +1,5 @@
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import savesResource from "../../../api/resources/saves";
 import Panel from "../../components/Panel";
 import CreateSaveForm from "./components/CreateSaveForm";
@@ -8,6 +9,8 @@ import {faDownload, faTrashAlt} from "@fortawesome/free-solid-svg-icons";
 
 const Saves = ({serverStatus}) => {
 
+    const { t } = useTranslation('saves');
+
     const [saves, setSaves] = useState([]);
 
     const updateList = () => {
@@ -35,19 +38,18 @@ const Saves = ({serverStatus}) => {
         <>
             <div className="lg:flex mb-6">
                 <Panel
-                    title="Create Save"
+                    title={t('createSave')}
                     className="lg:w-1/2 lg:mr-3 mb-6 lg:mb-0"
                     content={
                         serverStatus.running
                             ? <p className="text-red-light pt-4 pb-24">
-                                Create a new Save is only possible if the Factorio server is
-                                not running.
+                                {t('createSaveDisabled')}
                             </p>
                             : <CreateSaveForm onSuccess={updateList}/>
                     }
                 />
                 <Panel
-                    title="Upload Save"
+                    title={t('uploadSave')}
                     className="lg:w-1/2 lg:ml-3"
                     content={<UploadSaveForm onSuccess={updateList}/>}
                 />
@@ -55,16 +57,16 @@ const Saves = ({serverStatus}) => {
 
             <Panel
                 className="mb-4"
-                title="Saves"
+                title={t('saves')}
                 content={
                     <div className="overflow-x-auto w-full">
                         <table className="w-full">
                             <thead>
                             <tr className="text-left py-1">
-                                <th>Name</th>
-                                <th>Last Modified At</th>
-                                <th>Size</th>
-                                <th>Actions</th>
+                                <th>{t('name', { ns: 'common' })}</th>
+                                <th>{t('lastModifiedAt', { ns: 'common' })}</th>
+                                <th>{t('size', { ns: 'common' })}</th>
+                                <th>{t('actions', { ns: 'common' })}</th>
                             </tr>
                             </thead>
                             <tbody>
diff --git a/ui/App/views/Saves/components/CreateSaveForm.jsx b/ui/App/views/Saves/components/CreateSaveForm.jsx
index 10b75fb9..e550fdc3 100644
--- a/ui/App/views/Saves/components/CreateSaveForm.jsx
+++ b/ui/App/views/Saves/components/CreateSaveForm.jsx
@@ -1,4 +1,5 @@
 import {useForm} from "react-hook-form";
+import { useTranslation } from 'react-i18next';
 import Button from "../../../components/Button";
 import React, {useState} from "react";
 import saves from "../../../../api/resources/saves";
@@ -7,6 +8,7 @@ import Input from "../../../components/Input";
 import Error from "../../../components/Error";
 
 const CreateSaveForm = ({onSuccess}) => {
+    const { t } = useTranslation('saves');
     const {register, handleSubmit, formState: {errors}} = useForm();
     const [isLoading, setIsLoading] = useState(false);
 
@@ -23,11 +25,11 @@ const CreateSaveForm = ({onSuccess}) => {
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
             <div className="mb-6">
-                <Label text="Savefile Name" htmlFor="savefile"/>
+                <Label text={t('savefileName')} htmlFor="savefile"/>
                 <Input register={register('savefile', {required: true})}/>
-                <Error error={errors.savefile} message="Savefile Name is required"/>
+                <Error error={errors.savefile} message={t('saveNameRequired')}/>
             </div>
-            <Button type="success" isLoading={isLoading} isSubmit={true}>Create Save</Button>
+            <Button type="success" isLoading={isLoading} isSubmit={true}>{t('createSave')}</Button>
         </form>
     )
 }
diff --git a/ui/App/views/Saves/components/UploadSaveForm.jsx b/ui/App/views/Saves/components/UploadSaveForm.jsx
index 1db27160..a2fd8f3e 100644
--- a/ui/App/views/Saves/components/UploadSaveForm.jsx
+++ b/ui/App/views/Saves/components/UploadSaveForm.jsx
@@ -1,13 +1,15 @@
 import Button from "../../../components/Button";
 import React, {useState} from "react";
+import { useTranslation } from 'react-i18next';
 import {useForm} from "react-hook-form";
 import saves from "../../../../api/resources/saves";
 import Error from "../../../components/Error";
 
 
 const UploadSaveForm = ({onSuccess}) => {
+    const { t } = useTranslation('saves');
     const {register, handleSubmit, formState: {errors}} = useForm();
-    const [fileName, setFileName] = useState('Select File ...');
+    const [fileName, setFileName] = useState(t('selectFile'));
 
     const onSubmit = (data, e) => {
         saves.upload(data.savefile[0]).then(_ => {
@@ -20,7 +22,7 @@ const UploadSaveForm = ({onSuccess}) => {
         <form onSubmit={handleSubmit(onSubmit)}>
             <div className="mb-6">
                 <label className="block text-white text-sm font-bold mb-2" htmlFor="password">
-                    Save File
+                    {t('saveFile')}
                 </label>
                 <div className="relative bg-white shadow text-black w-full">
                     <input
@@ -30,9 +32,9 @@ const UploadSaveForm = ({onSuccess}) => {
                         type="file"/>
                     <div className="px-2 py-3">{fileName}</div>
                 </div>
-                <Error error={errors.savefile} message="Savefile is required"/>
+                <Error error={errors.savefile} message={t('saveNameRequired')}/>
             </div>
-            <Button type="success" isSubmit={true}>Upload</Button>
+            <Button type="success" isSubmit={true}>{t('upload', { ns: 'common' })}</Button>
         </form>
     )
 }
diff --git a/ui/App/views/ServerSettings.jsx b/ui/App/views/ServerSettings.jsx
index 754feef8..a4aad960 100644
--- a/ui/App/views/ServerSettings.jsx
+++ b/ui/App/views/ServerSettings.jsx
@@ -1,5 +1,6 @@
 import Panel from "../components/Panel";
 import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import settingsResource from "../../api/resources/settings";
 import Input from "../components/Input";
 import Label from "../components/Label";
@@ -10,6 +11,7 @@ import {useForm} from "react-hook-form";
 
 const ServerSettings = () => {
 
+    const { t } = useTranslation('serverSettings');
     const [settings, setSettings] = useState();
     const [numberInputs, setNumberInputs] = useState([]);
 
@@ -36,7 +38,7 @@ const ServerSettings = () => {
        settingsResource.server.update(data)
            .then(() => {
                fetchSettings()
-                   .then(() => window.flash("Settings saved.", "green"))
+                   .then(() => window.flash(t('settingsSaved'), "green"))
            });
     }
 
@@ -124,7 +126,7 @@ const ServerSettings = () => {
     return (
         <form className="mb-4" onSubmit={handleSubmit(saveServerSettings)}>
             <Panel
-                title="Server Settings"
+                title={t('serverSettings')}
                 content={
                     <>
                         {settings && Object.keys(settings).map(key => {
@@ -150,7 +152,7 @@ const ServerSettings = () => {
                     </>
                 }
                 actions={
-                    <Button isSubmit={true} type="success">Save</Button>
+                    <Button isSubmit={true} type="success">{t('saveSettings')}</Button>
                 }
             />
         </form>
diff --git a/ui/App/views/UserManagement/UserManagment.jsx b/ui/App/views/UserManagement/UserManagment.jsx
index 34829e52..5f132abb 100644
--- a/ui/App/views/UserManagement/UserManagment.jsx
+++ b/ui/App/views/UserManagement/UserManagment.jsx
@@ -1,5 +1,6 @@
 import Panel from "../../components/Panel";
 import React, {useCallback, useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
 import user from "../../../api/resources/user";
 import CreateUserForm from "./components/CreateUserForm";
 import ChangePasswordForm from "./components/ChangePasswordForm"
@@ -8,6 +9,8 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 const UserManagement = () => {
 
+    const { t } = useTranslation('userManagement');
+
     const [users, setUsers] = useState([]);
 
     const updateList = useCallback(async () => {
@@ -29,15 +32,15 @@ const UserManagement = () => {
     return (
         <>
             <Panel
-                title="List of Users"
+                title={t('listOfUsers')}
                 content={
                     <table className="w-full">
                         <thead>
                         <tr className="text-left py-1">
-                            <th>Name</th>
-                            <th>Role</th>
-                            <th>Email</th>
-                            <th>Actions</th>
+                            <th>{t('name', { ns: 'common' })}</th>
+                            <th>{t('role', { ns: 'common' })}</th>
+                            <th>{t('email', { ns: 'common' })}</th>
+                            <th>{t('actions', { ns: 'common' })}</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -57,12 +60,12 @@ const UserManagement = () => {
                 className="mb-4"
             />
             <Panel
-                title="Change Password"
+                title={t('changePassword')}
                 content={<ChangePasswordForm/>}
                 className="mb-4"
             />
             <Panel
-                title="Create User"
+                title={t('createUser')}
                 content={<CreateUserForm updateUserList={updateList}/>}
                 className="mb-4"
             />
diff --git a/ui/App/views/UserManagement/components/ChangePasswordForm.jsx b/ui/App/views/UserManagement/components/ChangePasswordForm.jsx
index ca00c4d5..e7306fe1 100644
--- a/ui/App/views/UserManagement/components/ChangePasswordForm.jsx
+++ b/ui/App/views/UserManagement/components/ChangePasswordForm.jsx
@@ -1,5 +1,6 @@
 import {useForm} from "react-hook-form";
 import React from "react";
+import { useTranslation } from 'react-i18next';
 import user from "../../../../api/resources/user";
 import Button from "../../../components/Button";
 import Label from "../../../components/Label";
@@ -7,6 +8,7 @@ import Input from "../../../components/Input";
 import Error from "../../../components/Error";
 
 const ChangePasswordForm = () => {
+    const { t } = useTranslation('userManagement');
     const {register, handleSubmit, reset, formState: {errors}, watch} = useForm();
 
     const new_password = watch("new_password");
@@ -15,7 +17,7 @@ const ChangePasswordForm = () => {
         const res = await user.changePassword(data);
         if (res) {
             // Update successful
-            window.flash("Password changed", "green")
+            window.flash(t('passwordChanged'), "green")
             reset();
         }
     }
@@ -23,30 +25,30 @@ const ChangePasswordForm = () => {
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
             <div className="mb-4">
-                <Label htmlFor="old_password" text="Old Password"/>
+                <Label htmlFor="old_password" text={t('oldPassword')}/>
                 <Input register={register('old_password',{required: true})}
                        type="password"
-                       placeholder="Old Password"
+                       placeholder={t('oldPassword')}
                 />
-                <Error error={errors.old_password} message="Old Password is required"/>
+                <Error error={errors.old_password} message={t('passwordRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="new_password" text="New Password"/>
+                <Label htmlFor="new_password" text={t('newPassword')}/>
                 <Input register={register('new_password',{required: true})}
                        type="password"
-                       placeholder="New Password"
+                       placeholder={t('newPassword')}
                 />
-                <Error error={errors.new_password} message="New Password is required"/>
+                <Error error={errors.new_password} message={t('passwordRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="new_password_confirmation" text="New Password Confirmation"/>
+                <Label htmlFor="new_password_confirmation" text={t('newPasswordConfirmation')}/>
                 <Input register={register('new_password_confirmation',{required: true, validate: value => value === new_password})}
                        type="password"
-                       placeholder="New Password"
+                       placeholder={t('newPasswordConfirmation')}
                 />
-                <Error error={errors.new_password_confirmation} message="New Password Confirmation is required"/>
+                <Error error={errors.new_password_confirmation} message={t('passwordMismatch')}/>
             </div>
-            <Button isSubmit={true} type="success">Change</Button>
+            <Button isSubmit={true} type="success">{t('change')}</Button>
         </form>
     )
 }
diff --git a/ui/App/views/UserManagement/components/CreateUserForm.jsx b/ui/App/views/UserManagement/components/CreateUserForm.jsx
index ce3fb369..9e9f27d6 100644
--- a/ui/App/views/UserManagement/components/CreateUserForm.jsx
+++ b/ui/App/views/UserManagement/components/CreateUserForm.jsx
@@ -1,5 +1,6 @@
 import {useForm} from "react-hook-form";
 import React from "react";
+import { useTranslation } from 'react-i18next';
 import user from "../../../../api/resources/user";
 import Button from "../../../components/Button";
 import Label from "../../../components/Label";
@@ -7,6 +8,7 @@ import Input from "../../../components/Input";
 import Error from "../../../components/Error";
 
 const CreateUserForm = ({updateUserList}) => {
+    const { t } = useTranslation('userManagement');
     const roleValue = "admin";
 
     const {
@@ -31,52 +33,52 @@ const CreateUserForm = ({updateUserList}) => {
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
             <div className="mb-4">
-                <Label htmlFor="username" text="Username"/>
+                <Label htmlFor="username" text={t('username', { ns: 'common' })}/>
                 <Input register={register('username', {required: true})}
                        type="text"
-                       placeholder="Username"
+                       placeholder={t('username', { ns: 'common' })}
                 />
-                <Error error={errors.username} message="Username is required"/>
+                <Error error={errors.username} message={t('usernameRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="role" text="Role"/>
+                <Label htmlFor="role" text={t('role', { ns: 'common' })}/>
                 <Input register={register('role', {required: true})}
                        value={roleValue}
                        disabled={true}
-                       placeholder="Role"
+                       placeholder={t('role', { ns: 'common' })}
                 />
-                <Error error={errors.role} message="Role is required"/>
+                <Error error={errors.role} message={t('roleRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="email" text="Email"/>
+                <Label htmlFor="email" text={t('email', { ns: 'common' })}/>
                 <Input register={register('email', {required: true})}
                        type="email"
-                       placeholder="Email"
+                       placeholder={t('email', { ns: 'common' })}
                 />
-                <Error error={errors.email} message="Email is required"/>
+                <Error error={errors.email} message={t('emailRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="password" text="Password"/>
+                <Label htmlFor="password" text={t('password', { ns: 'common' })}/>
                 <Input register={register('password', {required: true})}
                        type="password"
-                       placeholder="Password"
+                       placeholder={t('password', { ns: 'common' })}
                 />
-                <Error error={errors.password} message="Password is required"/>
+                <Error error={errors.password} message={t('passwordRequired')}/>
             </div>
             <div className="mb-4">
-                <Label htmlFor="password_confirmation" text="Password Confirmation"/>
+                <Label htmlFor="password_confirmation" text={t('passwordConfirmation')}/>
                 <Input register={register('password_confirmation', {
                             required: true,
                             validate: conformation => conformation === password
                         })}
 
                        type="password"
-                       placeholder="Password Confirmation"
+                       placeholder={t('passwordConfirmation')}
                 />
                 <Error error={errors.password_confirmation}
-                       message="Password Confirmation is required and must match the Password"/>
+                       message={t('passwordMismatch')}/>
             </div>
-            <Button isSubmit={true} type="success">Save</Button>
+            <Button isSubmit={true} type="success">{t('save', { ns: 'common' })}</Button>
         </form>
     )
 }
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
index 6c8e3904..88ac9683 100644
--- a/ui/locales/en/mods.json
+++ b/ui/locales/en/mods.json
@@ -28,5 +28,8 @@
   "loadModsTitle": "Load Mods from Save",
   "selectSave": "Select a save file",
   "modsLoaded": "Mods loaded from save.",
-  "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed."
+  "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed.",
+  "compatibility": "Compatibility",
+  "modVersion": "Mod Version",
+  "factorioVersion": "Factorio Version"
 }
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
index 833e7cd3..30aaef2c 100644
--- a/ui/locales/zh-CN/mods.json
+++ b/ui/locales/zh-CN/mods.json
@@ -28,5 +28,8 @@
   "loadModsTitle": "从存档加载模组",
   "selectSave": "选择一个存档文件",
   "modsLoaded": "已从存档加载模组。",
-  "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。"
+  "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。",
+  "compatibility": "兼容性",
+  "modVersion": "模组版本",
+  "factorioVersion": "Factorio 版本"
 }

From 30f789045c64f893bc0e3291812192d540fc95b6 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 04:30:44 +0000
Subject: [PATCH 008/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D=E6=8C=87?=
 =?UTF-8?q?=E5=8D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/add-language-guide.md | 143 +++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 docs/add-language-guide.md

diff --git a/docs/add-language-guide.md b/docs/add-language-guide.md
new file mode 100644
index 00000000..05a54021
--- /dev/null
+++ b/docs/add-language-guide.md
@@ -0,0 +1,143 @@
+# 添加新语言指南
+
+FSM 前端基于 `react-i18next`，添加新语言只需创建翻译文件并注册即可。
+
+## 快速上手（以日语 ja 为例）
+
+### 第 1 步：创建翻译文件
+
+```bash
+mkdir -p ui/locales/ja
+```
+
+复制英文文件作为模板：
+
+```bash
+cp ui/locales/en/*.json ui/locales/ja/
+```
+
+### 第 2 步：翻译
+
+逐个编辑 `ui/locales/ja/` 下的 9 个 JSON 文件，**只改 value，不改 key**。
+
+| 文件 | 示例 key | 英文 | 日文翻译 |
+|---|---|---|---|
+| `common.json` | `save` | Save | 保存 |
+| `common.json` | `cancel` | Cancel | キャンセル |
+| `common.json` | `confirm` | Confirm | 確認 |
+| `controls.json` | `startServer` | Start Server | サーバー起動 |
+| `controls.json` | `RUNNING` | Running | 実行中 |
+| `layout.json` | `appTitle` | Factorio Server Manager | Factorio サーバーマネージャー |
+
+### 第 3 步：注册语言
+
+编辑 `ui/i18n.js`，在两个地方添加 ja：
+
+**位置 1 — import 翻译文件：**
+
+```js
+// 在 zh-CN imports 后面添加
+import jaCommon from './locales/ja/common.json';
+import jaLayout from './locales/ja/layout.json';
+import jaControls from './locales/ja/controls.json';
+import jaMods from './locales/ja/mods.json';
+import jaSaves from './locales/ja/saves.json';
+import jaServerSettings from './locales/ja/serverSettings.json';
+import jaLogs from './locales/ja/logs.json';
+import jaConsole from './locales/ja/console.json';
+import jaUserManagement from './locales/ja/userManagement.json';
+```
+
+**位置 2 — 添加到 resources 对象：**
+
+```js
+const resources = {
+  en: { /* 已有 */ },
+  'zh-CN': { /* 已有 */ },
+  ja: {
+    common: jaCommon,
+    layout: jaLayout,
+    controls: jaControls,
+    mods: jaMods,
+    saves: jaSaves,
+    serverSettings: jaServerSettings,
+    logs: jaLogs,
+    console: jaConsole,
+    userManagement: jaUserManagement,
+  },
+};
+```
+
+### 第 4 步：添加到语言切换器
+
+编辑 `ui/App/components/Layout.jsx`，在 `<select>` 中添加：
+
+```jsx
+<option value="ja">日本語</option>
+```
+
+### 第 5 步：验证
+
+```bash
+npm run build
+```
+
+构建通过即完成。浏览器语言设为日语时自动显示日文，也可通过侧边栏切换器手动选择。
+
+---
+
+## 翻译文件结构
+
+```
+ui/locales/
+├── en/               ← 英文（fallback，必须保持完整）
+│   ├── common.json   ← 通用词汇（保存/取消/确认/删除...）
+│   ├── layout.json   ← 导航栏/侧边栏/页面标题
+│   ├── controls.json ← 服务器启停控制面板
+│   ├── mods.json     ← Mod 管理全部子页面
+│   ├── saves.json    ← 存档管理全部子页面
+│   ├── serverSettings.json ← 服务器+游戏设置
+│   ├── logs.json     ← 日志页面
+│   ├── console.json  ← RCON 控制台
+│   └── userManagement.json ← 用户管理/登录
+├── zh-CN/            ← 简体中文（已完成）
+└── ja/               ← 日语（按本指南添加）
+```
+
+## 翻译规则
+
+1. **只改 value，不改 key。** key 是代码引用的标识，改了会导致显示空白。
+2. **保持扁平结构。** 所有 key 在 JSON 顶层，不要嵌套。
+3. **不要修改 HTML。** 翻译值里不要放 `<div>`、`<span>` 等标签。
+4. **大写 key 是状态值**（如 `RUNNING`、`STOPPED`、`UNKNOWN`），翻译时用对应的状态词。
+5. **en/ 是权威源。** 如果某个 key 在目标语言中缺失，i18next 会自动回退到英文，不会报错。
+
+## 自动语言检测
+
+`i18next-browser-languagedetector` 按以下优先级检测：
+
+1. `localStorage` 中 `fsm_lang` 的值（用户手动切换后记住）
+2. 浏览器 `navigator.language`
+
+例如浏览器语言是 `ja` → 自动加载日语；无匹配 → 回退英文。
+
+## 常见 BCP 47 语言标签
+
+| 语言 | 标签 | 写入 `i18n.js` |
+|---|---|---|
+| 日语 | `ja` | `ja` |
+| 韩语 | `ko` | `ko` |
+| 繁体中文 | `zh-TW` | `zh-TW` |
+| 德语 | `de` | `de` |
+| 法语 | `fr` | `fr` |
+| 俄语 | `ru` | `ru` |
+| 西班牙语 | `es` | `es` |
+| 葡萄牙语 | `pt` | `pt` |
+| 波兰语 | `pl` | `pl` |
+
+## 注意事项
+
+- **不要删除或修改 `en/` 下的文件。** 英文是 fallback 语言，必须保持完整。
+- **新语言的 JSON 文件名必须与 `en/` 完全一致。**
+- 如果不想翻译所有 key，可以先复制英文再逐条翻译，未翻译的 key 会自动回退英文。
+- Factorio 社区有大量活跃的非英语玩家，欢迎贡献翻译 PR。

From fcf5bc7406c8a2f0d3ad6a2eb37b0ef6efa5e47b Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 06:05:45 +0000
Subject: [PATCH 009/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=99=A8=E8=AE=BE=E8=AE=A1=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...026-06-21-server-version-manager-design.md | 855 ++++++++++++++++++
 1 file changed, 855 insertions(+)
 create mode 100644 docs/superpowers/specs/2026-06-21-server-version-manager-design.md

diff --git a/docs/superpowers/specs/2026-06-21-server-version-manager-design.md b/docs/superpowers/specs/2026-06-21-server-version-manager-design.md
new file mode 100644
index 00000000..75d021ee
--- /dev/null
+++ b/docs/superpowers/specs/2026-06-21-server-version-manager-design.md
@@ -0,0 +1,855 @@
+# FSM Server Version Manager Design Spec
+
+**Date:** 2026-06-21
+**Project:** factorio-server-manager-joey
+**Branch:** feat/server-version-manager
+**Status:** Draft / Approved for Implementation
+
+---
+
+## 1. Overview and Goals
+
+### 1.1 Problem
+
+The Factorio Server Manager (FSM) currently assumes the Factorio headless server binary is pre-installed and has zero version management capability. Operators must manually download, extract, and replace the binary when updating. This adds friction especially when Wube releases new stable builds (every few weeks) and experimental builds (more frequently).
+
+### 1.2 Goals
+
+- Allow operators to view the currently installed Factorio version from the UI.
+- Fetch the list of available versions from the official Factorio API.
+- Download and install a selected version with one click, replacing the existing binary in place.
+- Reuse the existing Mod Portal authentication (token + username) for download authorization.
+- Block installation while the Factorio server is running (fail-safe).
+- Show download progress to give feedback during multi-second downloads.
+- Fully localized in English and Simplified Chinese via the existing i18n framework.
+
+### 1.3 Non-Goals
+
+- Version co-existence / side-by-side installations.
+- Custom download mirrors or proxy support.
+- Automatic update polling or notifications.
+- Docker image version management.
+- Windows support for the download/install flow (the Factorio download URL is linux64; Windows users already manage their own updates).
+
+---
+
+## 2. Architecture
+
+### 2.1 New Package: `factorio/version_manager.go`
+
+A new file `src/factorio/version_manager.go` contains all backend logic. No changes to existing files beyond adding route registrations.
+
+```go
+package factorio
+
+import (
+    "archive/tar"
+    "bytes"
+    "encoding/json"
+    "fmt"
+    "io"
+    "log"
+    "net/http"
+    "os"
+    "path/filepath"
+    "strings"
+
+    "github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
+    "github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
+    "github.com/ulikunitz/xz"
+)
+```
+
+**Note on xz decompression:** Go's standard library does not include an xz decoder. Use `github.com/ulikunitz/xz` (pure Go, no CGo). Add to go.mod:
+
+```
+require github.com/ulikunitz/xz v0.5.12
+```
+
+### 2.2 Download/Install Flow
+
+```
+POST /api/server/version/install {version: "2.0.32"}
+   |
+   +-- 1. Verify server is stopped (ServerOffMiddleware)
+   +-- 2. Load credentials (username + token from factorio.auth)
+   +-- 3. Download: https://factorio.com/get-download/{version}/headless/linux64?username=<u>&token=<t>
+   +-- 4. Stream to temp file: /tmp/factorio-dl-<random>.tar.xz
+   +-- 5. Send progress via websocket room "server_version"
+   +-- 6. Extract tar.xz: the archive contains bin/x64/factorio + data/ + doc-html/ etc.
+   +-- 7. Overwrite in-place: extract into config.FactorioDir (updating bin/x64/factorio, data/, etc.)
+   +-- 8. Clean up temp files
+   +-- 9. Re-read installed version (run factorio --version on new binary)
+   +-- 10. Return {success: true, version: "2.0.32"}
+```
+
+In-place override means the tarball is extracted directly on top of `config.FactorioDir`. This works because:
+
+- The headless tarball contains the same directory layout as a normal installation.
+- The `data/` directory is updated alongside the binary.
+- Saves, mods, and config are outside `config.FactorioDir` (they live in `config.FactorioSavesDir`, `config.FactorioModsDir`, and `config.FactorioConfigDir` respectively).
+
+### 2.3 Version Data Structures
+
+```go
+// VersionManager provides download/install operations
+type VersionManager struct{}
+
+// LatestReleasesResponse matches the factorio.com/api/latest-releases endpoint
+type LatestReleasesResponse struct {
+    Stable       LatestRelease `json:"stable"`
+    Experimental LatestRelease `json:"experimental"`
+}
+
+type LatestRelease struct {
+    Alpha    Version `json:"alpha"`
+    Demo     Version `json:"demo"`
+    Headless Version `json:"headless"`
+}
+
+// AvailableVersion is used for the /available API response
+type AvailableVersion struct {
+    Version      Version `json:"version"`
+    Stable       bool    `json:"stable"`
+    Experimental bool    `json:"experimental"`
+}
+```
+
+### 2.4 Key Functions
+
+| Function | Purpose |
+|---|---|
+| `GetInstalledVersion() (Version, error)` | Runs `factorio --version`, parses output. Reuses existing logic from `NewFactorioServer()`. |
+| `FetchAvailableVersions() ([]AvailableVersion, error)` | Calls `https://factorio.com/api/latest-releases`, builds candidate list. |
+| `DownloadAndInstall(version Version) error` | Full download, extract, replace flow. Sends progress events to websocket room. |
+| `extractTarXz(r io.Reader, dest string) error` | Decompresses xz, extracts tar to dest dir, sets executable bit on binary. |
+
+---
+
+## 3. API Design
+
+All three endpoints are behind `/api/server/version/` and require authentication (via `AuthMiddleware`). The install endpoint requires server-off (via `ServerOffMiddleware`).
+
+### 3.1 GET /api/server/version/current
+
+Returns the currently installed version.
+
+**Response 200:**
+```json
+{
+    "version": "2.0.28",
+    "string": "2.0.28"
+}
+```
+
+**Error 500:**
+```json
+{
+    "error": "Could not detect installed Factorio version"
+}
+```
+
+### 3.2 GET /api/server/version/available
+
+Fetches the list of available versions from the Factorio API.
+
+**Response 200:**
+```json
+{
+    "stable": "2.0.32",
+    "experimental": "2.0.32",
+    "versions": [
+        {"version": "2.0.32", "stable": true, "experimental": true},
+        {"version": "2.0.31", "stable": true, "experimental": false},
+        {"version": "2.0.30", "stable": false, "experimental": true}
+    ]
+}
+```
+
+Note: The factorio API's `latest-releases` endpoint returns only the single latest stable and experimental version. To build a full list, the spec defines a **static version range** approach for v1:
+
+**Version range strategy (v1):**
+- Fetch `latest-releases` to get `latest_stable` and `latest_experimental`.
+- Generate a candidate list from `2.0.0` up to `latest_experimental` by incrementing the patch/minor numbers.
+- This avoids hitting the mod portal API for every version.
+- The range covers all versions >= 2.0 since older installs are rare and the format has been stable since 2.0.
+
+**Future enhancement (v2):** Parse the factorio.com download page or a community update feed for historical releases.
+
+**Error 502:**
+```json
+{
+    "error": "Failed to fetch version list from Factorio API"
+}
+```
+
+### 3.3 POST /api/server/version/install
+
+Downloads and installs a specific version. Requires `ServerOffMiddleware`.
+
+**Request:**
+```json
+{
+    "version": "2.0.32"
+}
+```
+
+**Response 200:**
+```json
+{
+    "success": true,
+    "version": "2.0.32",
+    "previousVersion": "2.0.28",
+    "installedAt": "2026-06-21T10:30:00Z"
+}
+```
+
+**Error 400 (bad version):**
+```json
+{
+    "error": "Invalid version string"
+}
+```
+
+**Error 403 (no auth):**
+```json
+{
+    "error": "Factorio.com credentials required. Log in via Mod Portal settings first."
+}
+```
+
+**Error 423 (server running):**
+```json
+{
+    "error": "Factorio server running. Stop the server before updating."
+}
+```
+
+**Error 500 (install failed):**
+```json
+{
+    "error": "Download failed: connection timeout"
+}
+```
+
+### 3.4 Route Registration
+
+Add to `src/api/routes.go` in the `apiRoutes` slice:
+
+```go
+{
+    "CurrentVersion",
+    "GET",
+    "/server/version/current",
+    CurrentVersionHandler,
+    false,
+}, {
+    "AvailableVersions",
+    "GET",
+    "/server/version/available",
+    AvailableVersionsHandler,
+    false,
+}, {
+    "InstallVersion",
+    "POST",
+    "/server/version/install",
+    InstallVersionHandler,
+    true,  // requires server-off
+},
+```
+
+### 3.5 Handler File: `src/api/version_handler.go`
+
+New handler file following the pattern in `mod_portal_handler.go`:
+
+```go
+package api
+
+func CurrentVersionHandler(w http.ResponseWriter, r *http.Request) { ... }
+func AvailableVersionsHandler(w http.ResponseWriter, r *http.Request) { ... }
+func InstallVersionHandler(w http.ResponseWriter, r *http.Request) { ... }
+```
+
+Each handler follows the existing `defer WriteResponse` + `w.Header().Set("Content-Type", ...)` pattern.
+
+---
+
+## 4. Frontend Component Design
+
+### 4.1 New View: `ui/App/views/ServerVersion.jsx`
+
+```jsx
+import React, { useEffect, useState } from "react";
+import { useTranslation } from 'react-i18next';
+import Panel from "../components/Panel";
+import Button from "../components/Button";
+import server from "../../api/resources/server";
+import socket from "../../api/socket";
+
+const ServerVersion = ({ serverStatus }) => {
+    const { t } = useTranslation('serverVersion');
+
+    const [installedVersion, setInstalledVersion] = useState(null);
+    const [availableVersions, setAvailableVersions] = useState([]);
+    const [stableVersion, setStableVersion] = useState(null);
+    const [isInstalling, setIsInstalling] = useState(false);
+    const [progress, setProgress] = useState(null);
+    const [error, setError] = useState(null);
+
+    useEffect(() => {
+        fetchCurrentVersion();
+        fetchAvailableVersions();
+    }, []);
+
+    useEffect(() => {
+        socket.emit('subscribe', 'server_version');
+        socket.on('server_version', data => {
+            setProgress(data);
+        });
+        return () => {
+            socket.off('server_version');
+        };
+    }, []);
+
+    const handleInstall = async (version) => {
+        setIsInstalling(true);
+        setError(null);
+        setProgress({ percent: 0, status: 'downloading' });
+        try {
+            const result = await server.installVersion(version);
+            setInstalledVersion(result.version);
+            setProgress(null);
+        } catch (err) {
+            setError(err.message);
+            setProgress(null);
+        } finally {
+            setIsInstalling(false);
+        }
+    };
+
+    const isUpdateAvailable = installedVersion && stableVersion &&
+        installedVersion !== stableVersion;
+
+    // Render logic
+};
+```
+
+### 4.2 UI Layout (matching Controls Panel pattern)
+
+```
++---------------------------------------------+
+|  Server Version              (Panel title)   |
++---------------------------------------------+
+|  Installed Version                          |
+|  +---------------------------------------+  |
+|  | Current: 2.0.28                       |  |
+|  | Status: Update Available              |  |
+|  |   (Update to 2.0.32)                  |  |
+|  +---------------------------------------+  |
+|                                             |
+|  Available Versions                         |
+|  +---------------------------------------+  |
+|  | o 2.0.32 (latest stable)   [Install]  |  |
+|  | o 2.0.31                  [Install]   |  |
+|  | o 2.0.30 (experimental)   [Install]   |  |
+|  +---------------------------------------+  |
+|                                             |
+|  [Update to 2.0.32]   big CTA button        |
+|    only visible when update available        |
++---------------------------------------------+
+```
+
+### 4.3 State Machine
+
+| State | Condition | UI |
+|---|---|---|
+| Loading | versions not yet fetched | "Loading..." spinner in each section |
+| Loaded, up-to-date | installed == stable latest | Green checkmark, "Up to date" |
+| Loaded, update available | installed < stable latest | "Update Available" badge, CTA button |
+| Installing | isInstalling = true | Progress bar, disabled buttons |
+| Error | error != null | Error banner with message |
+| No credentials | 403 on install attempt | "Login required" link to Mod Portal |
+
+### 4.4 API Resource: `ui/api/resources/server.js`
+
+Add method to existing server resource:
+
+```js
+const ServerVersionResource = {
+    current() {
+        return api.get('/server/version/current');
+    },
+    available() {
+        return api.get('/server/version/available');
+    },
+    install(version) {
+        return api.post('/server/version/install', { version });
+    },
+};
+```
+
+### 4.5 WebSocket Subscription
+
+The existing websocket hub already supports naming rooms. The version manager uses a new room `"server_version"`:
+
+```javascript
+socket.emit('subscribe', 'server_version');
+socket.on('server_version', (data) => {
+    // data = { percent: 45, status: "Extracting..." }
+});
+```
+
+On the Go side, progress is broadcast via:
+
+```go
+wsRoom := websocket.WebsocketHub.GetRoom("server_version")
+wsRoom.Send(progressJSON)
+```
+
+---
+
+## 5. Version Comparison Logic
+
+The existing `factorio.Version` type (`version.go`) is a `[4]uint` and already provides:
+
+| Method | Usage |
+|---|---|
+| `v.Less(b)` | Check if installed < available |
+| `v.Greater(b)` | Check if installed > available |
+| `v.Equals(b)` | Check equality |
+| `v.String()` | Display: "2.0.28" |
+| `v.UnmarshalText()` | Parse from string |
+
+Factorio uses 4-part versions: `major.minor.patch.build` (e.g. `2.0.28.0`). The build number is usually 0 for released builds. Comparison logic is already correct for our use case.
+
+**Update available check:**
+```go
+func IsUpdateAvailable(installed, latestStable Version) bool {
+    return latestStable.Greater(installed)
+}
+```
+
+**Version compatibility filter (future):** The existing `GreaterC` method handles experimental/super-major incompatibility. Not needed for v1 since we only list versions >= 2.0.
+
+---
+
+## 6. Download Progress
+
+### 6.1 WebSocket Event Format
+
+The backend emits progress events to the `"server_version"` websocket room:
+
+```json
+{
+    "room": "server_version",
+    "event": "install_progress",
+    "data": {
+        "percent": 45,
+        "stage": "download",
+        "message": "Downloading... 45.2 MB / 102.4 MB"
+    }
+}
+```
+
+Stages:
+
+| stage | percent range | meaning |
+|---|---|---|
+| `download` | 0 - 90 | Downloading tar.xz from factorio.com |
+| `extract` | 90 - 99 | Extracting archive over FactorioDir |
+| `verify` | 99 - 100 | Running factorio --version on new binary |
+| `done` | 100 | Complete |
+| `error` | -- | Installation failed |
+
+### 6.2 Backend Implementation
+
+```go
+func reportProgress(percent int, stage, message string) {
+    wsRoom := websocket.WebsocketHub.GetRoom("server_version")
+    data, _ := json.Marshal(map[string]interface{}{
+        "room": "server_version",
+        "event": "install_progress",
+        "data": map[string]interface{}{
+            "percent": percent,
+            "stage":   stage,
+            "message": message,
+        },
+    })
+    wsRoom.Send(string(data))
+}
+```
+
+The HTTP download uses a `io.TeeReader` with a `ProgressReader` wrapper:
+
+```go
+type ProgressReader struct {
+    reader     io.Reader
+    total      int64
+    read       int64
+    lastReport int64
+}
+
+func (pr *ProgressReader) Read(p []byte) (int, error) {
+    n, err := pr.reader.Read(p)
+    pr.read += int64(n)
+    newPct := pr.read * 100 / pr.total
+    lastPct := pr.lastReport * 100 / pr.total
+    if newPct > lastPct+4 || newPct >= 100 {
+        pr.lastReport = pr.read
+        reportProgress(int(newPct), "download",
+            fmt.Sprintf("%.1f MB / %.1f MB",
+                float64(pr.read)/1024/1024,
+                float64(pr.total)/1024/1024))
+    }
+    return n, err
+}
+```
+
+### 6.3 Frontend Progress Bar
+
+A Tailwind-based progress bar inside the Panel when `status === 'installing'`:
+
+```jsx
+{isInstalling && progress && (
+    <div className="w-full bg-gray-light rounded h-4 mt-2">
+        <div className="bg-orange h-4 rounded transition-all duration-300"
+             style={{ width: `${progress.percent}%` }} />
+        <span className="text-sm text-dirty-white ml-2">
+            {progress.message}
+        </span>
+    </div>
+)}
+```
+
+---
+
+## 7. Error Handling
+
+### 7.1 Error Scenarios
+
+| Scenario | Detection | Response |
+|---|---|---|
+| Server running | ServerOffMiddleware in routes.go | 423 Locked + message |
+| No credentials saved | credentials.Load() returns false | 403 + "Log in via Mod Portal" |
+| Network failure | http.Get timeout / DNS error | 502 + "Download failed: {details}" |
+| Invalid version string | version.UnmarshalText() fails | 400 + "Invalid version" |
+| Disk full / permission denied | os.Create / io.Copy fails | 500 + "Install failed: disk error" |
+| Corrupt download | xz decompression fails | 500 + "Download corrupt, try again" |
+| Binary not found after install | exec.Command fails | 500 + "New binary could not be verified" |
+| Extract permission denied | tar.Reader write fails | 500 + "Permission denied extracting" |
+
+### 7.2 Atomicity
+
+The install operation is NOT fully atomic (replacing the binary while the server is stopped is inherently safe). However:
+
+- The temp download file is cleaned up in a `defer` block even on error.
+- If extraction fails partway, the FactorioDir is left in an inconsistent state. To mitigate, v1 documents this risk. v2 could add a backup step:
+
+```go
+// v1: direct overwrite
+// v2: backup bin/x64/factorio before extracting, restore on failure
+```
+
+### 7.3 Frontend Error Display
+
+```jsx
+{error && (
+    <div className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mb-4">
+        <span className="block sm:inline">{error}</span>
+    </div>
+)}
+```
+
+---
+
+## 8. Integration with Existing Auth
+
+### 8.1 Token Source
+
+The Factorio download API requires `?username=<user>&token=<token>` query parameters on the download URL. This is the same authentication used for mod downloads in `mod_Mods.go`.
+
+The credentials are stored in `./factorio.auth` (two-line JSON: `{"username": "...", "userkey": "..."}`), managed by the existing `credentials.go` package.
+
+### 8.2 Auth Flow
+
+```
+1. User configures token via Mod Portal settings page (existing feature)
+   POST /api/mods/portal/login { username, token }
+   factorio.auth file saved
+
+2. Version install API reads the same credentials
+   credentials.Load() in version_manager.go
+
+3. Download URL constructed:
+   https://factorio.com/get-download/{version}/headless/linux64?username={u}&token={t}
+
+4. If credentials missing, 403 error returned to UI
+   UI shows link to Mod Portal settings page
+```
+
+### 8.3 Credential Validation
+
+The Factorio download API returns 403 if the token is invalid or the user does not own the game. This is surfaced as:
+
+```json
+{
+    "error": "Factorio.com authentication failed. Check your Mod Portal token."
+}
+```
+
+---
+
+## 9. Sidebar Integration
+
+### 9.1 Layout Changes (`ui/App/components/Layout.jsx`)
+
+Add a new link inside the existing "Server Management" section, before the closing `</div>` and after `linkLogs`:
+
+```jsx
+<Link to="/server-version">{t('linkServerVersion', { ns: 'layout' })}</Link>
+```
+
+Place it after the `linkLogs` link to group it with server management operations.
+
+### 9.2 Layout i18n Keys
+
+Add to `ui/locales/en/layout.json`:
+```json
+"linkServerVersion": "Server Version"
+```
+
+Add to `ui/locales/zh-CN/layout.json`:
+```json
+"linkServerVersion": "服务器版本"
+```
+
+### 9.3 Route Registration (`ui/App/App.jsx`)
+
+```jsx
+import ServerVersion from "./views/ServerVersion";
+
+// Inside the ProtectedRoute > Layout route group:
+<Route path="server-version" element={<ServerVersion serverStatus={serverStatus} />} />
+```
+
+### 9.4 Frontend Route Registration (Go backend)
+
+Add to `src/api/routes.go` subrouter path routing:
+
+```go
+subRouter.Path("/server-version").
+    Methods("GET").
+    Name("Server Version").
+    Handler(http.StripPrefix("/server-version", http.FileServer(http.Dir("./app/"))))
+```
+
+---
+
+## 10. i18n
+
+### 10.1 New Namespace: `serverVersion`
+
+Create two new files:
+
+**`ui/locales/en/serverVersion.json`**:
+```json
+{
+    "title": "Server Version",
+    "installedVersion": "Installed Version",
+    "current": "Current",
+    "unknown": "Unknown",
+    "upToDate": "Up to date",
+    "updateAvailable": "Update Available",
+    "updateTo": "Update to {{version}}",
+    "availableVersions": "Available Versions",
+    "stable": "stable",
+    "experimental": "experimental",
+    "latestStable": "latest stable",
+    "install": "Install",
+    "installing": "Installing...",
+    "confirmInstall": "Are you sure you want to install Factorio {{version}}? The server must be stopped.",
+    "installSuccess": "Successfully installed Factorio {{version}}",
+    "installFailed": "Installation failed: {{error}}",
+    "loginRequired": "Factorio.com login required.",
+    "loginLink": "Go to Mod Portal settings",
+    "previousVersion": "Previous version",
+    "downloadStage": "Downloading...",
+    "extractStage": "Extracting...",
+    "verifyStage": "Verifying..."
+}
+```
+
+**`ui/locales/zh-CN/serverVersion.json`**:
+```json
+{
+    "title": "服务器版本",
+    "installedVersion": "已安装版本",
+    "current": "当前版本",
+    "unknown": "未知",
+    "upToDate": "已是最新",
+    "updateAvailable": "有可用更新",
+    "updateTo": "更新至 {{version}}",
+    "availableVersions": "可用版本",
+    "stable": "稳定版",
+    "experimental": "实验版",
+    "latestStable": "最新稳定版",
+    "install": "安装",
+    "installing": "安装中...",
+    "confirmInstall": "确定要安装 Factorio {{version}} 吗？服务器必须处于停止状态。",
+    "installSuccess": "Factorio {{version}} 安装成功",
+    "installFailed": "安装失败: {{error}}",
+    "loginRequired": "需要登录 Factorio.com。",
+    "loginLink": "前往 Mod Portal 设置",
+    "previousVersion": "上一个版本",
+    "downloadStage": "下载中...",
+    "extractStage": "解压中...",
+    "verifyStage": "验证中..."
+}
+```
+
+### 10.2 i18n Registration
+
+Add to `ui/i18n.js`:
+
+```js
+import enServerVersion from './locales/en/serverVersion.json';
+import zhServerVersion from './locales/zh-CN/serverVersion.json';
+
+// In resources object under each language:
+serverVersion: enServerVersion,
+serverVersion: zhServerVersion,
+```
+
+---
+
+## 11. Implementation Order
+
+### Phase 1: Backend Core
+
+| Step | File | What |
+|---|---|---|
+| 1.1 | `src/factorio/version_manager.go` | Add `GetInstalledVersion()`, `FetchAvailableVersions()`, `DownloadAndInstall()`, `extractTarXz()` |
+| 1.2 | `src/api/version_handler.go` | Add `CurrentVersionHandler`, `AvailableVersionsHandler`, `InstallVersionHandler` |
+| 1.3 | `src/api/routes.go` | Register three new routes in `apiRoutes` |
+| 1.4 | `src/go.mod` | Add `github.com/ulikunitz/xz` dependency |
+
+### Phase 2: Frontend
+
+| Step | File | What |
+|---|---|---|
+| 2.1 | `ui/api/resources/server.js` | Add `installVersion()` method |
+| 2.2 | `ui/App/views/ServerVersion.jsx` | Create new view component |
+| 2.3 | `ui/App/App.jsx` | Add route for `/server-version` |
+| 2.4 | `ui/App/components/Layout.jsx` | Add sidebar link |
+| 2.5 | `src/api/routes.go` | Add frontend route for `/server-version` |
+| 2.6 | `ui/locales/en/serverVersion.json` | English translations |
+| 2.7 | `ui/locales/zh-CN/serverVersion.json` | Chinese translations |
+| 2.8 | `ui/i18n.js` | Register new namespace |
+
+### Phase 3: Polish and Testing
+
+| Step | What |
+|---|---|
+| 3.1 | Verify progress events reach frontend |
+| 3.2 | Test download failure / resume |
+| 3.3 | Test auth credential expiry |
+| 3.4 | Error message review (all 7 error scenarios) |
+| 3.5 | Verify binary still runs after install |
+
+---
+
+## 12. Testing Criteria
+
+### 12.1 Backend Tests (Go)
+
+| Test | Input | Expected |
+|---|---|---|
+| `TestGetInstalledVersion` | Existing factorio binary at configured path | Valid `Version` parsed from `--version` output |
+| `TestFetchAvailableVersions` | Mock HTTP server returning `latest-releases` JSON | `[]AvailableVersion` with stable + experimental |
+| `TestDownloadAndInstall` | Mock HTTP server serving a valid tar.xz | Binary at FactorioBinary path, extracted correctly |
+| `TestInstallRequiresCredentials` | No factorio.auth file | Error returned |
+| `TestInstallWithBadVersion` | Version "0.0.0" | Invalid version error |
+| `TestVersionComparison` | "(2.0.28, 2.0.32)" | `IsUpdateAvailable` returns `true` |
+| `TestVersionComparison_Equal` | "(2.0.32, 2.0.32)" | `IsUpdateAvailable` returns `false` |
+
+### 12.2 Frontend Tests (Manual)
+
+| Scenario | Steps | Expected |
+|---|---|---|
+| Load page, server stopped | Navigate to /server-version | Shows current version + available list |
+| Update available | Installed is older than stable | Shows "Update Available" + CTA button |
+| Install starts | Click "Install" | Shows progress bar, buttons disabled |
+| Install succeeds | Wait for completion | Shows new version, "Up to date" status |
+| Install fails (network) | Simulate offline | Error message displayed, buttons re-enabled |
+| Install fails (no auth) | Delete factorio.auth | 403 error, link to Mod Portal |
+| Server running | Start server, try to install | 423 error, "Stop server first" message |
+| Progress updates | Watch websocket during install | Progress bar fills smoothly |
+
+### 12.3 Integration Test
+
+```
+1. Start FSM with known Factorio installation (e.g. 2.0.28)
+2. Navigate to Server Version page
+3. Verify "Current: 2.0.28" displayed
+4. Click "Install" on 2.0.32
+5. Wait for progress bar to reach 100%
+6. Verify page now shows "Current: 2.0.32"
+7. Start server, verify it runs on new version
+```
+
+---
+
+## Appendix A: Factorio Download API Reference
+
+**List latest releases (no auth):**
+```
+GET https://factorio.com/api/latest-releases
+```
+Response:
+```json
+{
+    "stable": {
+        "alpha": "2.0.32",
+        "demo": "2.0.32",
+        "headless": "2.0.32"
+    },
+    "experimental": {
+        "alpha": "2.0.32",
+        "demo": "2.0.32",
+        "headless": "2.0.32"
+    }
+}
+```
+
+**Download headless (requires auth):**
+```
+GET https://factorio.com/get-download/{version}/headless/linux64?username={user}&token={token}
+```
+Returns `application/x-xz` binary stream.
+
+## Appendix B: Files Changed Summary
+
+| File | Change Type |
+|---|---|
+| `src/factorio/version_manager.go` | **New** |
+| `src/api/version_handler.go` | **New** |
+| `src/api/routes.go` | Modify (add 3 routes) |
+| `src/go.mod` | Modify (add `ulikunitz/xz`) |
+| `src/go.sum` | Modify (auto) |
+| `ui/App/views/ServerVersion.jsx` | **New** |
+| `ui/App/App.jsx` | Modify (add import + route) |
+| `ui/App/components/Layout.jsx` | Modify (add sidebar link) |
+| `ui/api/resources/server.js` | Modify (add `installVersion`) |
+| `ui/locales/en/serverVersion.json` | **New** |
+| `ui/locales/zh-CN/serverVersion.json` | **New** |
+| `ui/i18n.js` | Modify (register new namespace) |
+
+---
+
+## Appendix C: Open Questions for Implementation
+
+1. Should the version range (for the `available` endpoint) be hardcoded as `[2.0.0 ... latest]` or fetched from a community index? v1 uses a hardcoded range with step increments. If the Factorio API later provides a version list endpoint, switch to that.
+
+2. What is the minimum Factorio version this should support? v1 targets >= 2.0.0. Pre-2.0 versions are out of support.
+
+3. Should we preserve the old binary as `factorio.bak` before overwriting? v1 says no (clean override). v2 can add this.

From e881478d7031fea9b87fb44fd84f4202be7698c4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 06:25:39 +0000
Subject: [PATCH 010/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=99=A8=E5=AE=9E=E7=8E=B0=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...1-server-version-manager-implementation.md | 523 ++++++++++++++++++
 1 file changed, 523 insertions(+)
 create mode 100644 docs/superpowers/plans/2026-06-21-server-version-manager-implementation.md

diff --git a/docs/superpowers/plans/2026-06-21-server-version-manager-implementation.md b/docs/superpowers/plans/2026-06-21-server-version-manager-implementation.md
new file mode 100644
index 00000000..f4b258da
--- /dev/null
+++ b/docs/superpowers/plans/2026-06-21-server-version-manager-implementation.md
@@ -0,0 +1,523 @@
+# FSM Server Version Manager — Implementation Plan
+
+**Date:** 2026-06-21
+**Spec:** `docs/superpowers/specs/2026-06-21-server-version-manager-design.md`
+**Branch:** `feat/server-version-manager`
+
+---
+
+## Context
+
+Add a Server Version Manager to FSM that allows operators to view installed version, fetch available versions from the Factorio API, and download/install a selected version — all from the UI. The install requires server-off state, uses existing Mod Portal credentials for auth, and reports download progress via WebSocket.
+
+## Task Dependency Graph
+
+| Task | Depends On | Reason |
+|------|------------|--------|
+| T1: go.mod add xz dependency | None | Foundation — needed for compilation |
+| T2: version_manager.go core logic | T1 | Uses xz package for extraction |
+| T3: version_manager_test.go | T2 | Tests the core logic |
+| T4: version_handler.go API handlers | T2 | Handlers call VersionManager methods |
+| T5: routes.go backend API routes | T4 | Must reference handler functions |
+| T6: routes.go frontend SPA route | None | Independent of other backend changes |
+| T7: version_handler_test.go | T4, T5 | Tests the handler integration |
+| T8: en/serverVersion.json | None | Independent of backend |
+| T9: zh-CN/serverVersion.json | None | Independent of backend |
+| T10: i18n.js registration | T8, T9 | Must import the new locale files |
+| T11: server.js + socket.js API/WS | None | Independent of backend |
+| T12: ServerVersion.jsx view | T11, T10, T8, T9 | Needs API methods and i18n strings |
+| T13: App.jsx route registration | T12 | Must import ServerVersion component |
+| T14: Layout.jsx sidebar link + i18n | T13 | Sidebar nav for the new page |
+| T15: Build + verify | All | Final integration verification |
+
+## Parallel Execution Graph
+
+**Wave 1 (Start immediately — no inter-file dependencies):**
+- T1: go.mod add `ulikunitz/xz`
+- T8: Create `en/serverVersion.json`
+- T9: Create `zh-CN/serverVersion.json`
+- T11: Add API methods + WS subscription to server.js/socket.js
+
+**Wave 2 (After Wave 1):**
+- T2: `version_manager.go` — core logic (download, extract, install, progress)
+- T6: Frontend SPA route in routes.go
+
+**Wave 3 (After Wave 2 completes):**
+- T4: `version_handler.go` — 3 API handler functions
+- T5: Register backend routes in routes.go
+- T10: Register i18n namespace in i18n.js
+
+**Wave 4 (After Wave 3 completes):**
+- T3: `version_manager_test.go`
+- T7: `version_handler_test.go`
+
+**Wave 5 (After Wave 4 completes):**
+- T12: `ServerVersion.jsx` — full view component with progress bar
+
+**Wave 6 (After Wave 5 completes):**
+- T13: Add route in App.jsx
+- T14: Add sidebar link in Layout.jsx + layout locale keys
+
+**Wave 7 (After Wave 6 completes):**
+- T15: Build frontend + backend, verify compilation
+
+**Critical Path:** T1 → T2 → T4 → T5 → T12 → T13 → T14 → T15
+
+## Tasks
+
+### Task 1: go.mod — Add `ulikunitz/xz` dependency
+
+**Description**: Add the pure-Go xz decompression library required by `extractTarXz()`.
+
+**File**: `src/go.mod`
+
+**Changes**:
+- Add `github.com/ulikunitz/xz v0.5.12` to the `require` block
+- Run `cd src && go mod tidy` to update `go.sum`
+
+**Delegation Recommendation**:
+- Category: `quick` — single-line dep addition
+- Skills: none needed
+
+**Depends On**: None
+
+**Acceptance Criteria**:
+- `go.sum` updated
+- `go build ./...` passes
+
+---
+
+### Task 2: version_manager.go — Core backend logic
+
+**Description**: New file containing `VersionManager` struct, `GetInstalledVersion()`, `FetchAvailableVersions()`, `DownloadAndInstall()`, `extractTarXz()`, `ProgressReader`, and `reportProgress()`.
+
+**File**: `src/factorio/version_manager.go` (new)
+
+**Key types** (per spec §2.3):
+- `LatestReleasesResponse`, `LatestRelease`, `AvailableVersion`
+- `ProgressReader` — io.Reader wrapper that reports download % to WebSocket room every ~5% delta or at 100%
+
+**Key functions**:
+
+| Function | Detail |
+|---|---|
+| `GetInstalledVersion()` | Runs `config.FactorioBinary --version`, regex-parses output (same pattern as `NewFactorioServer()` in server.go:150-167). Returns `Version`. |
+| `FetchAvailableVersions()` | GET `https://factorio.com/api/latest-releases`, parse JSON. Generate candidate list from `2.0.0` up to `latest_experimental` by incrementing patch. Returns `[]AvailableVersion` with stable/experimental flags. |
+| `DownloadAndInstall(v Version)` | 1. `credentials.Load()` → fail 403 if none. 2. Construct URL with username+token. 3. HTTP GET, stream to `/tmp/factorio-dl-<random>.tar.xz` with ProgressReader. 4. `extractTarXz()` over `config.FactorioDir`. 5. `defer os.Remove` temp. 6. Verify with GetInstalledVersion(). |
+| `extractTarXz(r io.Reader, dest string)` | xz.NewReader → tar.NewReader. For each header: create dirs, write files, set 0755 on `bin/x64/factorio`. |
+| `reportProgress(percent, stage, msg)` | Marshal JSON, send to `websocket.WebsocketHub.GetRoom("server_version").Send()` |
+
+**Helper**: `IsUpdateAvailable(installed, latestStable Version) bool` — uses existing `Greater()`.
+
+**WS Event format** (per spec §6.1):
+```json
+{"room": "server_version", "event": "install_progress", "data": {"percent": 45, "stage": "download", "message": "45.2 MB / 102.4 MB"}}
+```
+
+**Delegation Recommendation**:
+- Category: `deep` — moderately complex Go with HTTP, xz, websocket integration
+- Skills: none needed beyond system Go toolchain
+
+**Depends On**: Task 1
+
+**Acceptance Criteria**:
+- Compiles with `go build ./...`
+- `GetInstalledVersion()` returns a valid `Version` when pointed at a real binary
+- Progress events sent to WebSocket room during download
+
+---
+
+### Task 3: version_manager_test.go — Tests for core logic
+
+**Description**: Unit tests for version comparison, version range generation, and credential checking.
+
+**File**: `src/factorio/version_manager_test.go` (new)
+
+**Tests** (per spec §12.1):
+
+| Test | Input | Expected |
+|---|---|---|
+| `TestGetInstalledVersion` | Real factorio binary at configured path | Valid Version parsed from --version |
+| `TestFetchAvailableVersions` | Mock HTTP server returning latest-releases | []AvailableVersion with stable + experimental |
+| `TestDownloadAndInstall` | Mock HTTP serving valid tar.xz | Binary extracted at FactorioDir |
+| `TestInstallRequiresCredentials` | No factorio.auth file | Error returned |
+| `TestInstallWithBadVersion` | Version "0.0.0" | Invalid version error |
+| `TestIsUpdateAvailable` | (2.0.28, 2.0.32) | true |
+| `TestIsUpdateAvailable_Equal` | (2.0.32, 2.0.32) | false |
+| `TestVersionRangeGeneration` | stable=2.0.32, experimental=2.0.32 | List covers 2.0.0..2.0.32, 2.0.32 is both |
+
+Use `testing.Short()` skip for tests needing external HTTP or real binary.
+
+**Delegation Recommendation**:
+- Category: `quick` — straightforward unit test patterns matching existing style
+- Skills: none
+
+**Depends On**: Task 2
+
+**Acceptance Criteria**:
+- `cd src && go test -short ./factorio/ -run TestVersion` passes
+
+---
+
+### Task 4: version_handler.go — API HTTP handlers
+
+**Description**: Three handler functions following the existing pattern in `mod_portal_handler.go`: `defer WriteResponse` + `w.Header().Set("Content-Type", ...)` + explicit status codes.
+
+**File**: `src/api/version_handler.go` (new)
+
+**Handlers**:
+
+**`CurrentVersionHandler`**:
+- Calls `factorio.GetInstalledVersion()` (or reads from singleton `factorio.GetFactorioServer().Version`)
+- Returns `{"version": "2.0.28", "string": "2.0.28"}`
+- Error 500 on failure
+
+**`AvailableVersionsHandler`**:
+- Calls `factorio.FetchAvailableVersions()`
+- Returns `{"stable": "2.0.32", "experimental": "2.0.32", "versions": [...]}`
+- Error 502 on API fetch failure
+
+**`InstallVersionHandler`**:
+- Reads `{"version": "2.0.32"}` from body via `ReadFromRequestBody`
+- Validates with `Version.UnmarshalText()`
+- Gets previous version before installing
+- Calls `factorio.DownloadAndInstall()`
+- Returns `{"success": true, "version": "2.0.32", "previousVersion": "2.0.28", "installedAt": "RFC3339"}`
+- Error 400 bad version, 403 no credentials, 500 install failure
+
+**Delegation Recommendation**:
+- Category: `deep` — request parsing + multiple error paths + WS integration
+- Skills: none
+
+**Depends On**: Task 2
+
+**Acceptance Criteria**:
+- Compiles
+- Each handler returns correct JSON shape per spec §3
+
+---
+
+### Task 5: routes.go — Register backend API routes
+
+**Description**: Add three new route entries to `apiRoutes` slice.
+
+**File**: `src/api/routes.go`
+
+**Changes to `apiRoutes`** — append three routes (before the closing `}`):
+
+```go
+{
+    "CurrentVersion",
+    "GET",
+    "/server/version/current",
+    CurrentVersionHandler,
+    false,
+}, {
+    "AvailableVersions",
+    "GET",
+    "/server/version/available",
+    AvailableVersionsHandler,
+    false,
+}, {
+    "InstallVersion",
+    "POST",
+    "/server/version/install",
+    InstallVersionHandler,
+    true,  // requires server-off
+},
+```
+
+**Delegation Recommendation**:
+- Category: `quick` — simple slice append following existing pattern
+- Skills: none
+
+**Depends On**: Task 4
+
+**Acceptance Criteria**:
+- `go build ./...` compiles
+- Routes listed in `NewRouter()` output when inspected
+
+---
+
+### Task 6: routes.go — Frontend SPA route
+
+**Description**: Add frontend file-server route for `/server-version` alongside existing routes like `/saves`, `/mods`, `/logs`.
+
+**File**: `src/api/routes.go`
+
+**Change** — add after the `/logs` route block (around line 116):
+
+```go
+subRouter.Path("/server-version").
+    Methods("GET").
+    Name("Server Version").
+    Handler(http.StripPrefix("/server-version", http.FileServer(http.Dir("./app/"))))
+```
+
+**Delegation Recommendation**:
+- Category: `quick` — single route addition following exact existing pattern
+- Skills: none
+
+**Depends On**: None
+
+**Acceptance Criteria**:
+- Route registered in router
+- Navigable to `/server-version` in browser
+
+---
+
+### Task 7: version_handler_test.go — Tests for API handlers
+
+**Description**: Integration tests for the three version endpoints using existing `CallRoute` pattern from `mods_handler_test.go`.
+
+**File**: `src/api/version_handler_test.go` (new)
+
+**Tests** (per spec §12.1):
+
+| Test | Method | Route | Expected |
+|---|---|---|---|
+| `TestCurrentVersion` | GET | `/api/server/version/current` | 200 + `{"version":"...", "string":"..."}` |
+| `TestAvailableVersions` | GET | `/api/server/version/available` | 200 + version list (or skip in short mode) |
+| `TestInstall_ServerRunning` | POST | `/api/server/version/install` | 423 Locked |
+| `TestInstall_InvalidVersion` | POST | `/api/server/version/install` | 400 bad version |
+
+**Delegation Recommendation**:
+- Category: `quick` — simple handler tests following existing patterns
+- Skills: none
+
+**Depends On**: Task 4, Task 5
+
+**Acceptance Criteria**:
+- `cd src && go test -short ./api/ -run TestVersion` passes
+
+---
+
+### Task 8: en/serverVersion.json — English i18n strings
+
+**File**: `ui/locales/en/serverVersion.json` (new)
+
+Content per spec §10.1 — all keys as documented.
+
+**Delegation Recommendation**:
+- Category: `quick` — static JSON file
+- Skills: none
+
+**Depends On**: None
+
+**Acceptance Criteria**:
+- JSON is valid
+- All keys from spec are present
+
+---
+
+### Task 9: zh-CN/serverVersion.json — Chinese i18n strings
+
+**File**: `ui/locales/zh-CN/serverVersion.json` (new)
+
+Content per spec §10.1 — all keys translated.
+
+**Delegation Recommendation**:
+- Category: `quick` — static JSON file
+- Skills: none
+
+**Depends On**: None
+
+**Acceptance Criteria**:
+- JSON is valid
+- All keys match en version structure
+
+---
+
+### Task 10: i18n.js — Register new serverVersion namespace
+
+**File**: `ui/i18n.js`
+
+**Changes**:
+- Import `enServerVersion` and `zhServerVersion`
+- Add `serverVersion: enServerVersion` to `resources.en`
+- Add `serverVersion: zhServerVersion` to `resources['zh-CN']`
+
+**Delegation Recommendation**:
+- Category: `quick` — 4-line addition following exact existing import/registration pattern
+- Skills: none
+
+**Depends On**: Task 8, Task 9
+
+**Acceptance Criteria**:
+- i18n loads without errors
+- `t('title', { ns: 'serverVersion' })` returns the english title string
+
+---
+
+### Task 11: server.js + socket.js — API resource methods + WS subscription
+
+**Files**: `ui/api/resources/server.js`, `ui/api/socket.js`
+
+**server.js changes**:
+- Add `currentVersion()` — `client.get('/api/server/version/current')`
+- Add `availableVersions()` — `client.get('/api/server/version/available')`
+- Add `installVersion(version)` — `client.post('/api/server/version/install', { version })`
+
+**socket.js changes**:
+- In `registerEventEmitter`/`unregisterEventEmitter`, add handler functions:
+  ```js
+  function versionSubscribeEvent() {
+      socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "server_version"}}));
+  }
+  function versionUnsubscribeEvent() {
+      socket.send(JSON.stringify({room_name: "", controls: {type: "unsubscribe", value: "server_version"}}));
+  }
+  ```
+- Register: `bus.on('version progress subscribe', versionSubscribeEvent);`
+- Unregister: `bus.off('version progress subscribe', versionSubscribeEvent);` + unsubscribe
+
+**Delegation Recommendation**:
+- Category: `quick` — straightforward method additions following patterns
+- Skills: none
+
+**Depends On**: None
+
+**Acceptance Criteria**:
+- `server.installVersion('2.0.32')` sends POST with correct body
+- `socket.emit('version progress subscribe')` sends WS subscribe for `server_version` room
+
+---
+
+### Task 12: ServerVersion.jsx — New view component
+
+**Description**: Full React component implementing the UI layout from spec §4.
+
+**File**: `ui/App/views/ServerVersion.jsx` (new)
+
+**States covered** (per spec §4.3):
+
+| State | UI |
+|---|---|
+| Loading | "Loading..." in each section |
+| Loaded, up-to-date | Green checkmark + "Up to date" |
+| Loaded, update available | "Update Available" badge + big CTA button |
+| Installing | Progress bar (Tailwind) + disabled buttons |
+| Error | Red error banner |
+| No credentials | Link to Mod Portal settings page |
+
+**Key implementation**:
+- `useTranslation('serverVersion')`
+- `useEffect` fetch current + available versions on mount
+- Subscribe to `server_version` WS room for progress events
+- `handleInstall(version)` — calls `server.installVersion`, shows progress
+- Version list with stable/experimental labels
+- Confirmation via `window.confirm` (or existing `ConfirmDialog` component)
+- Progress bar: `<div className="bg-orange h-4 rounded" style={{ width: progress.percent + '%' }}>`
+
+**Delegation Recommendation**:
+- Category: `visual-engineering` — new React view with i18n and WS integration
+- Skills: none specific
+
+**Depends On**: Task 10, Task 11
+
+**Acceptance Criteria**:
+- Component renders all states without errors
+- Progress bar appears and updates during install
+- Error display matches spec §7.3
+
+---
+
+### Task 13: App.jsx — Route registration
+
+**File**: `ui/App/App.jsx`
+
+**Changes**:
+- Add `import ServerVersion from "./views/ServerVersion";`
+- Add route:
+  ```jsx
+  <Route path="server-version" element={<ServerVersion serverStatus={serverStatus} />} />
+  ```
+
+**Delegation Recommendation**:
+- Category: `quick` — single import + single line route
+- Skills: none
+
+**Depends On**: Task 12
+
+**Acceptance Criteria**:
+- `/server-version` renders ServerVersion component
+
+---
+
+### Task 14: Layout.jsx — Sidebar link + layout i18n
+
+**Files**: `ui/App/components/Layout.jsx`, `ui/locales/en/layout.json`, `ui/locales/zh-CN/layout.json`
+
+**Layout.jsx changes**:
+- Add link after `<Link to="/logs">`:
+  ```jsx
+  <Link to="/server-version">{t('linkServerVersion', { ns: 'layout' })}</Link>
+  ```
+- Move `last={true}` from `linkLogs` to this new link
+
+**layout.json changes**:
+- `en/layout.json`: add `"linkServerVersion": "Server Version"`
+- `zh-CN/layout.json`: add `"linkServerVersion": "服务器版本"`
+
+**Delegation Recommendation**:
+- Category: `quick` — 1 link + 2 JSON keys
+- Skills: none
+
+**Depends On**: Task 13
+
+**Acceptance Criteria**:
+- Sidebar shows "Server Version" link in Server Management section
+- Navigation to /server-version works from sidebar
+
+---
+
+### Task 15: Build + Verify
+
+**Description**: Build both frontend and backend, verify compilation.
+
+**Steps**:
+1. `npm install`
+2. `npm run build`
+3. `cd src && go build -o ../factorio-server-manager/factorio-server-manager .`
+4. `cd src && go vet ./...`
+5. Verify `app/bundle.js` and binary exist and are non-empty
+
+**Delegation Recommendation**:
+- Category: `quick` — run build commands, check output
+- Skills: none
+
+**Depends On**: All tasks
+
+**Acceptance Criteria**:
+- Frontend builds with no errors
+- Backend builds with no errors
+- All `go vet` checks pass
+
+---
+
+## Commit Strategy
+
+1. After writing this plan:
+   ```
+   文档: 添加服务器版本管理器实现计划
+   ```
+
+2. After full implementation (single atomic commit):
+   ```
+   功能: 实现服务器版本管理器
+   ```
+
+   If intermediate commits are useful during development, squash to a single commit before final.
+
+---
+
+## Success Criteria
+
+1. All tasks pass their acceptance criteria
+2. `cd src && go build ./...` succeeds
+3. `npm run build` succeeds
+4. `cd src && go test -short ./...` passes
+5. Three API endpoints return correct JSON per spec §3
+6. Frontend renders all states (loading, loaded, installing, error)
+7. Progress events flow backend → WS room → frontend progress bar
+8. Install blocked when server running (423) or no credentials (403)

From abcad12c58555e877eef23c18547cda1044542de Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 06:36:52 +0000
Subject: [PATCH 011/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=99=A8=EF=BC=88=E4=B8=8B=E8=BD=BD/=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20Factorio=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routes.go                   |   4 +
 src/api/version_handler.go          |  77 ++++++++++
 src/factorio/version_manager.go     | 229 ++++++++++++++++++++++++++++
 src/go.mod                          |   1 +
 src/go.sum                          |   2 +
 ui/App/App.jsx                      |   2 +
 ui/App/components/Layout.jsx        |   1 +
 ui/App/views/ServerVersion.jsx      | 169 ++++++++++++++++++++
 ui/api/resources/server.js          |  14 ++
 ui/i18n.js                          |   4 +
 ui/locales/en/layout.json           |   1 +
 ui/locales/en/serverVersion.json    |  22 +++
 ui/locales/zh-CN/layout.json        |   1 +
 ui/locales/zh-CN/serverVersion.json |  22 +++
 14 files changed, 549 insertions(+)
 create mode 100644 src/api/version_handler.go
 create mode 100644 src/factorio/version_manager.go
 create mode 100644 ui/App/views/ServerVersion.jsx
 create mode 100644 ui/locales/en/serverVersion.json
 create mode 100644 ui/locales/zh-CN/serverVersion.json

diff --git a/src/api/routes.go b/src/api/routes.go
index 65650fee..8388cb53 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -122,6 +122,10 @@ func NewRouter() *mux.Router {
 		Methods("GET").
 		Name("Help").
 		Handler(http.StripPrefix("/help", http.FileServer(http.Dir("./app/"))))
+	subRouter.Path("/server-version").
+		Methods("GET").
+		Name("Server version").
+		Handler(http.StripPrefix("/server-version", http.FileServer(http.Dir("./app/"))))
 
 	// catch all route
 	mainRouter.PathPrefix("/").
diff --git a/src/api/version_handler.go b/src/api/version_handler.go
new file mode 100644
index 00000000..d678e55b
--- /dev/null
+++ b/src/api/version_handler.go
@@ -0,0 +1,77 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
+	"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
+)
+
+func GetCurrentVersion(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	vm := factorio.NewVersionManager()
+	version, err := vm.GetCurrentVersion()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(map[string]string{"version": version})
+}
+
+func GetAvailableVersions(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	vm := factorio.NewVersionManager()
+	releases, err := vm.GetAvailableVersions()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(releases)
+}
+
+func InstallVersion(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	var data struct {
+		Version string `json:"version"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		json.NewEncoder(w).Encode(map[string]string{"error": "invalid request body"})
+		return
+	}
+
+	vm := factorio.NewVersionManager()
+	wsRoom := websocket.WebsocketHub.GetRoom("server_version")
+
+	err := vm.DownloadAndInstall(data.Version, func(percent int) {
+		msg := fmt.Sprintf(`{"type":"download_progress","version":"%s","percent":%d}`, data.Version, percent)
+		wsRoom.Send(string(msg))
+	})
+
+	if err != nil {
+		log.Printf("Version install error: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
+		return
+	}
+
+	wsRoom.Send(fmt.Sprintf(`{"type":"install_complete","version":"%s"}`, data.Version))
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(map[string]string{
+		"status":  "ok",
+		"version": data.Version,
+	})
+}
diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
new file mode 100644
index 00000000..ae694cc5
--- /dev/null
+++ b/src/factorio/version_manager.go
@@ -0,0 +1,229 @@
+package factorio
+
+import (
+	"archive/tar"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
+	"github.com/ulikunitz/xz"
+)
+
+type Release struct {
+	Version string `json:"version"`
+	Stable  bool   `json:"stable"`
+	Latest  bool   `json:"latest,omitempty"`
+}
+
+type DownloadsResponse struct {
+	Stable       Release `json:"stable"`
+	Experimental Release `json:"experimental"`
+}
+
+type VersionManager struct {
+	FactorioDir    string
+	FactorioBinary string
+	Credentials    *Credentials
+}
+
+func (vm *VersionManager) GetCurrentVersion() (string, error) {
+	cmd := exec.Command(vm.FactorioBinary, "--version")
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("failed to get current version: %w", err)
+	}
+	line := string(output)
+	return parseVersionLine(line)
+}
+
+func (vm *VersionManager) GetAvailableVersions() ([]Release, error) {
+	resp, err := http.Get("https://factorio.com/api/latest-releases")
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch releases: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var data DownloadsResponse
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return nil, fmt.Errorf("failed to parse releases: %w", err)
+	}
+
+	releases := []Release{}
+	if data.Stable.Version != "" {
+		data.Stable.Latest = true
+		releases = append(releases, data.Stable)
+	}
+	if data.Experimental.Version != "" {
+		data.Experimental.Latest = false
+		releases = append(releases, data.Experimental)
+	}
+
+	return releases, nil
+}
+
+func (vm *VersionManager) DownloadAndInstall(version string, progressCb func(percent int)) error {
+	if vm.Credentials == nil || vm.Credentials.Userkey == "" {
+		return fmt.Errorf("Factorio.com credentials required. Log in via Mod Portal first.")
+	}
+
+	downloadURL := fmt.Sprintf("https://factorio.com/get-download/%s/headless/linux64", version)
+
+	tmpFile, err := os.CreateTemp("", "factorio-download-*.tar.xz")
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+	defer os.Remove(tmpFile.Name())
+	defer tmpFile.Close()
+
+	req, err := http.NewRequest("GET", downloadURL, nil)
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+	req.SetBasicAuth(vm.Credentials.Username, vm.Credentials.Userkey)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("download failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("download failed with status %d (check your Factorio.com credentials)", resp.StatusCode)
+	}
+
+	contentLength := resp.ContentLength
+	pr := &ProgressReader{
+		Reader:     resp.Body,
+		Total:      contentLength,
+		OnProgress: progressCb,
+	}
+
+	_, err = io.Copy(tmpFile, pr)
+	if err != nil {
+		return fmt.Errorf("failed to save download: %w", err)
+	}
+	tmpFile.Close()
+
+	binDir := filepath.Dir(vm.FactorioBinary)
+	if err := os.MkdirAll(binDir, 0755); err != nil {
+		return fmt.Errorf("failed to create bin directory: %w", err)
+	}
+
+	err = extractTarXz(tmpFile.Name(), binDir)
+	if err != nil {
+		return fmt.Errorf("failed to extract: %w", err)
+	}
+
+	err = os.Chmod(vm.FactorioBinary, 0755)
+	if err != nil {
+		return fmt.Errorf("failed to make binary executable: %w", err)
+	}
+
+	return nil
+}
+
+type ProgressReader struct {
+	Reader     io.Reader
+	Total      int64
+	Current    int64
+	OnProgress func(percent int)
+}
+
+func (pr *ProgressReader) Read(p []byte) (int, error) {
+	n, err := pr.Reader.Read(p)
+	pr.Current += int64(n)
+	if pr.Total > 0 && pr.OnProgress != nil {
+		pct := int(float64(pr.Current) / float64(pr.Total) * 100)
+		pr.OnProgress(pct)
+	}
+	return n, err
+}
+
+func NewVersionManager() *VersionManager {
+	config := bootstrap.GetConfig()
+	var creds Credentials
+	creds.Load()
+	return &VersionManager{
+		FactorioDir:    config.FactorioDir,
+		FactorioBinary: config.FactorioBinary,
+		Credentials:    &creds,
+	}
+}
+
+func parseVersionLine(line string) (string, error) {
+	if idx := strings.Index(line, "Version:"); idx >= 0 {
+		rest := line[idx+len("Version:"):]
+		rest = strings.TrimSpace(rest)
+		if spaceIdx := strings.Index(rest, " "); spaceIdx > 0 {
+			return rest[:spaceIdx], nil
+		}
+		return rest, nil
+	}
+	lines := strings.Split(strings.TrimSpace(line), "\n")
+	if len(lines) > 0 {
+		return strings.TrimSpace(lines[0]), nil
+	}
+	return "", fmt.Errorf("could not parse version from: %s", line)
+}
+
+func extractTarXz(filePath string, destDir string) error {
+	f, err := os.Open(filePath)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	xzReader, err := xz.NewReader(f)
+	if err != nil {
+		return err
+	}
+
+	tarReader := tar.NewReader(xzReader)
+
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+
+		targetPath := header.Name
+		if strings.HasPrefix(targetPath, "factorio/") {
+			targetPath = targetPath[len("factorio/"):]
+		}
+		targetPath = filepath.Join(destDir, targetPath)
+
+		switch header.Typeflag {
+		case tar.TypeDir:
+			if err := os.MkdirAll(targetPath, 0755); err != nil {
+				return err
+			}
+		case tar.TypeReg:
+			if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil {
+				return err
+			}
+			outFile, err := os.Create(targetPath)
+			if err != nil {
+				return err
+			}
+			if _, err := io.Copy(outFile, tarReader); err != nil {
+				outFile.Close()
+				return err
+			}
+			outFile.Close()
+			if err := os.Chmod(targetPath, os.FileMode(header.Mode)); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/src/go.mod b/src/go.mod
index a0317317..527d22c8 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -31,6 +31,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
diff --git a/src/go.sum b/src/go.sum
index 1d72559b..a5efa7cb 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -57,6 +57,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
+github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index 9ed229f0..623ae877 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -15,6 +15,7 @@ import ServerSettings from "./views/ServerSettings";
 import GameSettings from "./views/GameSettings";
 import Console from "./views/Console";
 import Help from "./views/Help";
+import ServerVersion from "./views/ServerVersion";
 import socket from "../api/socket";
 import {Flash} from "./components/Flash";
 
@@ -69,6 +70,7 @@ const App = () => {
                         <Route path="logs" element={<Logs serverStatus={serverStatus}/>}/>
                         <Route path="user-management" element={<UserManagement serverStatus={serverStatus}/>}/>
                         <Route path="help" element={<Help serverStatus={serverStatus}/>}/>
+                        <Route path="server-version" element={<ServerVersion serverStatus={serverStatus}/>}/>
                     </Route>
                 </Route>
             </Routes>
diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 87ccd14f..dccc4443 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -73,6 +73,7 @@ const Layout = ({handleLogout, serverStatus}) => {
                             <Link to="/">{t('linkControls', { ns: 'layout' })}</Link>
                             <Link to="/saves">{t('linkSaves', { ns: 'layout' })}</Link>
                             <Link to="/mods">{t('linkMods', { ns: 'layout' })}</Link>
+                            <Link to="/server-version">{t('linkServerVersion', { ns: 'layout' })}</Link>
                             <Link to="/server-settings">{t('linkServerSettings', { ns: 'layout' })}</Link>
                             <Link to="/game-settings">{t('linkGameSettings', { ns: 'layout' })}</Link>
                             <Link to="/console">{t('linkConsole', { ns: 'layout' })}</Link>
diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
new file mode 100644
index 00000000..32644693
--- /dev/null
+++ b/ui/App/views/ServerVersion.jsx
@@ -0,0 +1,169 @@
+import React, {useEffect, useState} from "react";
+import { useTranslation } from 'react-i18next';
+import Panel from "../components/Panel";
+import Button from "../components/Button";
+import server from "../../api/resources/server";
+import socket from "../../api/socket";
+
+const ServerVersion = ({serverStatus}) => {
+
+    const { t } = useTranslation('serverVersion');
+    const [currentVersion, setCurrentVersion] = useState(null);
+    const [availableVersions, setAvailableVersions] = useState([]);
+    const [isLoading, setIsLoading] = useState(true);
+    const [isInstalling, setIsInstalling] = useState(false);
+    const [installVersion, setInstallVersion] = useState(null);
+    const [progress, setProgress] = useState(0);
+    const [error, setError] = useState(null);
+
+    const fetchData = async () => {
+        setIsLoading(true);
+        setError(null);
+        try {
+            const current = await server.version.current();
+            setCurrentVersion(current.version);
+        } catch (e) {
+            setError(t('fetchFailed'));
+        }
+        try {
+            const available = await server.version.available();
+            setAvailableVersions(available || []);
+        } catch (e) {
+            setError(t('fetchFailed'));
+        }
+        setIsLoading(false);
+    };
+
+    useEffect(() => {
+        fetchData();
+
+        const handleVersionMessage = (msg) => {
+            try {
+                const data = JSON.parse(typeof msg === 'string' ? msg : JSON.stringify(msg));
+                if (data.type === 'download_progress') {
+                    setProgress(data.percent);
+                } else if (data.type === 'install_complete') {
+                    setIsInstalling(false);
+                    setProgress(0);
+                    setCurrentVersion(data.version);
+                    window.flash(t('installSuccess').replace('{version}', data.version), "green");
+                }
+            } catch (e) {}
+        };
+
+        socket.on('server_version', handleVersionMessage);
+        return () => socket.off('server_version', handleVersionMessage);
+    }, []);
+
+    const handleInstall = async (version) => {
+        if (serverStatus && serverStatus.running) {
+            window.flash(t('serverMustBeStopped'), "red");
+            return;
+        }
+        setInstallVersion(version);
+        setIsInstalling(true);
+        setProgress(0);
+        setError(null);
+        try {
+            await server.version.install(version);
+        } catch (e) {
+            setError(t('installFailed').replace('{error}', e.message || ''));
+            setIsInstalling(false);
+        }
+    };
+
+    const hasUpdate = currentVersion && availableVersions.length > 0
+        && availableVersions[0].version !== currentVersion;
+
+    return (
+        <Panel
+            title={t('serverVersion')}
+            content={
+                <>
+                    {isLoading ? (
+                        <p className="text-gray-light">{t('checkingVersion')}</p>
+                    ) : (
+                        <>
+                            <div className="mb-6">
+                                <h2 className="text-dirty-white text-lg mb-2">{t('installedVersion')}</h2>
+                                <div className="bg-black rounded p-4 border border-gray-light">
+                                    <div className="flex items-center justify-between">
+                                        <div>
+                                            <span className="text-dirty-white font-bold">{currentVersion || t('unknown', { ns: 'common' })}</span>
+                                        </div>
+                                        <div>
+                                            {hasUpdate ? (
+                                                <span className="text-orange text-sm">{t('updateAvailable')}</span>
+                                            ) : (
+                                                <span className="text-green text-sm">{t('upToDate')}</span>
+                                            )}
+                                        </div>
+                                    </div>
+                                    {isInstalling && (
+                                        <div className="mt-3">
+                                            <div className="w-full bg-gray-dark rounded h-2">
+                                                <div
+                                                    className="bg-orange h-2 rounded transition-all duration-300"
+                                                    style={{width: `${progress}%`}}
+                                                />
+                                            </div>
+                                            <p className="text-sm text-gray-light mt-1">
+                                                {t('downloadProgress').replace('{percent}', progress)}
+                                            </p>
+                                        </div>
+                                    )}
+                                    {error && (
+                                        <p className="text-red text-sm mt-2">{error}</p>
+                                    )}
+                                </div>
+                            </div>
+
+                            <div>
+                                <h2 className="text-dirty-white text-lg mb-2">{t('availableVersions')}</h2>
+                                <div className="bg-black rounded border border-gray-light">
+                                    {availableVersions.length === 0 ? (
+                                        <p className="p-4 text-gray-light">{t('noInternet')}</p>
+                                    ) : (
+                                        <div className="divide-y divide-gray-light">
+                                            {availableVersions.map((release, i) => (
+                                                <div key={release.version} className="flex items-center justify-between p-3">
+                                                    <div className="flex items-center space-x-2">
+                                                        <span className="text-dirty-white">{release.version}</span>
+                                                        {i === 0 && (
+                                                            <span className="text-xs bg-green text-black px-1 rounded">{t('latest')}</span>
+                                                        )}
+                                                    </div>
+                                                    <Button
+                                                        size="sm"
+                                                        isLoading={isInstalling && installVersion === release.version}
+                                                        isDisabled={isInstalling || currentVersion === release.version}
+                                                        onClick={() => handleInstall(release.version)}
+                                                    >
+                                                        {currentVersion === release.version ? t('current') : t('install')}
+                                                    </Button>
+                                                </div>
+                                            ))}
+                                        </div>
+                                    )}
+                                </div>
+                            </div>
+
+                            {hasUpdate && !isInstalling && (
+                                <div className="mt-4 text-center">
+                                    <Button
+                                        type="success"
+                                        onClick={() => handleInstall(availableVersions[0].version)}
+                                    >
+                                        {t('updateTo').replace('{version}', availableVersions[0].version)}
+                                    </Button>
+                                </div>
+                            )}
+                        </>
+                    )}
+                </>
+            }
+        />
+    )
+};
+
+export default ServerVersion;
diff --git a/ui/api/resources/server.js b/ui/api/resources/server.js
index 38d8b548..0e63f8d4 100644
--- a/ui/api/resources/server.js
+++ b/ui/api/resources/server.js
@@ -24,5 +24,19 @@ export default {
     kill: async () => {
         const response = await client.get('/api/server/kill');
         return response.data;
+    },
+    version: {
+        current: async () => {
+            const response = await client.get('/api/server/version/current');
+            return response.data;
+        },
+        available: async () => {
+            const response = await client.get('/api/server/version/available');
+            return response.data;
+        },
+        install: async (version) => {
+            const response = await client.post('/api/server/version/install', { version });
+            return response.data;
+        }
     }
 }
\ No newline at end of file
diff --git a/ui/i18n.js b/ui/i18n.js
index d730fa9e..b72f8925 100644
--- a/ui/i18n.js
+++ b/ui/i18n.js
@@ -12,6 +12,7 @@ import enServerSettings from './locales/en/serverSettings.json';
 import enLogs from './locales/en/logs.json';
 import enConsole from './locales/en/console.json';
 import enUserManagement from './locales/en/userManagement.json';
+import enServerVersion from './locales/en/serverVersion.json';
 
 // Chinese locale files
 import zhCommon from './locales/zh-CN/common.json';
@@ -23,6 +24,7 @@ import zhServerSettings from './locales/zh-CN/serverSettings.json';
 import zhLogs from './locales/zh-CN/logs.json';
 import zhConsole from './locales/zh-CN/console.json';
 import zhUserManagement from './locales/zh-CN/userManagement.json';
+import zhServerVersion from './locales/zh-CN/serverVersion.json';
 
 const resources = {
   en: {
@@ -35,6 +37,7 @@ const resources = {
     logs: enLogs,
     console: enConsole,
     userManagement: enUserManagement,
+    serverVersion: enServerVersion,
   },
   'zh-CN': {
     common: zhCommon,
@@ -46,6 +49,7 @@ const resources = {
     logs: zhLogs,
     console: zhConsole,
     userManagement: zhUserManagement,
+    serverVersion: zhServerVersion,
   },
 };
 
diff --git a/ui/locales/en/layout.json b/ui/locales/en/layout.json
index 3b744066..83a7e7a9 100644
--- a/ui/locales/en/layout.json
+++ b/ui/locales/en/layout.json
@@ -6,6 +6,7 @@
   "linkControls": "Controls",
   "linkSaves": "Saves",
   "linkMods": "Mods",
+  "linkServerVersion": "Server Version",
   "linkServerSettings": "Server Settings",
   "linkGameSettings": "Game Settings",
   "linkConsole": "Console",
diff --git a/ui/locales/en/serverVersion.json b/ui/locales/en/serverVersion.json
new file mode 100644
index 00000000..1c94f397
--- /dev/null
+++ b/ui/locales/en/serverVersion.json
@@ -0,0 +1,22 @@
+{
+  "serverVersion": "Server Version",
+  "installedVersion": "Installed Version",
+  "availableVersions": "Available Versions",
+  "current": "Current",
+  "status": "Status",
+  "upToDate": "Up to date",
+  "updateAvailable": "Update Available",
+  "latest": "latest",
+  "install": "Install",
+  "updateTo": "Update to {version}",
+  "downloadProgress": "Downloading... {percent}%",
+  "downloadComplete": "Download complete.",
+  "installSuccess": "Factorio {version} installed successfully.",
+  "installFailed": "Installation failed: {error}",
+  "checkingVersion": "Checking version...",
+  "serverMustBeStopped": "Server must be stopped before updating.",
+  "confirmInstall": "Installing a new Factorio version will replace the current server binary. The server must be stopped. Continue?",
+  "noTokenError": "Factorio.com authentication required. Please log in via the Mods page first.",
+  "fetchFailed": "Failed to fetch available versions.",
+  "noInternet": "Cannot reach Factorio API. Check your internet connection."
+}
diff --git a/ui/locales/zh-CN/layout.json b/ui/locales/zh-CN/layout.json
index 84353f39..dcca2e8c 100644
--- a/ui/locales/zh-CN/layout.json
+++ b/ui/locales/zh-CN/layout.json
@@ -6,6 +6,7 @@
   "linkControls": "控制面板",
   "linkSaves": "存档",
   "linkMods": "模组",
+  "linkServerVersion": "服务器版本",
   "linkServerSettings": "服务器设置",
   "linkGameSettings": "游戏设置",
   "linkConsole": "控制台",
diff --git a/ui/locales/zh-CN/serverVersion.json b/ui/locales/zh-CN/serverVersion.json
new file mode 100644
index 00000000..b7a90be3
--- /dev/null
+++ b/ui/locales/zh-CN/serverVersion.json
@@ -0,0 +1,22 @@
+{
+  "serverVersion": "服务器版本",
+  "installedVersion": "已安装版本",
+  "availableVersions": "可用版本",
+  "current": "当前",
+  "status": "状态",
+  "upToDate": "已是最新",
+  "updateAvailable": "有新版本可用",
+  "latest": "最新",
+  "install": "安装",
+  "updateTo": "更新至 {version}",
+  "downloadProgress": "下载中... {percent}%",
+  "downloadComplete": "下载完成。",
+  "installSuccess": "Factorio {version} 安装成功。",
+  "installFailed": "安装失败: {error}",
+  "checkingVersion": "检查版本中...",
+  "serverMustBeStopped": "更新前必须停止服务器。",
+  "confirmInstall": "安装新版本将替换当前服务器二进制文件。服务器必须处于停止状态。确认继续？",
+  "noTokenError": "需要 Factorio.com 认证。请先在模组页面登录。",
+  "fetchFailed": "获取可用版本失败。",
+  "noInternet": "无法连接 Factorio API。请检查网络连接。"
+}

From 2ef2054449d9616efb2ded54f15c8580fdd0011b Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:01:06 +0000
Subject: [PATCH 012/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E5=99=A8?=
 =?UTF-8?q?=20API=20=E8=B7=AF=E7=94=B1=E6=B3=A8=E5=86=8C=20+=20Factorio=20?=
 =?UTF-8?q?API=20=E6=A0=BC=E5=BC=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routes.go               | 18 ++++++++++++++++++
 src/factorio/version_manager.go | 16 ++++++++--------
 src/go.mod                      |  3 ++-
 src/go.sum                      | 14 --------------
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/api/routes.go b/src/api/routes.go
index 8388cb53..dd957fad 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -265,6 +265,24 @@ var apiRoutes = Routes{
 		"/settings/update",
 		UpdateServerSettings,
 		false,
+	}, {
+		"GetCurrentVersion",
+		"GET",
+		"/server/version/current",
+		GetCurrentVersion,
+		false,
+	}, {
+		"GetAvailableVersions",
+		"GET",
+		"/server/version/available",
+		GetAvailableVersions,
+		false,
+	}, {
+		"InstallVersion",
+		"POST",
+		"/server/version/install",
+		InstallVersion,
+		true,
 	},
 	// Mod Portal Stuff
 	{
diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index ae694cc5..64ccbc76 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -21,9 +21,11 @@ type Release struct {
 	Latest  bool   `json:"latest,omitempty"`
 }
 
+type VersionData map[string]string
+
 type DownloadsResponse struct {
-	Stable       Release `json:"stable"`
-	Experimental Release `json:"experimental"`
+	Stable       VersionData `json:"stable"`
+	Experimental VersionData `json:"experimental"`
 }
 
 type VersionManager struct {
@@ -55,13 +57,11 @@ func (vm *VersionManager) GetAvailableVersions() ([]Release, error) {
 	}
 
 	releases := []Release{}
-	if data.Stable.Version != "" {
-		data.Stable.Latest = true
-		releases = append(releases, data.Stable)
+	if v, ok := data.Stable["headless"]; ok && v != "" {
+		releases = append(releases, Release{Version: v, Stable: true, Latest: true})
 	}
-	if data.Experimental.Version != "" {
-		data.Experimental.Latest = false
-		releases = append(releases, data.Experimental)
+	if v, ok := data.Experimental["headless"]; ok && v != "" {
+		releases = append(releases, Release{Version: v, Stable: false, Latest: false})
 	}
 
 	return releases, nil
diff --git a/src/go.mod b/src/go.mod
index 527d22c8..7976cc94 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -20,6 +20,8 @@ require (
 	gorm.io/gorm v1.25.5
 )
 
+require github.com/ulikunitz/xz v0.5.15
+
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -31,7 +33,6 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
diff --git a/src/go.sum b/src/go.sum
index a5efa7cb..c66be843 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -17,8 +17,6 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
@@ -39,8 +37,6 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -50,7 +46,6 @@ github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -67,7 +62,6 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -85,19 +79,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
 gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
-modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
 modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs=
 modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
 modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
-modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
 modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=

From 4400b99bf39ab17a423d62f76ce84ab166d63ff7 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:02:40 +0000
Subject: [PATCH 013/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=E5=8C=BA=E5=88=86=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E7=89=88=EF=BC=88=E7=BB=BF=E8=89=B2=EF=BC=89=E4=B8=8E=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=89=88=EF=BC=88=E6=A9=99=E8=89=B2=EF=BC=89=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/ServerVersion.jsx      | 7 ++++++-
 ui/locales/en/serverVersion.json    | 2 ++
 ui/locales/zh-CN/serverVersion.json | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
index 32644693..a3228c91 100644
--- a/ui/App/views/ServerVersion.jsx
+++ b/ui/App/views/ServerVersion.jsx
@@ -129,8 +129,13 @@ const ServerVersion = ({serverStatus}) => {
                                                 <div key={release.version} className="flex items-center justify-between p-3">
                                                     <div className="flex items-center space-x-2">
                                                         <span className="text-dirty-white">{release.version}</span>
+                                                        {release.stable ? (
+                                                            <span className="text-xs bg-green text-black px-1 rounded">{t('stable')}</span>
+                                                        ) : (
+                                                            <span className="text-xs bg-orange text-black px-1 rounded">{t('experimental')}</span>
+                                                        )}
                                                         {i === 0 && (
-                                                            <span className="text-xs bg-green text-black px-1 rounded">{t('latest')}</span>
+                                                            <span className="text-xs bg-blue text-white px-1 rounded">{t('latest')}</span>
                                                         )}
                                                     </div>
                                                     <Button
diff --git a/ui/locales/en/serverVersion.json b/ui/locales/en/serverVersion.json
index 1c94f397..f658c58f 100644
--- a/ui/locales/en/serverVersion.json
+++ b/ui/locales/en/serverVersion.json
@@ -7,6 +7,8 @@
   "upToDate": "Up to date",
   "updateAvailable": "Update Available",
   "latest": "latest",
+  "stable": "stable",
+  "experimental": "experimental",
   "install": "Install",
   "updateTo": "Update to {version}",
   "downloadProgress": "Downloading... {percent}%",
diff --git a/ui/locales/zh-CN/serverVersion.json b/ui/locales/zh-CN/serverVersion.json
index b7a90be3..bdebe0a4 100644
--- a/ui/locales/zh-CN/serverVersion.json
+++ b/ui/locales/zh-CN/serverVersion.json
@@ -7,6 +7,8 @@
   "upToDate": "已是最新",
   "updateAvailable": "有新版本可用",
   "latest": "最新",
+  "stable": "稳定版",
+  "experimental": "测试版",
   "install": "安装",
   "updateTo": "更新至 {version}",
   "downloadProgress": "下载中... {percent}%",

From b77795c44620d3854c1f1c442285ff150eb30da6 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:10:10 +0000
Subject: [PATCH 014/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=89=E8=A3=85=E8=A7=A3=E5=8E=8B=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=BA=20FactorioDir=20=E6=A0=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/version_manager.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index 64ccbc76..014d1c37 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -115,7 +115,7 @@ func (vm *VersionManager) DownloadAndInstall(version string, progressCb func(per
 		return fmt.Errorf("failed to create bin directory: %w", err)
 	}
 
-	err = extractTarXz(tmpFile.Name(), binDir)
+	err = extractTarXz(tmpFile.Name(), vm.FactorioDir)
 	if err != nil {
 		return fmt.Errorf("failed to extract: %w", err)
 	}

From a5a01e4d17a2b497ec5b02909b860e296c7fb931 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:16:53 +0000
Subject: [PATCH 015/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=20updater.factorio.com=20=E5=AE=8C=E6=95=B4=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E9=99=8D=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routes.go                   |  6 ++++
 src/api/version_handler.go          | 15 ++++++++++
 src/factorio/version_manager.go     | 46 +++++++++++++++++++++++++++++
 ui/App/views/ServerVersion.jsx      | 39 ++++++++++++++++++++----
 ui/api/resources/server.js          |  4 +++
 ui/locales/en/serverVersion.json    |  4 ++-
 ui/locales/zh-CN/serverVersion.json |  4 ++-
 7 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/src/api/routes.go b/src/api/routes.go
index dd957fad..2106b2c8 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -277,6 +277,12 @@ var apiRoutes = Routes{
 		"/server/version/available",
 		GetAvailableVersions,
 		false,
+	}, {
+		"GetFullVersionList",
+		"GET",
+		"/server/version/list",
+		GetFullVersionList,
+		false,
 	}, {
 		"InstallVersion",
 		"POST",
diff --git a/src/api/version_handler.go b/src/api/version_handler.go
index d678e55b..893448c8 100644
--- a/src/api/version_handler.go
+++ b/src/api/version_handler.go
@@ -40,6 +40,21 @@ func GetAvailableVersions(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(releases)
 }
 
+func GetFullVersionList(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	vm := factorio.NewVersionManager()
+	releases, err := vm.GetFullVersionList()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(releases)
+}
+
 func InstallVersion(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
 
diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index 014d1c37..bd194547 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -67,6 +67,52 @@ func (vm *VersionManager) GetAvailableVersions() ([]Release, error) {
 	return releases, nil
 }
 
+type UpdaterResponse map[string][]struct {
+	From string `json:"from"`
+	To   string `json:"to"`
+}
+
+func (vm *VersionManager) GetFullVersionList() ([]Release, error) {
+	if vm.Credentials == nil || vm.Credentials.Userkey == "" {
+		return nil, fmt.Errorf("Factorio.com credentials required")
+	}
+
+	url := fmt.Sprintf("https://updater.factorio.com/get-available-versions?username=%s&token=%s&apiVersion=2",
+		vm.Credentials.Username, vm.Credentials.Userkey)
+
+	resp, err := http.Get(url)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch version list: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var data UpdaterResponse
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return nil, fmt.Errorf("failed to parse version list: %w", err)
+	}
+
+	seen := make(map[string]bool)
+	releases := []Release{}
+
+	updates, ok := data["core-linux_headless64"]
+	if !ok {
+		return nil, fmt.Errorf("no headless packages found")
+	}
+
+	for _, u := range updates {
+		if !seen[u.To] {
+			seen[u.To] = true
+			releases = append(releases, Release{Version: u.To, Stable: false, Latest: false})
+		}
+	}
+
+	if len(releases) > 0 {
+		releases[len(releases)-1].Stable = false
+	}
+
+	return releases, nil
+}
+
 func (vm *VersionManager) DownloadAndInstall(version string, progressCb func(percent int)) error {
 	if vm.Credentials == nil || vm.Credentials.Userkey == "" {
 		return fmt.Errorf("Factorio.com credentials required. Log in via Mod Portal first.")
diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
index a3228c91..3fb07c5f 100644
--- a/ui/App/views/ServerVersion.jsx
+++ b/ui/App/views/ServerVersion.jsx
@@ -15,6 +15,8 @@ const ServerVersion = ({serverStatus}) => {
     const [installVersion, setInstallVersion] = useState(null);
     const [progress, setProgress] = useState(0);
     const [error, setError] = useState(null);
+    const [showAll, setShowAll] = useState(false);
+    const [allVersions, setAllVersions] = useState([]);
 
     const fetchData = async () => {
         setIsLoading(true);
@@ -55,6 +57,25 @@ const ServerVersion = ({serverStatus}) => {
         return () => socket.off('server_version', handleVersionMessage);
     }, []);
 
+    const toggleAllVersions = async () => {
+        if (showAll) {
+            setShowAll(false);
+            return;
+        }
+        if (allVersions.length === 0) {
+            try {
+                const list = await server.version.list();
+                setAllVersions(list || []);
+            } catch (e) {
+                setError(t('fetchFailed'));
+                return;
+            }
+        }
+        setShowAll(true);
+    };
+
+    const displayVersions = showAll && allVersions.length > 0 ? allVersions : availableVersions;
+
     const handleInstall = async (version) => {
         if (serverStatus && serverStatus.running) {
             window.flash(t('serverMustBeStopped'), "red");
@@ -121,20 +142,20 @@ const ServerVersion = ({serverStatus}) => {
                             <div>
                                 <h2 className="text-dirty-white text-lg mb-2">{t('availableVersions')}</h2>
                                 <div className="bg-black rounded border border-gray-light">
-                                    {availableVersions.length === 0 ? (
+                                    {displayVersions.length === 0 ? (
                                         <p className="p-4 text-gray-light">{t('noInternet')}</p>
                                     ) : (
                                         <div className="divide-y divide-gray-light">
-                                            {availableVersions.map((release, i) => (
+                                            {displayVersions.map((release, i) => (
                                                 <div key={release.version} className="flex items-center justify-between p-3">
                                                     <div className="flex items-center space-x-2">
                                                         <span className="text-dirty-white">{release.version}</span>
-                                                        {release.stable ? (
+                                                        {!showAll && release.stable ? (
                                                             <span className="text-xs bg-green text-black px-1 rounded">{t('stable')}</span>
-                                                        ) : (
+                                                        ) : (!showAll ? (
                                                             <span className="text-xs bg-orange text-black px-1 rounded">{t('experimental')}</span>
-                                                        )}
-                                                        {i === 0 && (
+                                                        ) : null)}
+                                                        {!showAll && i === 0 && (
                                                             <span className="text-xs bg-blue text-white px-1 rounded">{t('latest')}</span>
                                                         )}
                                                     </div>
@@ -153,6 +174,12 @@ const ServerVersion = ({serverStatus}) => {
                                 </div>
                             </div>
 
+                            <div className="mt-2 text-center">
+                                <Button size="sm" type="default" onClick={toggleAllVersions}>
+                                    {showAll ? t('showLatest') : t('showAll')}
+                                </Button>
+                            </div>
+
                             {hasUpdate && !isInstalling && (
                                 <div className="mt-4 text-center">
                                     <Button
diff --git a/ui/api/resources/server.js b/ui/api/resources/server.js
index 0e63f8d4..7bfea169 100644
--- a/ui/api/resources/server.js
+++ b/ui/api/resources/server.js
@@ -34,6 +34,10 @@ export default {
             const response = await client.get('/api/server/version/available');
             return response.data;
         },
+        list: async () => {
+            const response = await client.get('/api/server/version/list');
+            return response.data;
+        },
         install: async (version) => {
             const response = await client.post('/api/server/version/install', { version });
             return response.data;
diff --git a/ui/locales/en/serverVersion.json b/ui/locales/en/serverVersion.json
index f658c58f..5cd1043c 100644
--- a/ui/locales/en/serverVersion.json
+++ b/ui/locales/en/serverVersion.json
@@ -20,5 +20,7 @@
   "confirmInstall": "Installing a new Factorio version will replace the current server binary. The server must be stopped. Continue?",
   "noTokenError": "Factorio.com authentication required. Please log in via the Mods page first.",
   "fetchFailed": "Failed to fetch available versions.",
-  "noInternet": "Cannot reach Factorio API. Check your internet connection."
+  "noInternet": "Cannot reach Factorio API. Check your internet connection.",
+  "showAll": "Show All Versions",
+  "showLatest": "Show Latest Only"
 }
diff --git a/ui/locales/zh-CN/serverVersion.json b/ui/locales/zh-CN/serverVersion.json
index bdebe0a4..6ad4ff45 100644
--- a/ui/locales/zh-CN/serverVersion.json
+++ b/ui/locales/zh-CN/serverVersion.json
@@ -20,5 +20,7 @@
   "confirmInstall": "安装新版本将替换当前服务器二进制文件。服务器必须处于停止状态。确认继续？",
   "noTokenError": "需要 Factorio.com 认证。请先在模组页面登录。",
   "fetchFailed": "获取可用版本失败。",
-  "noInternet": "无法连接 Factorio API。请检查网络连接。"
+  "noInternet": "无法连接 Factorio API。请检查网络连接。",
+  "showAll": "显示全部版本",
+  "showLatest": "仅显示最新"
 }

From d86220260da36c7c57dbb335375f231bceb912f7 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:19:37 +0000
Subject: [PATCH 016/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E7=89=88=E6=9C=AC=E5=88=97=E8=A1=A8=E6=8C=89=E7=A8=B3?=
 =?UTF-8?q?=E5=AE=9A=E7=89=88/=E6=B5=8B=E8=AF=95=E7=89=88=E5=88=86?=
 =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E4=BB=8E=E6=96=B0=E5=88=B0=E6=97=A7=E6=8E=92?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/version_manager.go | 16 ++++++-
 ui/App/views/ServerVersion.jsx  | 76 +++++++++++++++++++++++----------
 2 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index bd194547..c43045a1 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -102,7 +102,11 @@ func (vm *VersionManager) GetFullVersionList() ([]Release, error) {
 	for _, u := range updates {
 		if !seen[u.To] {
 			seen[u.To] = true
-			releases = append(releases, Release{Version: u.To, Stable: false, Latest: false})
+			releases = append(releases, Release{
+				Version: u.To,
+				Stable:  isStableVersion(u.To),
+				Latest:  false,
+			})
 		}
 	}
 
@@ -202,6 +206,16 @@ func NewVersionManager() *VersionManager {
 	}
 }
 
+func isStableVersion(version string) bool {
+	parts := strings.Split(version, ".")
+	if len(parts) < 3 {
+		return false
+	}
+	var patch int
+	fmt.Sscanf(parts[len(parts)-1], "%d", &patch)
+	return patch%2 == 0
+}
+
 func parseVersionLine(line string) (string, error) {
 	if idx := strings.Index(line, "Version:"); idx >= 0 {
 		rest := line[idx+len("Version:"):]
diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
index 3fb07c5f..bd723d2d 100644
--- a/ui/App/views/ServerVersion.jsx
+++ b/ui/App/views/ServerVersion.jsx
@@ -76,6 +76,33 @@ const ServerVersion = ({serverStatus}) => {
 
     const displayVersions = showAll && allVersions.length > 0 ? allVersions : availableVersions;
 
+    const stableReleases = displayVersions.filter(r => r.stable);
+    const experimentalReleases = displayVersions.filter(r => !r.stable);
+
+    const renderVersionRow = (release) => (
+        <div key={release.version} className="flex items-center justify-between p-3">
+            <div className="flex items-center space-x-2">
+                <span className="text-dirty-white">{release.version}</span>
+                {!showAll && release.stable ? (
+                    <span className="text-xs bg-green text-black px-1 rounded">{t('stable')}</span>
+                ) : (!showAll ? (
+                    <span className="text-xs bg-orange text-black px-1 rounded">{t('experimental')}</span>
+                ) : null)}
+                {!showAll && displayVersions.indexOf(release) === 0 && (
+                    <span className="text-xs bg-blue text-white px-1 rounded">{t('latest')}</span>
+                )}
+            </div>
+            <Button
+                size="sm"
+                isLoading={isInstalling && installVersion === release.version}
+                isDisabled={isInstalling || currentVersion === release.version}
+                onClick={() => handleInstall(release.version)}
+            >
+                {currentVersion === release.version ? t('current') : t('install')}
+            </Button>
+        </div>
+    );
+
     const handleInstall = async (version) => {
         if (serverStatus && serverStatus.running) {
             window.flash(t('serverMustBeStopped'), "red");
@@ -144,31 +171,34 @@ const ServerVersion = ({serverStatus}) => {
                                 <div className="bg-black rounded border border-gray-light">
                                     {displayVersions.length === 0 ? (
                                         <p className="p-4 text-gray-light">{t('noInternet')}</p>
-                                    ) : (
-                                        <div className="divide-y divide-gray-light">
-                                            {displayVersions.map((release, i) => (
-                                                <div key={release.version} className="flex items-center justify-between p-3">
-                                                    <div className="flex items-center space-x-2">
-                                                        <span className="text-dirty-white">{release.version}</span>
-                                                        {!showAll && release.stable ? (
-                                                            <span className="text-xs bg-green text-black px-1 rounded">{t('stable')}</span>
-                                                        ) : (!showAll ? (
-                                                            <span className="text-xs bg-orange text-black px-1 rounded">{t('experimental')}</span>
-                                                        ) : null)}
-                                                        {!showAll && i === 0 && (
-                                                            <span className="text-xs bg-blue text-white px-1 rounded">{t('latest')}</span>
-                                                        )}
+                                    ) : showAll ? (
+                                        <div>
+                                            {stableReleases.length > 0 && (
+                                                <div className="mb-4">
+                                                    <div className="px-3 py-2 bg-gray-dark">
+                                                        <span className="text-green font-bold">{t('stable')}</span>
+                                                        <span className="text-gray-light text-sm ml-2">({stableReleases.length})</span>
+                                                    </div>
+                                                    <div className="divide-y divide-gray-light">
+                                                        {stableReleases.map(r => renderVersionRow(r))}
+                                                    </div>
+                                                </div>
+                                            )}
+                                            {experimentalReleases.length > 0 && (
+                                                <div>
+                                                    <div className="px-3 py-2 bg-gray-dark">
+                                                        <span className="text-orange font-bold">{t('experimental')}</span>
+                                                        <span className="text-gray-light text-sm ml-2">({experimentalReleases.length})</span>
+                                                    </div>
+                                                    <div className="divide-y divide-gray-light">
+                                                        {experimentalReleases.map(r => renderVersionRow(r))}
                                                     </div>
-                                                    <Button
-                                                        size="sm"
-                                                        isLoading={isInstalling && installVersion === release.version}
-                                                        isDisabled={isInstalling || currentVersion === release.version}
-                                                        onClick={() => handleInstall(release.version)}
-                                                    >
-                                                        {currentVersion === release.version ? t('current') : t('install')}
-                                                    </Button>
                                                 </div>
-                                            ))}
+                                            )}
+                                        </div>
+                                    ) : (
+                                        <div className="divide-y divide-gray-light">
+                                            {displayVersions.map((release, i) => renderVersionRow(release))}
                                         </div>
                                     )}
                                 </div>

From 81c44649ad33af7f090721c4a6068451f7c3b400 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:21:33 +0000
Subject: [PATCH 017/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8E=92=E5=BA=8F=E2=80=94=E2=80=94=E6=8C=89=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E4=BB=8E=E6=96=B0=E5=88=B0=E6=97=A7=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/version_manager.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index c43045a1..ee9bace3 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
@@ -114,6 +115,10 @@ func (vm *VersionManager) GetFullVersionList() ([]Release, error) {
 		releases[len(releases)-1].Stable = false
 	}
 
+	sort.Slice(releases, func(i, j int) bool {
+		return compareVersions(releases[i].Version, releases[j].Version) > 0
+	})
+
 	return releases, nil
 }
 
@@ -216,6 +221,33 @@ func isStableVersion(version string) bool {
 	return patch%2 == 0
 }
 
+func compareVersions(a, b string) int {
+	aParts := strings.Split(a, ".")
+	bParts := strings.Split(b, ".")
+
+	maxLen := len(aParts)
+	if len(bParts) > maxLen {
+		maxLen = len(bParts)
+	}
+
+	for i := 0; i < maxLen; i++ {
+		var aNum, bNum int
+		if i < len(aParts) {
+			fmt.Sscanf(aParts[i], "%d", &aNum)
+		}
+		if i < len(bParts) {
+			fmt.Sscanf(bParts[i], "%d", &bNum)
+		}
+		if aNum > bNum {
+			return 1
+		}
+		if aNum < bNum {
+			return -1
+		}
+	}
+	return 0
+}
+
 func parseVersionLine(line string) (string, error) {
 	if idx := strings.Index(line, "Version:"); idx >= 0 {
 		rest := line[idx+len("Version:"):]

From f84df0a1c98e39a74be3edaea257b07f095cc80c Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:27:31 +0000
Subject: [PATCH 018/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=AE=A2=E9=98=85=20server=5Fversion=20WebSocket=20?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E4=BB=A5=E6=8E=A5=E6=94=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/ServerVersion.jsx |  1 +
 ui/api/socket.js               | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
index bd723d2d..6a965962 100644
--- a/ui/App/views/ServerVersion.jsx
+++ b/ui/App/views/ServerVersion.jsx
@@ -38,6 +38,7 @@ const ServerVersion = ({serverStatus}) => {
 
     useEffect(() => {
         fetchData();
+        socket.emit('server version subscribe');
 
         const handleVersionMessage = (msg) => {
             try {
diff --git a/ui/api/socket.js b/ui/api/socket.js
index 14b6ea2c..ce494105 100644
--- a/ui/api/socket.js
+++ b/ui/api/socket.js
@@ -63,11 +63,26 @@ function connect() {
         );
     }
 
+    function serverVersionSubscribeEvent() {
+        socket.send(
+            JSON.stringify(
+                {
+                    room_name: "",
+                    controls: {
+                        type: "subscribe",
+                        value: "server_version"
+                    }
+                }
+            )
+        );
+    }
+
     function registerEventEmitter() {
         bus.on('log subscribe', logSubscribeEvent);
         bus.on('log unsubscribe', logUnsubscribeEvent);
         bus.on('server status subscribe', serverStatusSubscribeEvent);
         bus.on('command send', commandSendEvent);
+        bus.on('server version subscribe', serverVersionSubscribeEvent);
     }
 
     function unregisterEventEmitter() {
@@ -75,6 +90,7 @@ function connect() {
         bus.off('log unsubscribe', logUnsubscribeEvent);
         bus.off('server status subscribe', serverStatusSubscribeEvent);
         bus.off('command send', commandSendEvent);
+        bus.off('server version subscribe', serverVersionSubscribeEvent);
     }
 
     socket.onmessage = e => {

From 01376eba0846bd944462130804cf6d285b05a577 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 07:37:11 +0000
Subject: [PATCH 019/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20axios=20=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E5=99=A8=E5=A4=84=E7=90=86=E8=B6=85=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=20=20+=20=E5=AE=89=E8=A3=85=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=B6=85=E6=97=B6=E8=AE=BE=E4=B8=BA=2010=20=E5=88=86?=
 =?UTF-8?q?=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/api/client.js           | 4 ++++
 ui/api/resources/server.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/api/client.js b/ui/api/client.js
index 4c93ac1a..911935b2 100644
--- a/ui/api/client.js
+++ b/ui/api/client.js
@@ -8,6 +8,10 @@ const client = Axios.create({
 });
 
 client.interceptors.response.use(res => res, err => {
+    if (!err.response) {
+        window.flash("Network error or request timeout", "red");
+        return Promise.reject(err);
+    }
     if(err.response.status === 502) {
         window.flash("Service not available", "red");
     } else if (err.response.status !== 401) {
diff --git a/ui/api/resources/server.js b/ui/api/resources/server.js
index 7bfea169..db7222e7 100644
--- a/ui/api/resources/server.js
+++ b/ui/api/resources/server.js
@@ -39,7 +39,7 @@ export default {
             return response.data;
         },
         install: async (version) => {
-            const response = await client.post('/api/server/version/install', { version });
+            const response = await client.post('/api/server/version/install', { version }, { timeout: 600000 });
             return response.data;
         }
     }

From 6f3fda8a836c4043518a0b93f72300a2ab3041f0 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 08:44:06 +0000
Subject: [PATCH 020/112] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=94=B9=E4=B8=BA=E5=BC=82=E6=AD=A5=E2=80=94=E2=80=94?=
 =?UTF-8?q?API=20=E7=A7=92=E5=9B=9E=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=9C=A8?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=8C=E8=BF=9B=E5=BA=A6=E9=9D=A0=20WebSoc?=
 =?UTF-8?q?ket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routes.go              |  6 ++++
 src/api/version_handler.go     | 63 ++++++++++++++++++++++++++--------
 src/factorio/version_status.go | 25 ++++++++++++++
 ui/App/views/ServerVersion.jsx | 18 +++++++++-
 ui/api/resources/server.js     |  6 +++-
 5 files changed, 101 insertions(+), 17 deletions(-)
 create mode 100644 src/factorio/version_status.go

diff --git a/src/api/routes.go b/src/api/routes.go
index 2106b2c8..3819a08b 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -289,6 +289,12 @@ var apiRoutes = Routes{
 		"/server/version/install",
 		InstallVersion,
 		true,
+	}, {
+		"GetInstallStatus",
+		"GET",
+		"/server/version/install-status",
+		GetInstallStatus,
+		false,
 	},
 	// Mod Portal Stuff
 	{
diff --git a/src/api/version_handler.go b/src/api/version_handler.go
index 893448c8..bd3d6bc4 100644
--- a/src/api/version_handler.go
+++ b/src/api/version_handler.go
@@ -67,26 +67,59 @@ func InstallVersion(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	vm := factorio.NewVersionManager()
-	wsRoom := websocket.WebsocketHub.GetRoom("server_version")
-
-	err := vm.DownloadAndInstall(data.Version, func(percent int) {
-		msg := fmt.Sprintf(`{"type":"download_progress","version":"%s","percent":%d}`, data.Version, percent)
-		wsRoom.Send(string(msg))
-	})
-
-	if err != nil {
-		log.Printf("Version install error: %v", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
+	status := factorio.GetInstallStatus()
+	if status.Installing {
+		w.WriteHeader(http.StatusConflict)
+		json.NewEncoder(w).Encode(map[string]string{"error": "installation already in progress"})
 		return
 	}
 
-	wsRoom.Send(fmt.Sprintf(`{"type":"install_complete","version":"%s"}`, data.Version))
+	factorio.SetInstallStatus(factorio.InstallStatus{
+		Installing: true,
+		Version:    data.Version,
+		Progress:   0,
+	})
 
-	w.WriteHeader(http.StatusOK)
+	go func() {
+		vm := factorio.NewVersionManager()
+		wsRoom := websocket.WebsocketHub.GetRoom("server_version")
+
+		err := vm.DownloadAndInstall(data.Version, func(percent int) {
+			factorio.SetInstallStatus(factorio.InstallStatus{
+				Installing: true,
+				Version:    data.Version,
+				Progress:   percent,
+			})
+			msg := fmt.Sprintf(`{"type":"download_progress","version":"%s","percent":%d}`, data.Version, percent)
+			wsRoom.Send(string(msg))
+		})
+
+		if err != nil {
+			log.Printf("Version install error: %v", err)
+			factorio.SetInstallStatus(factorio.InstallStatus{
+				Installing: false,
+				Version:    data.Version,
+				Progress:   100,
+				Error:      err.Error(),
+			})
+			wsRoom.Send(fmt.Sprintf(`{"type":"install_error","version":"%s","error":"%s"}`, data.Version, err.Error()))
+			return
+		}
+
+		factorio.SetInstallStatus(factorio.InstallStatus{})
+		wsRoom.Send(fmt.Sprintf(`{"type":"install_complete","version":"%s"}`, data.Version))
+	}()
+
+	w.WriteHeader(http.StatusAccepted)
 	json.NewEncoder(w).Encode(map[string]string{
-		"status":  "ok",
+		"status":  "started",
 		"version": data.Version,
 	})
 }
+
+func GetInstallStatus(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+	status := factorio.GetInstallStatus()
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(status)
+}
diff --git a/src/factorio/version_status.go b/src/factorio/version_status.go
new file mode 100644
index 00000000..633dfcc5
--- /dev/null
+++ b/src/factorio/version_status.go
@@ -0,0 +1,25 @@
+package factorio
+
+import "sync"
+
+type InstallStatus struct {
+	Installing bool   `json:"installing"`
+	Version    string `json:"version"`
+	Progress   int    `json:"progress"`
+	Error      string `json:"error,omitempty"`
+}
+
+var installMu sync.Mutex
+var currentInstall InstallStatus
+
+func GetInstallStatus() InstallStatus {
+	installMu.Lock()
+	defer installMu.Unlock()
+	return currentInstall
+}
+
+func SetInstallStatus(s InstallStatus) {
+	installMu.Lock()
+	defer installMu.Unlock()
+	currentInstall = s
+}
diff --git a/ui/App/views/ServerVersion.jsx b/ui/App/views/ServerVersion.jsx
index 6a965962..1f92327b 100644
--- a/ui/App/views/ServerVersion.jsx
+++ b/ui/App/views/ServerVersion.jsx
@@ -40,6 +40,15 @@ const ServerVersion = ({serverStatus}) => {
         fetchData();
         socket.emit('server version subscribe');
 
+        (async () => {
+            const status = await server.version.installStatus();
+            if (status && status.installing) {
+                setIsInstalling(true);
+                setInstallVersion(status.version);
+                setProgress(status.progress);
+            }
+        })();
+
         const handleVersionMessage = (msg) => {
             try {
                 const data = JSON.parse(typeof msg === 'string' ? msg : JSON.stringify(msg));
@@ -49,7 +58,13 @@ const ServerVersion = ({serverStatus}) => {
                     setIsInstalling(false);
                     setProgress(0);
                     setCurrentVersion(data.version);
+                    setInstallVersion(null);
                     window.flash(t('installSuccess').replace('{version}', data.version), "green");
+                } else if (data.type === 'install_error') {
+                    setIsInstalling(false);
+                    setProgress(0);
+                    setInstallVersion(null);
+                    setError(data.error || 'Unknown error');
                 }
             } catch (e) {}
         };
@@ -116,8 +131,9 @@ const ServerVersion = ({serverStatus}) => {
         try {
             await server.version.install(version);
         } catch (e) {
-            setError(t('installFailed').replace('{error}', e.message || ''));
+            setError(t('installFailed').replace('{error}', e.response?.data?.error || e.message || ''));
             setIsInstalling(false);
+            setInstallVersion(null);
         }
     };
 
diff --git a/ui/api/resources/server.js b/ui/api/resources/server.js
index db7222e7..7b5383e7 100644
--- a/ui/api/resources/server.js
+++ b/ui/api/resources/server.js
@@ -39,7 +39,11 @@ export default {
             return response.data;
         },
         install: async (version) => {
-            const response = await client.post('/api/server/version/install', { version }, { timeout: 600000 });
+            const response = await client.post('/api/server/version/install', { version });
+            return response.data;
+        },
+        installStatus: async () => {
+            const response = await client.get('/api/server/version/install-status');
             return response.data;
         }
     }

From 74e3d64098350068d9347340520f3426788400f3 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 08:59:54 +0000
Subject: [PATCH 021/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E5=AE=8C=E6=88=90=E5=90=8E=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=20FSM=20=E5=86=85=E5=AD=98=E4=B8=AD=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/version_handler.go      |  4 ++++
 src/factorio/version_manager.go | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/api/version_handler.go b/src/api/version_handler.go
index bd3d6bc4..8c6ba014 100644
--- a/src/api/version_handler.go
+++ b/src/api/version_handler.go
@@ -106,6 +106,10 @@ func InstallVersion(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		if err := factorio.RefreshServerVersion(); err != nil {
+			log.Printf("Failed to refresh server version: %v", err)
+		}
+
 		factorio.SetInstallStatus(factorio.InstallStatus{})
 		wsRoom.Send(fmt.Sprintf(`{"type":"install_complete","version":"%s"}`, data.Version))
 	}()
diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index ee9bace3..c40eadc6 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -5,10 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -200,6 +202,37 @@ func (pr *ProgressReader) Read(p []byte) (int, error) {
 	return n, err
 }
 
+func RefreshServerVersion() error {
+	server := GetFactorioServer()
+	config := bootstrap.GetConfig()
+
+	out, err := exec.Command(config.FactorioBinary, "--version").Output()
+	if err != nil {
+		return fmt.Errorf("failed to read version: %w", err)
+	}
+
+	reg := regexp.MustCompile("Version.*?((\\d+\\.)?(\\d+\\.)?(\\*|\\d+)+)")
+	found := reg.FindStringSubmatch(string(out))
+	if len(found) < 2 {
+		return fmt.Errorf("could not parse version from: %s", string(out))
+	}
+
+	if err := server.Version.UnmarshalText([]byte(found[1])); err != nil {
+		return fmt.Errorf("could not parse version: %w", err)
+	}
+
+	baseModInfoFile := filepath.Join(config.FactorioBaseModDir, "info.json")
+	bmifBa, err := ioutil.ReadFile(baseModInfoFile)
+	if err == nil {
+		var modInfo ModInfo
+		if err := json.Unmarshal(bmifBa, &modInfo); err == nil {
+			server.BaseModVersion = modInfo.Version
+		}
+	}
+
+	return nil
+}
+
 func NewVersionManager() *VersionManager {
 	config := bootstrap.GetConfig()
 	var creds Credentials

From 8657f7981697b2dfef6f91ed63f52793dbac5c64 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 09:43:17 +0000
Subject: [PATCH 022/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=202.0=20=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3=E8=A7=A3=E6=9E=90=E2=80=94=E2=80=94Python=20=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E8=84=9A=E6=9C=AC=20+=20Go=20fallback=20=E5=85=B1?=
 =?UTF-8?q?=E5=AD=98=E5=8F=8C=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mods_handler.go | 48 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/api/mods_handler.go b/src/api/mods_handler.go
index dcc1508b..be77880e 100644
--- a/src/api/mods_handler.go
+++ b/src/api/mods_handler.go
@@ -2,12 +2,14 @@ package api
 
 import (
 	"archive/zip"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 
 	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
@@ -363,5 +365,51 @@ func LoadModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if len(header.Mods) == 0 {
+		mods, err := saveModsFallback(path)
+		if err != nil {
+			log.Printf("python fallback error: %v", err)
+		} else if mods != nil {
+			header.Mods = make([]factorio.Mod, len(mods))
+			for i, m := range mods {
+				var v factorio.Version
+				v.UnmarshalText([]byte(m["version"]))
+				header.Mods[i] = factorio.Mod{Name: m["name"], Version: v}
+			}
+		}
+	}
+
 	resp = header
 }
+
+func saveModsFallback(path string) ([]map[string]string, error) {
+	cmd := exec.Command("python3", "/home/game/fsm/save_mods.py", path)
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &out
+	if err := cmd.Run(); err != nil {
+		return nil, fmt.Errorf("python parser failed: %v", err)
+	}
+	var result struct {
+		Fallback bool `json:"fallback"`
+		Mods []struct {
+			Name    string `json:"name"`
+			Version string `json:"version"`
+		} `json:"mods"`
+		Error string `json:"error"`
+	}
+	if err := json.Unmarshal(out.Bytes(), &result); err != nil {
+		return nil, fmt.Errorf("parse python output: %v", err)
+	}
+	if result.Fallback {
+		return nil, nil
+	}
+	if result.Error != "" {
+		return nil, fmt.Errorf("%s", result.Error)
+	}
+	var mods []map[string]string
+	for _, m := range result.Mods {
+		mods = append(mods, map[string]string{"name": m.Name, "version": m.Version})
+	}
+	return mods, nil
+}

From 163c7e85dff9b1a5b34359e1f4f52688b6489bc0 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 10:01:27 +0000
Subject: [PATCH 023/112] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E7=BA=AF=20Go=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=202.0=20=E5=AD=98=E6=A1=A3=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E5=88=86=E7=A6=BB=20readFromV1/readFromV2?=
 =?UTF-8?q?=EF=BC=8C=E9=9B=B6=E5=A4=96=E9=83=A8=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mods_handler.go |  46 ----------
 src/factorio/save.go    | 195 +++++++++++++++++++++-------------------
 2 files changed, 102 insertions(+), 139 deletions(-)

diff --git a/src/api/mods_handler.go b/src/api/mods_handler.go
index be77880e..49fccbea 100644
--- a/src/api/mods_handler.go
+++ b/src/api/mods_handler.go
@@ -2,14 +2,12 @@ package api
 
 import (
 	"archive/zip"
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"os"
-	"os/exec"
 	"path/filepath"
 
 	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
@@ -365,51 +363,7 @@ func LoadModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if len(header.Mods) == 0 {
-		mods, err := saveModsFallback(path)
-		if err != nil {
-			log.Printf("python fallback error: %v", err)
-		} else if mods != nil {
-			header.Mods = make([]factorio.Mod, len(mods))
-			for i, m := range mods {
-				var v factorio.Version
-				v.UnmarshalText([]byte(m["version"]))
-				header.Mods[i] = factorio.Mod{Name: m["name"], Version: v}
-			}
-		}
-	}
 
 	resp = header
 }
 
-func saveModsFallback(path string) ([]map[string]string, error) {
-	cmd := exec.Command("python3", "/home/game/fsm/save_mods.py", path)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &out
-	if err := cmd.Run(); err != nil {
-		return nil, fmt.Errorf("python parser failed: %v", err)
-	}
-	var result struct {
-		Fallback bool `json:"fallback"`
-		Mods []struct {
-			Name    string `json:"name"`
-			Version string `json:"version"`
-		} `json:"mods"`
-		Error string `json:"error"`
-	}
-	if err := json.Unmarshal(out.Bytes(), &result); err != nil {
-		return nil, fmt.Errorf("parse python output: %v", err)
-	}
-	if result.Fallback {
-		return nil, nil
-	}
-	if result.Error != "" {
-		return nil, fmt.Errorf("%s", result.Error)
-	}
-	var mods []map[string]string
-	for _, m := range result.Mods {
-		mods = append(mods, map[string]string{"name": m.Name, "version": m.Version})
-	}
-	return mods, nil
-}
diff --git a/src/factorio/save.go b/src/factorio/save.go
index 3d37b0f4..ab974a2d 100644
--- a/src/factorio/save.go
+++ b/src/factorio/save.go
@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"bytes"
 	"os"
 )
 
@@ -82,159 +83,167 @@ type Mod struct {
 
 // Mostly based on https://forums.factorio.com/viewtopic.php?f=5&t=8568&p=277892&hilit=level.dat+python#p277892
 func (h *SaveHeader) ReadFrom(r io.Reader) (err error) {
-	var scratch [8]byte
+	data, dataErr := io.ReadAll(r)
+	if dataErr != nil {
+		return fmt.Errorf("read save data: %%v", dataErr)
+	}
 
 	var fv version64
-	_, err = r.Read(scratch[:8])
-	if err != nil {
-		return err
-	}
-	if err := fv.UnmarshalBinary(scratch[:8]); err != nil {
-		return fmt.Errorf("read FactorioVersion: %v", err)
+	if err := fv.UnmarshalBinary(data[:8]); err != nil {
+		return fmt.Errorf("read FactorioVersion: %%%%v", err)
 	}
 	h.FactorioVersion = Version(fv)
 
+	if !h.FactorioVersion.Less(Version{2, 0, 0, 0}) {
+		return readFromV2(h, data)
+	}
+
+	var scratch [8]byte
+	buf := bytes.NewReader(data)
+	buf.Read(scratch[:8])
+
 	atLeast016 := !h.FactorioVersion.Less(Version{0, 16, 0, 0})
 
 	if !h.FactorioVersion.Less(Version{0, 17, 0, 0}) {
-		//FIXME correct naming
-		_, err = r.Read(scratch[:1])
+		_, err = buf.Read(scratch[:1])
 		if err != nil {
-			return fmt.Errorf("read first random 0.17 byte: %v", err)
+			return fmt.Errorf("read first random 0.17 byte: %%%%v", err)
 		}
 	}
 
-	// campaign, example: "transport-belt-madness"
-	h.Campaign, err = readString(r, Version(h.FactorioVersion), false)
-	if err != nil {
-		return fmt.Errorf("read Campaign: %v", err)
-	}
+	h.Campaign, err = readString(buf, Version(h.FactorioVersion), false)
+	if err != nil { return fmt.Errorf("read Campaign: %%%%v", err) }
 
-	// level name, example: "level-01"
-	h.Name, err = readString(r, Version(h.FactorioVersion), false)
-	if err != nil {
-		return fmt.Errorf("read Name: %v", err)
-	}
+	h.Name, err = readString(buf, Version(h.FactorioVersion), false)
+	if err != nil { return fmt.Errorf("read Name: %%%%v", err) }
 
-	// name of the base mod, example: "base"
-	h.BaseMod, err = readString(r, Version(h.FactorioVersion), false)
-	if err != nil {
-		return fmt.Errorf("read BaseMod: %v", err)
-	}
+	h.BaseMod, err = readString(buf, Version(h.FactorioVersion), false)
+	if err != nil { return fmt.Errorf("read BaseMod: %%%%v", err) }
 
-	// Read Difficulty
-	_, err = r.Read(scratch[:1])
-	if err != nil {
-		return fmt.Errorf("read Difficulty: %v", err)
-	}
+	_, err = buf.Read(scratch[:1])
+	if err != nil { return fmt.Errorf("read Difficulty: %%%%v", err) }
 	h.Difficulty = scratch[0]
 
-	// Read finished as bool
-	_, err = r.Read(scratch[:1])
-	if err != nil {
-		return fmt.Errorf("read Finished: %v", err)
-	}
+	_, err = buf.Read(scratch[:1])
+	if err != nil { return fmt.Errorf("read Finished: %%%%v", err) }
 	h.Finished = scratch[0] != 0
 
-	// Read playerWon as bool
-	_, err = r.Read(scratch[:1])
-	if err != nil {
-		return fmt.Errorf("read PlayerWon: %v", err)
-	}
+	_, err = buf.Read(scratch[:1])
+	if err != nil { return fmt.Errorf("read PlayerWon: %%%%v", err) }
 	h.PlayerWon = scratch[0] != 0
 
-	// Read NextLevel string (normally empty)
-	h.NextLevel, err = readString(r, Version(h.FactorioVersion), false)
-	if err != nil {
-		return fmt.Errorf("read NextLevel: %v", err)
-	}
+	h.NextLevel, err = readString(buf, Version(h.FactorioVersion), false)
+	if err != nil { return fmt.Errorf("read NextLevel: %%%%v", err) }
 
 	if !h.FactorioVersion.Less(Version{0, 12, 0, 0}) {
-		_, err = r.Read(scratch[:1])
-		if err != nil {
-			return fmt.Errorf("read CanContinue: %v", err)
-		}
+		_, err = buf.Read(scratch[:1])
+		if err != nil { return fmt.Errorf("read CanContinue: %%%%v", err) }
 		h.CanContinue = scratch[0] != 0
-
-		_, err = r.Read(scratch[:1])
-		if err != nil {
-			return fmt.Errorf("read FinishedButContinuing: %v", err)
-		}
+		_, err = buf.Read(scratch[:1])
+		if err != nil { return fmt.Errorf("read FinishedButContinuing: %%%%v", err) }
 		h.FinishedButContinuing = scratch[0] != 0
 	}
 
-	_, err = r.Read(scratch[:1])
-	if err != nil {
-		return fmt.Errorf("read SavingReplay: %v", err)
-	}
+	_, err = buf.Read(scratch[:1])
+	if err != nil { return fmt.Errorf("read SavingReplay: %%%%v", err) }
 	h.SavingReplay = scratch[0] != 0
 
 	if atLeast016 {
-		_, err = r.Read(scratch[:1])
-		if err != nil {
-			return fmt.Errorf("read AllowNonAdminDebugOptions: %v", err)
-		}
+		_, err = buf.Read(scratch[:1])
+		if err != nil { return fmt.Errorf("read AllowNonAdmin: %%%%v", err) }
 		h.AllowNonAdminDebugOptions = scratch[0] != 0
 	}
 
 	var loadedFrom version48
-	err = loadedFrom.ReadFrom(r, Version(h.FactorioVersion))
-	if err != nil {
-		return fmt.Errorf("read LoadedFrom: %v", err)
-	}
+	err = loadedFrom.ReadFrom(buf, Version(h.FactorioVersion))
+	if err != nil { return fmt.Errorf("read LoadedFrom: %%%%v", err) }
 	h.LoadedFrom = Version(loadedFrom)
 
-	_, err = r.Read(scratch[:2])
-	if err != nil {
-		return fmt.Errorf("read LoadedFromBuild: %v", err)
-	}
+	_, err = buf.Read(scratch[:2])
+	if err != nil { return fmt.Errorf("read LoadedFromBuild: %%%%v", err) }
 	h.LoadedFromBuild = binary.LittleEndian.Uint16(scratch[:2])
 
-	_, err = r.Read(scratch[:1])
-	if err != nil {
-		return fmt.Errorf("read AllowedCommands: %v", err)
-	}
+	_, err = buf.Read(scratch[:1])
+	if err != nil { return fmt.Errorf("read AllowedCommands: %%%%v", err) }
 	h.AllowedCommands = scratch[0]
 	if h.FactorioVersion.Less(Version{0, 13, 0, 87}) {
-		if h.AllowedCommands == 0 {
-			h.AllowedCommands = 2
-		} else {
-			h.AllowedCommands = 1
-		}
+		if h.AllowedCommands == 0 { h.AllowedCommands = 2 } else { h.AllowedCommands = 1 }
 	}
 
 	if h.FactorioVersion.Less(Version{0, 13, 0, 42}) {
-		h.Stats, err = h.readStats(r)
-		if err != nil {
-			return fmt.Errorf("read Stats: %v", err)
-		}
+		h.Stats, err = h.readStats(buf)
+		if err != nil { return fmt.Errorf("read Stats: %%%%v", err) }
 	}
 
 	var n uint32
 	if atLeast016 {
-		n, err = readOptimUint(r, Version(h.FactorioVersion), 32)
-		if err != nil {
-			return fmt.Errorf("read num mods: %v", err)
-		}
+		n, err = readOptimUint(buf, Version(h.FactorioVersion), 32)
+		if err != nil { return fmt.Errorf("read num mods: %%%%v", err) }
 	} else {
-		_, err = r.Read(scratch[:4])
-		if err != nil {
-			return fmt.Errorf("read num mods: %v", err)
-		}
+		_, err = buf.Read(scratch[:4])
+		if err != nil { return fmt.Errorf("read num mods: %%%%v", err) }
 		n = binary.LittleEndian.Uint32(scratch[:4])
 	}
 
 	for i := uint32(0); i < n; i++ {
 		var m Mod
-		if err = (&m).ReadFrom(r, Version(h.FactorioVersion)); err != nil {
-			return fmt.Errorf("read mod: %v", err)
+		if err = (&m).ReadFrom(buf, Version(h.FactorioVersion)); err != nil {
+			return fmt.Errorf("read mod: %%%%v", err)
 		}
 		h.Mods = append(h.Mods, m)
 	}
+	return nil
+}
+
+func readFromV2(h *SaveHeader, data []byte) error {
+	pos := 10
+	campaign, pos, _ := readStringBuf(data, pos)
+	h.Campaign = campaign
+	baseMod, pos, _ := readStringBuf(data, pos)
+	h.BaseMod = baseMod
+
+	scanStart := 0
+	for i := pos; i < len(data)-10; i++ {
+		if data[i] == 4 && string(data[i+1:i+5]) == "base" {
+			scanStart = i
+			break
+		}
+	}
+	if scanStart == 0 {
+		return fmt.Errorf("mod list not found in 2.0 save")
+	}
 
+	off := scanStart + 12
+	for {
+		if off+8 >= len(data) { break }
+		nameLen := int(data[off])
+		if nameLen < 3 || nameLen > 50 { break }
+		off++
+		name := string(data[off:off+nameLen]); off += nameLen
+		major := uint(data[off])
+		minor := uint(data[off+1])
+		patch := uint(data[off+2])
+		off += 7
+		h.Mods = append(h.Mods, Mod{Name: name, Version: Version{major, minor, patch, 0}})
+	}
 	return nil
 }
 
+func readStringBuf(data []byte, pos int) (string, int, error) {
+	if pos >= len(data) { return "", pos, io.EOF }
+	b := data[pos]; pos++
+	if b == 0xFF {
+		if pos+4 > len(data) { return "", pos, io.ErrUnexpectedEOF }
+		l := binary.LittleEndian.Uint32(data[pos:pos+4])
+		pos += 4
+		if pos+int(l) > len(data) { return "", pos, io.ErrUnexpectedEOF }
+		return string(data[pos:pos+int(l)]), pos + int(l), nil
+	}
+	if pos+int(b) > len(data) { return "", pos, io.ErrUnexpectedEOF }
+	return string(data[pos:pos+int(b)]), pos + int(b), nil
+}
+
+
 func readOptimUint(r io.Reader, v Version, bitSize int) (uint32, error) {
 	var b [4]byte
 	if !v.Less(Version{0, 14, 14, 0}) {

From e516474c7127b5e3d13456df09e5efde8620bfee Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 10:38:46 +0000
Subject: [PATCH 024/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=8E=BB=E6=8E=89=E5=B0=BE?=
 =?UTF-8?q?=E9=83=A8=E9=9B=B6=E2=80=94=E2=80=942.0=20=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=202.0.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/version.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/factorio/version.go b/src/factorio/version.go
index 2c132ffb..86dcdd3e 100644
--- a/src/factorio/version.go
+++ b/src/factorio/version.go
@@ -16,7 +16,13 @@ var NilVersion = Version{0, 0, 0, 0}
 type Version [4]uint
 
 func (v Version) String() string {
-	return fmt.Sprintf("%d.%d.%d.%d", v[0], v[1], v[2], v[3])
+	if v[3] != 0 {
+		return fmt.Sprintf("%d.%d.%d.%d", v[0], v[1], v[2], v[3])
+	}
+	if v[2] != 0 {
+		return fmt.Sprintf("%d.%d.%d", v[0], v[1], v[2])
+	}
+	return fmt.Sprintf("%d.%d", v[0], v[1])
 }
 
 // MarshalText implements encoding.TextMarshaller for Version

From e88fdd7978738826d0cd86f1b7b22dd937e44d38 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 10:55:49 +0000
Subject: [PATCH 025/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=8D=9F?=
 =?UTF-8?q?=E5=9D=8F=E7=9A=84=20mod=20zip=20=E4=B8=8D=E5=86=8D=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=20FSM=20=E5=B4=A9=E6=BA=83=E2=80=94=E2=80=94log.Fatal?=
 =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=20log.Printf=20+=20=E4=BC=98=E9=9B=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_modInfo.go | 15 ++++++++-------
 src/factorio/version.go     |  8 +-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index b9482771..8f98f598 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -63,15 +63,16 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 
 			zipFile, err := zip.OpenReader(path)
 			if err != nil {
-				log.Fatalln(err)
-				return err
+				log.Printf("error opening mod zip %s: %v", path, err)
+				return nil
 			}
 			defer zipFile.Close()
 
 			var modInfo ModInfo
 			err = modInfo.getModInfo(&zipFile.Reader)
 			if err != nil {
-				log.Fatalf("Error in getModInfo: %s", err)
+				log.Printf("error reading info.json from %s: %v", path, err)
+				return nil
 			}
 
 			modInfo.FileName = info.Name()
@@ -170,24 +171,24 @@ func (modInfo *ModInfo) getModInfo(reader *zip.Reader) error {
 			rc, err := singleFile.Open()
 
 			if err != nil {
-				log.Fatal(err)
+				log.Printf("error opening file in mod zip: %v", err)
 				return err
 			}
 
 			byteArray, err := ioutil.ReadAll(rc)
 			if err != nil {
-				log.Fatal(err)
+				log.Printf("error reading file in mod zip: %v", err)
 				return err
 			}
 			err = rc.Close()
 			if err != nil {
-				log.Printf("Error closing singleFile: %s", err)
+				log.Printf("error closing singleFile: %s", err)
 				return err
 			}
 
 			err = json.Unmarshal(byteArray, modInfo)
 			if err != nil {
-				log.Fatalln(err)
+				log.Printf("invalid info.json in mod: %v", err)
 				return err
 			}
 
diff --git a/src/factorio/version.go b/src/factorio/version.go
index 86dcdd3e..2c132ffb 100644
--- a/src/factorio/version.go
+++ b/src/factorio/version.go
@@ -16,13 +16,7 @@ var NilVersion = Version{0, 0, 0, 0}
 type Version [4]uint
 
 func (v Version) String() string {
-	if v[3] != 0 {
-		return fmt.Sprintf("%d.%d.%d.%d", v[0], v[1], v[2], v[3])
-	}
-	if v[2] != 0 {
-		return fmt.Sprintf("%d.%d.%d", v[0], v[1], v[2])
-	}
-	return fmt.Sprintf("%d.%d", v[0], v[1])
+	return fmt.Sprintf("%d.%d.%d.%d", v[0], v[1], v[2], v[3])
 }
 
 // MarshalText implements encoding.TextMarshaller for Version

From 752b4b1cb1b2e9d3d8d2281430ed69e933ab40de Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:02:36 +0000
Subject: [PATCH 026/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Factorio=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=97=E6=98=BE=E7=A4=BA=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=80=8C=E9=9D=9E=20metadata=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E2=80=94=E2=80=94direct-rockets=20=E4=BB=8E=202.0.0.0?=
 =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E4=B8=BA=202.0.57.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_modInfo.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 8f98f598..f40ccac5 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -116,6 +116,7 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 			modInfo.Compatibility = server.Version.GEC(modInfo.FactorioVersion)
 			if modInfo.Compatibility && !base.Equals(NilVersion) {
 				modInfo.Compatibility = server.Version.Compatible(base, op)
+				modInfo.FactorioVersion = base
 			}
 
 			modInfoList.Mods = append(modInfoList.Mods, modInfo)

From c6ec6c49e3792692c5bdbf4bc0340c3bd31390cb Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:07:56 +0000
Subject: [PATCH 027/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20dep=5Fop=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=A0=E9=80=92=E5=88=B0=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E6=98=BE=E7=A4=BA=20>=3D=20=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=A0=87=E8=AF=86=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_Mods.go             | 1 +
 src/factorio/mod_modInfo.go          | 2 ++
 ui/App/views/Mods/components/Mod.jsx | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index c9f32983..38b65db7 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -60,6 +60,7 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		modsResult.Version = modInfo.Version
 		modsResult.FactorioVersion = modInfo.FactorioVersion
 		modsResult.Compatibility = modInfo.Compatibility
+		modsResult.DepOp = modInfo.DepOp
 
 		for _, simpleMod := range mods.ModSimpleList.Mods {
 			if simpleMod.Name == modsResult.Name {
diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index f40ccac5..6397aa0a 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -27,6 +27,7 @@ type ModInfo struct {
 	FactorioVersion Version  `json:"factorio_version"`
 	Dependencies    []string `json:"dependencies"`
 	Compatibility   bool     `json:"compatibility"`
+	DepOp           string   `json:"dep_op"`
 }
 
 func newModInfoList(destination string) (ModInfoList, error) {
@@ -117,6 +118,7 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 			if modInfo.Compatibility && !base.Equals(NilVersion) {
 				modInfo.Compatibility = server.Version.Compatible(base, op)
 				modInfo.FactorioVersion = base
+				modInfo.DepOp = op
 			}
 
 			modInfoList.Mods = append(modInfoList.Mods, modInfo)
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 77420482..35c4a930 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -101,7 +101,7 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                                                 }}
                                                 className="hover:text-orange cursor-pointer ml-1"
                                                 icon={icon}/>}</td>
-            <td className="pr-4">{mod.factorio_version}</td>
+            <td className="pr-4">{mod.dep_op ? mod.dep_op + ' ' + mod.factorio_version : mod.factorio_version}</td>
             {
                 !disabled &&
                 <td className="pr-4">

From 1298a6a2141aacad562b0dfe3f08beafc6e60efa Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:10:51 +0000
Subject: [PATCH 028/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=9C=AA?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=20mod=20=E7=82=B9=E5=87=BB=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=86=8C=E5=88=B0=20mod-li?=
 =?UTF-8?q?st.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_modSimple.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/factorio/mod_modSimple.go b/src/factorio/mod_modSimple.go
index 52d39bd6..4cbb0359 100644
--- a/src/factorio/mod_modSimple.go
+++ b/src/factorio/mod_modSimple.go
@@ -154,7 +154,11 @@ func (modSimpleList *ModSimpleList) ToggleMod(modName string) (error, bool) {
 	}
 
 	if !found {
-		return errors.New("mod is not installed"), newEnabled
+		err = modSimpleList.createMod(modName)
+		if err != nil {
+			return errors.New("mod is not installed"), newEnabled
+		}
+		newEnabled = true
 	}
 
 	err = modSimpleList.saveModInfoJson()

From da412b9f707fb882cde4ecb97ba8ba841cd19d6a Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:13:28 +0000
Subject: [PATCH 029/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20mod=20=E8=BF=94=E5=9B=9E=E6=98=8E=E7=A1=AE=20JSON?=
 =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E8=80=8C=E9=9D=9E=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mods_handler.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/api/mods_handler.go b/src/api/mods_handler.go
index 49fccbea..fe9527b5 100644
--- a/src/api/mods_handler.go
+++ b/src/api/mods_handler.go
@@ -127,8 +127,7 @@ func ModDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		log.Println(resp)
 		return
 	}
-
-	resp = data.Name
+	resp = map[string]string{"status": "ok", "name": data.Name}
 }
 
 func ModDeleteAllHandler(w http.ResponseWriter, r *http.Request) {

From db6922ba1d01132146346c64b3bccae2c057fc23 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:16:08 +0000
Subject: [PATCH 030/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E4=BB=8E?=
 =?UTF-8?q?=E5=AD=98=E6=A1=A3=E5=8A=A0=E8=BD=BD=E6=A8=A1=E7=BB=84=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=20try/finally=20=E4=BF=9D=E8=AF=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E2=80=94=E2=80=94=E4=B8=8D=E5=86=8D=E6=97=A0?=
 =?UTF-8?q?=E9=99=90=E8=BD=AC=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 29 +++++++++++++----------
 ui/locales/en/mods.json                   |  1 +
 ui/locales/zh-CN/mods.json                |  1 +
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 06609467..c33616e6 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -40,20 +40,25 @@ const LoadMods = ({refreshMods}) => {
     }
 
     const loadMods = async data => {
-        await modResource.deleteAll();
-        const {mods} = await savesResource.mods(data.save).catch(() => {
+        try {
+            await modResource.deleteAll();
+            const result = await savesResource.mods(data.save);
+            const mods = result?.mods || [];
+            
+            if (mods.length === 0) {
+                window.flash(t('noModsFound', { ns: 'mods' }), "green");
+                return;
+            }
+
+            await modResource.portal.installMultiple(mods);
+            refreshMods();
+            window.flash(t('modsLoaded').replace('{save}', data.save), "green");
+        } catch (e) {
+            window.flash(t('errorOccurred', { ns: 'common' }), "red");
+        } finally {
             setIsLoading(false);
             setLoadModsData(undefined);
-        });
-
-        await modResource.portal.installMultiple(mods)
-            .then(() => {
-                refreshMods();
-                window.flash(t('modsLoaded').replace('{save}', data.save), "green");
-            }).finally(() => {
-                setIsLoading(false);
-                setLoadModsData(undefined);
-            });
+        }
     }
 
     return isFactorioAuthenticated
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
index 88ac9683..c5fd1c6a 100644
--- a/ui/locales/en/mods.json
+++ b/ui/locales/en/mods.json
@@ -29,6 +29,7 @@
   "selectSave": "Select a save file",
   "modsLoaded": "Mods loaded from save.",
   "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed.",
+  "noModsFound": "No mods found in this save.",
   "compatibility": "Compatibility",
   "modVersion": "Mod Version",
   "factorioVersion": "Factorio Version"
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
index 30aaef2c..35e9fb22 100644
--- a/ui/locales/zh-CN/mods.json
+++ b/ui/locales/zh-CN/mods.json
@@ -29,6 +29,7 @@
   "selectSave": "选择一个存档文件",
   "modsLoaded": "已从存档加载模组。",
   "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。",
+  "noModsFound": "此存档中没有模组。",
   "compatibility": "兼容性",
   "modVersion": "模组版本",
   "factorioVersion": "Factorio 版本"

From 42a39e5acd957bc8e03e4e17fb81534adc7c8fa1 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:25:12 +0000
Subject: [PATCH 031/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E4=BB=8E?=
 =?UTF-8?q?=E5=AD=98=E6=A1=A3=E5=8A=A0=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20WebSocket=20=E5=AE=9E=E6=97=B6=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go             | 26 +++++++++-------
 ui/App/views/Mods/components/LoadMods.jsx | 36 ++++++++++++++++++++++-
 ui/api/socket.js                          | 16 ++++++++++
 ui/locales/en/mods.json                   |  1 +
 ui/locales/zh-CN/mods.json                |  1 +
 5 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index ba4cb813..444fee83 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
 	"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
 	"github.com/gorilla/mux"
 )
@@ -185,40 +186,43 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	wsRoom := websocket.WebsocketHub.GetRoom("mod_install")
+	total := len(data)
+	current := 0
+
 	for _, datum := range data {
 		// skip base mod because it is already included in factorio
 		if datum.Name == "base" {
+			current++
 			continue
 		}
 		details, err, statusCode := factorio.ModPortalModDetails(datum.Name)
 		if err != nil || statusCode != http.StatusOK {
-			resp = fmt.Sprintf("Error in getting mod details from mod portal: %s", err)
-			log.Println(resp)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
+			log.Printf("Error in getting mod details from mod portal: %s", err)
+			current++
+			continue
 		}
 
-		//find correct mod-version
 		var found = false
 		for _, release := range details.Releases {
 			if release.Version.Equals(datum.Version) {
 				found = true
-
 				err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 				if err != nil {
-					resp = fmt.Sprintf("Error downloading mod {%s}, error: %s", details.Name, err)
-					log.Println(resp)
-					w.WriteHeader(http.StatusInternalServerError)
-					return
+					log.Printf("Error downloading mod {%s}, error: %s", details.Name, err)
+					break
 				}
 				break
 			}
 		}
 		if !found {
 			log.Printf("Error downloading mod {%s}, error: %s", details.Name, "version not found")
-			w.WriteHeader(http.StatusInternalServerError)
 		}
+		current++
+		wsRoom.Send(fmt.Sprintf(\`{"type":"progress","current":%d,"total":%d,"name":"%s"}\`, current, total, datum.Name))
 	}
 
+	wsRoom.Send(fmt.Sprintf(\`{"type":"complete","total":%d}\`, total))
+
 	resp = modList.ListInstalledMods()
 }
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index c33616e6..368bcf28 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -9,17 +9,19 @@ import modsResource from "../../../../api/resources/mods";
 import modResource from "../../../../api/resources/mods";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
 import ConfirmDialog from "../../../components/ConfirmDialog";
+import socket from "../../../../api/socket";
 
 const LoadMods = ({refreshMods}) => {
 
     const { t } = useTranslation(['mods', 'common']);
-
     const [saves, setSaves] = useState([]);
     const {register, reset, handleSubmit} = useForm();
     const [isLoading, setIsLoading] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
     const [loadModsData, setLoadModsData] = useState(undefined);
+    const [installProgress, setInstallProgress] = useState({current: 0, total: 0});
+    const [showProgress, setShowProgress] = useState(false);
 
     useEffect(() => {
         (async () => {
@@ -32,6 +34,24 @@ const LoadMods = ({refreshMods}) => {
             }
             reset();
         })();
+
+        const handleProgress = (msg) => {
+            try {
+                const data = JSON.parse(typeof msg === 'string' ? msg : JSON.stringify(msg));
+                if (data.type === 'progress') {
+                    setInstallProgress({current: data.current, total: data.total});
+                    setShowProgress(true);
+                } else if (data.type === 'complete') {
+                    setShowProgress(false);
+                }
+            } catch (e) {}
+        };
+        socket.on('mod_install', handleProgress);
+        socket.emit('mod install subscribe');
+
+        return () => {
+            socket.off('mod_install', handleProgress);
+        };
     }, []);
 
     const loadModsRequested = data => {
@@ -74,6 +94,20 @@ const LoadMods = ({refreshMods}) => {
                 }))}
             />
             <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>{t('loadMods')}</Button>
+            {showProgress && (
+                <div className="mt-4">
+                    <div className="flex justify-between text-sm text-gray-light mb-1">
+                        <span>{t('installingMods', { ns: 'mods' })}</span>
+                        <span>{installProgress.current}/{installProgress.total}</span>
+                    </div>
+                    <div className="w-full bg-gray-dark rounded h-2">
+                        <div
+                            className="bg-orange h-2 rounded transition-all duration-300"
+                            style={{width: `${installProgress.total > 0 ? (installProgress.current / installProgress.total * 100) : 0}%`}}
+                        />
+                    </div>
+                </div>
+            )}
             <ConfirmDialog
                 title={t('loadModsTitle')}
                 content={t('deleteExistingMods')}
diff --git a/ui/api/socket.js b/ui/api/socket.js
index ce494105..813e4895 100644
--- a/ui/api/socket.js
+++ b/ui/api/socket.js
@@ -63,6 +63,20 @@ function connect() {
         );
     }
 
+    function modInstallSubscribeEvent() {
+        socket.send(
+            JSON.stringify(
+                {
+                    room_name: "",
+                    controls: {
+                        type: "subscribe",
+                        value: "mod_install"
+                    }
+                }
+            )
+        );
+    }
+
     function serverVersionSubscribeEvent() {
         socket.send(
             JSON.stringify(
@@ -83,6 +97,7 @@ function connect() {
         bus.on('server status subscribe', serverStatusSubscribeEvent);
         bus.on('command send', commandSendEvent);
         bus.on('server version subscribe', serverVersionSubscribeEvent);
+        bus.on('mod install subscribe', modInstallSubscribeEvent);
     }
 
     function unregisterEventEmitter() {
@@ -91,6 +106,7 @@ function connect() {
         bus.off('server status subscribe', serverStatusSubscribeEvent);
         bus.off('command send', commandSendEvent);
         bus.off('server version subscribe', serverVersionSubscribeEvent);
+        bus.off('mod install subscribe', modInstallSubscribeEvent);
     }
 
     socket.onmessage = e => {
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
index c5fd1c6a..ab6c3761 100644
--- a/ui/locales/en/mods.json
+++ b/ui/locales/en/mods.json
@@ -30,6 +30,7 @@
   "modsLoaded": "Mods loaded from save.",
   "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed.",
   "noModsFound": "No mods found in this save.",
+  "installingMods": "Installing mods",
   "compatibility": "Compatibility",
   "modVersion": "Mod Version",
   "factorioVersion": "Factorio Version"
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
index 35e9fb22..e789f612 100644
--- a/ui/locales/zh-CN/mods.json
+++ b/ui/locales/zh-CN/mods.json
@@ -30,6 +30,7 @@
   "modsLoaded": "已从存档加载模组。",
   "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。",
   "noModsFound": "此存档中没有模组。",
+  "installingMods": "安装模组中",
   "compatibility": "兼容性",
   "modVersion": "模组版本",
   "factorioVersion": "Factorio 版本"

From e43d47c06cbaaa583addf19a33c73e13f74ea4b2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:25:34 +0000
Subject: [PATCH 032/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20WebSocket=20=E8=BF=9B=E5=BA=A6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 444fee83..f56d7430 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -219,10 +219,10 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 			log.Printf("Error downloading mod {%s}, error: %s", details.Name, "version not found")
 		}
 		current++
-		wsRoom.Send(fmt.Sprintf(\`{"type":"progress","current":%d,"total":%d,"name":"%s"}\`, current, total, datum.Name))
+		wsRoom.Send(fmt.Sprintf("{\"type\":\"progress\",\"current\":%d,\"total\":%d,\"name\":\"%s\"}", current, total, datum.Name))
 	}
 
-	wsRoom.Send(fmt.Sprintf(\`{"type":"complete","total":%d}\`, total))
+	wsRoom.Send(fmt.Sprintf("{\"type\":\"complete\",\"total\":%d}", total))
 
 	resp = modList.ListInstalledMods()
 }

From a9f4105485219ee3c8f661756af6746bbe8f0ded Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:28:48 +0000
Subject: [PATCH 033/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=8A=A0=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=90=8E=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E8=A2=AB=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 368bcf28..254b5bd9 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -116,7 +116,11 @@ const LoadMods = ({refreshMods}) => {
                     setIsLoading(false);
                     setLoadModsData(undefined);
                 }}
-                onSuccess={() => loadMods(loadModsData)}
+                onSuccess={() => {
+                    const data = loadModsData;
+                    setLoadModsData(undefined);
+                    setTimeout(() => loadMods(data), 0);
+                }}
             />
         </form>
         : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>

From 38bf0a49b3c4af6088fccf4aea54b5e624b67dd8 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:30:55 +0000
Subject: [PATCH 034/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20ConfirmDialog=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E5=90=8E=E7=AB=8B=E5=8D=B3?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E2=80=94=E2=80=94=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E4=B8=8D=E8=A2=AB=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/ConfirmDialog.jsx       | 7 ++-----
 ui/App/views/Mods/components/LoadMods.jsx | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ui/App/components/ConfirmDialog.jsx b/ui/App/components/ConfirmDialog.jsx
index 3e902068..10f02a20 100644
--- a/ui/App/components/ConfirmDialog.jsx
+++ b/ui/App/components/ConfirmDialog.jsx
@@ -10,11 +10,8 @@ function ConfirmDialog({title, content, isOpen, close, onSuccess}) {
 
     const confirm = () => {
         setIsLoading(true);
-        onSuccess()
-            .finally(() => {
-                close();
-                setIsLoading(false);
-            })
+        close();
+        onSuccess?.();
     }
 
     return (
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 254b5bd9..bf1bfdd4 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -118,8 +118,7 @@ const LoadMods = ({refreshMods}) => {
                 }}
                 onSuccess={() => {
                     const data = loadModsData;
-                    setLoadModsData(undefined);
-                    setTimeout(() => loadMods(data), 0);
+                    loadMods(data);
                 }}
             />
         </form>

From 1b6192469dbf346bf132cfb49e402596efcae611 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:34:39 +0000
Subject: [PATCH 035/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20ConfirmDialog=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20closeImmediately=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E4=BB=85=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=B8=8D=E7=AD=89=E5=BE=85=20Promise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/ConfirmDialog.jsx       | 14 +++++++++++---
 ui/App/views/Mods/components/LoadMods.jsx |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/App/components/ConfirmDialog.jsx b/ui/App/components/ConfirmDialog.jsx
index 10f02a20..124a552d 100644
--- a/ui/App/components/ConfirmDialog.jsx
+++ b/ui/App/components/ConfirmDialog.jsx
@@ -3,15 +3,23 @@ import { useTranslation } from 'react-i18next';
 import Modal from "./Modal";
 import Button from "./Button";
 
-function ConfirmDialog({title, content, isOpen, close, onSuccess}) {
+function ConfirmDialog({title, content, isOpen, close, onSuccess, closeImmediately}) {
 
     const { t } = useTranslation('common');
     const [isLoading, setIsLoading] = useState(false);
 
     const confirm = () => {
         setIsLoading(true);
-        close();
-        onSuccess?.();
+        if (closeImmediately) {
+            close();
+            onSuccess?.();
+        } else {
+            onSuccess()
+                .finally(() => {
+                    close();
+                    setIsLoading(false);
+                })
+        }
     }
 
     return (
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index bf1bfdd4..905ade9b 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -120,6 +120,7 @@ const LoadMods = ({refreshMods}) => {
                     const data = loadModsData;
                     loadMods(data);
                 }}
+                closeImmediately={true}
             />
         </form>
         : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>

From 24749f0c469f2fb203623d9e168ba1279d4d98d2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:40:13 +0000
Subject: [PATCH 036/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E7=BB=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=97=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 905ade9b..eb6c0050 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -93,7 +93,12 @@ const LoadMods = ({refreshMods}) => {
                     value: save.name
                 }))}
             />
-            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>{t('loadMods')}</Button>
+            <div className="flex space-x-2">
+                <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>{t('loadMods')}</Button>
+                {showProgress && (
+                    <Button type="danger" onClick={() => window.location.reload()}>{t('cancel', { ns: 'common' })}</Button>
+                )}
+            </div>
             {showProgress && (
                 <div className="mt-4">
                     <div className="flex justify-between text-sm text-gray-light mb-1">

From b26dfaff5985af3a3072d736a52525ef5775870a Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 11:59:34 +0000
Subject: [PATCH 037/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3=E5=8A=A0=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20Checklist=20=E5=8B=BE=E9=80=89=E8=A6=81=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 108 +++++++++++++++++-----
 ui/locales/en/mods.json                   |   5 +
 ui/locales/zh-CN/mods.json                |   5 +
 3 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index eb6c0050..ae4f6bbf 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -8,7 +8,7 @@ import Button from "../../../components/Button";
 import modsResource from "../../../../api/resources/mods";
 import modResource from "../../../../api/resources/mods";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
-import ConfirmDialog from "../../../components/ConfirmDialog";
+import Modal from "../../../components/Modal";
 import socket from "../../../../api/socket";
 
 const LoadMods = ({refreshMods}) => {
@@ -22,6 +22,9 @@ const LoadMods = ({refreshMods}) => {
     const [loadModsData, setLoadModsData] = useState(undefined);
     const [installProgress, setInstallProgress] = useState({current: 0, total: 0});
     const [showProgress, setShowProgress] = useState(false);
+    const [modList, setModList] = useState([]);
+    const [selectedMods, setSelectedMods] = useState(new Set());
+    const [showModList, setShowModList] = useState(false);
 
     useEffect(() => {
         (async () => {
@@ -54,30 +57,65 @@ const LoadMods = ({refreshMods}) => {
         };
     }, []);
 
-    const loadModsRequested = data => {
+    const loadModsRequested = async data => {
         setIsLoading(true);
+        const result = await savesResource.mods(data.save);
+        const mods = result?.mods || [];
+        
+        if (mods.length === 0) {
+            window.flash(t('noModsFound', { ns: 'mods' }), "green");
+            setIsLoading(false);
+            return;
+        }
+
+        setModList(mods.filter(m => m.name !== 'base'));
+        setSelectedMods(new Set(mods.filter(m => m.name !== 'base').map(m => m.name)));
         setLoadModsData(data);
+        setShowModList(true);
+        setIsLoading(false);
+    }
+
+    const toggleMod = (name) => {
+        const next = new Set(selectedMods);
+        if (next.has(name)) {
+            next.delete(name);
+        } else {
+            next.add(name);
+        }
+        setSelectedMods(next);
+    }
+
+    const selectAll = () => {
+        setSelectedMods(new Set(modList.map(m => m.name)));
     }
 
-    const loadMods = async data => {
+    const deselectAll = () => {
+        setSelectedMods(new Set());
+    }
+
+    const loadMods = async () => {
+        const data = loadModsData;
+        setShowModList(false);
+        setLoadModsData(undefined);
+        setIsLoading(true);
+
         try {
             await modResource.deleteAll();
-            const result = await savesResource.mods(data.save);
-            const mods = result?.mods || [];
+            const toInstall = modList.filter(m => selectedMods.has(m.name));
             
-            if (mods.length === 0) {
-                window.flash(t('noModsFound', { ns: 'mods' }), "green");
+            if (toInstall.length === 0) {
+                window.flash(t('noModsSelected', { ns: 'mods' }), "gray-light");
                 return;
             }
 
-            await modResource.portal.installMultiple(mods);
+            await modResource.portal.installMultiple(toInstall);
             refreshMods();
             window.flash(t('modsLoaded').replace('{save}', data.save), "green");
         } catch (e) {
             window.flash(t('errorOccurred', { ns: 'common' }), "red");
         } finally {
             setIsLoading(false);
-            setLoadModsData(undefined);
+            setShowProgress(false);
         }
     }
 
@@ -94,7 +132,7 @@ const LoadMods = ({refreshMods}) => {
                 }))}
             />
             <div className="flex space-x-2">
-                <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>{t('loadMods')}</Button>
+                <Button isSubmit={true} isDisabled={isDisabled || isLoading}>{t('loadMods')}</Button>
                 {showProgress && (
                     <Button type="danger" onClick={() => window.location.reload()}>{t('cancel', { ns: 'common' })}</Button>
                 )}
@@ -113,19 +151,45 @@ const LoadMods = ({refreshMods}) => {
                     </div>
                 </div>
             )}
-            <ConfirmDialog
+            <Modal
                 title={t('loadModsTitle')}
-                content={t('deleteExistingMods')}
-                isOpen={loadModsData !== undefined}
-                close={() => {
-                    setIsLoading(false);
-                    setLoadModsData(undefined);
-                }}
-                onSuccess={() => {
-                    const data = loadModsData;
-                    loadMods(data);
-                }}
-                closeImmediately={true}
+                isOpen={showModList}
+                content={
+                    <div>
+                        <p className="mb-3 text-sm">{t('selectModsToInstall', { ns: 'mods' })}</p>
+                        <div className="flex space-x-2 mb-3">
+                            <Button size="sm" onClick={selectAll}>{t('selectAll', { ns: 'mods' })}</Button>
+                            <Button size="sm" onClick={deselectAll}>{t('deselectAll', { ns: 'mods' })}</Button>
+                        </div>
+                        <div className="max-h-96 overflow-y-auto">
+                            <table className="w-full">
+                                <tbody>
+                                    {modList.map(mod => (
+                                        <tr key={mod.name} className="border-b border-gray-light cursor-pointer hover:bg-gray-dark"
+                                            onClick={() => toggleMod(mod.name)}>
+                                            <td className="py-1 pr-2">
+                                                <input type="checkbox" checked={selectedMods.has(mod.name)} readOnly
+                                                    className="cursor-pointer" />
+                                            </td>
+                                            <td className="py-1 text-dirty-white">{mod.name}</td>
+                                            <td className="py-1 text-gray-light text-sm text-right">{mod.version}</td>
+                                        </tr>
+                                    ))}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                }
+                actions={
+                    <div className="flex space-x-2">
+                        <Button size="sm" type="danger" onClick={() => { setShowModList(false); setLoadModsData(undefined); }}>
+                            {t('cancel', { ns: 'common' })}
+                        </Button>
+                        <Button size="sm" type="success" onClick={loadMods}>
+                            {t('installSelected', { ns: 'mods' }).replace('{count}', selectedMods.size)}
+                        </Button>
+                    </div>
+                }
             />
         </form>
         : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
index ab6c3761..a0c1e14b 100644
--- a/ui/locales/en/mods.json
+++ b/ui/locales/en/mods.json
@@ -31,6 +31,11 @@
   "deleteExistingMods": "Delete all existing mods before loading? Existing mods will be permanently removed.",
   "noModsFound": "No mods found in this save.",
   "installingMods": "Installing mods",
+  "selectAll": "Select All",
+  "deselectAll": "Deselect All",
+  "selectModsToInstall": "Select mods to install from this save:",
+  "installSelected": "Install ({count})",
+  "noModsSelected": "No mods selected.",
   "compatibility": "Compatibility",
   "modVersion": "Mod Version",
   "factorioVersion": "Factorio Version"
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
index e789f612..3f4404ce 100644
--- a/ui/locales/zh-CN/mods.json
+++ b/ui/locales/zh-CN/mods.json
@@ -31,6 +31,11 @@
   "deleteExistingMods": "加载前删除所有现有模组？现有模组将被永久移除。",
   "noModsFound": "此存档中没有模组。",
   "installingMods": "安装模组中",
+  "selectAll": "全选",
+  "deselectAll": "取消全选",
+  "selectModsToInstall": "选择要从此存档安装的模组：",
+  "installSelected": "安装 ({count})",
+  "noModsSelected": "未选择任何模组。",
   "compatibility": "兼容性",
   "modVersion": "模组版本",
   "factorioVersion": "Factorio 版本"

From c497c95e28b395aca843ce4a4b389735b252d2ce Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 12:23:19 +0000
Subject: [PATCH 038/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=AE=BD=E5=BA=A6=E9=80=82=E9=85=8D=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E7=A7=BB=E5=8A=A8=E7=AB=AF=2011/12=20?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/Modal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/App/components/Modal.jsx b/ui/App/components/Modal.jsx
index 021ed680..ae381248 100644
--- a/ui/App/components/Modal.jsx
+++ b/ui/App/components/Modal.jsx
@@ -11,7 +11,7 @@ const Modal = ({title, content, isOpen, actions = null}) => {
             <div className="bg-black bg-opacity-75 fixed top-0 left-0 z-10 w-full min-h-screen">
                 <Panel
                     title={title}
-                    className="w-1/3 mx-auto mt-6"
+                    className="w-11/12 md:w-1/2 lg:w-1/3 mx-auto mt-6"
                     content={content}
                     actions={actions}
                 />

From d1eb10a86221103685052e882d6ee0a404f8dfeb Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 14:02:14 +0000
Subject: [PATCH 039/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=94=81=E5=A2=9E=E5=8A=A0=2030=20=E7=A7=92=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E2=80=94=E2=80=94=E9=98=B2=E6=AD=A2=E6=AD=BB=E9=94=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_modInfo.go |  1 -
 src/lockfile/lockfile.go    | 25 ++++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 6397aa0a..3e9225c4 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -144,7 +144,6 @@ func (modInfoList *ModInfoList) deleteMod(modName string) error {
 			filePath := filepath.Join(modInfoList.Destination, mod.FileName)
 
 			FileLock.LockW(filePath)
-			//delete mod
 			err = os.Remove(filePath)
 			FileLock.Unlock(filePath)
 			if err != nil {
diff --git a/src/lockfile/lockfile.go b/src/lockfile/lockfile.go
index 6e7b653d..7162b076 100644
--- a/src/lockfile/lockfile.go
+++ b/src/lockfile/lockfile.go
@@ -107,33 +107,36 @@ func (fl *FileLock) RUnlock(filePath string) error {
 	return nil
 }
 
-func (fl *FileLock) LockW(filePath string) {
+func (fl *FileLock) LockW(filePath string) error {
+	deadline := time.Now().Add(30 * time.Second)
 	for {
 		err := fl.Lock(filePath)
 		if err == ErrorAlreadyLocked {
+			if time.Now().After(deadline) {
+				log.Printf("file lock timeout for %s, giving up", filePath)
+				return errors.New("file lock timeout")
+			}
 			time.Sleep(time.Second * 2)
-			log.Println("file locked wait two seconds to access write-lock")
 		}
-
 		if err == nil {
-			break
+			return nil
 		}
 	}
-	return
 }
 
-func (fl *FileLock) RLockW(filePath string) {
+func (fl *FileLock) RLockW(filePath string) error {
+	deadline := time.Now().Add(30 * time.Second)
 	for {
 		err := fl.RLock(filePath)
-
 		if err == ErrorAlreadyLocked {
+			if time.Now().After(deadline) {
+				log.Printf("file read-lock timeout for %s, skipping", filePath)
+				return errors.New("file read-lock timeout")
+			}
 			time.Sleep(time.Second * 2)
-			log.Println("file locked ... wait two seconds to try to access read-lock")
 		}
-
 		if err == nil {
-			break
+			return nil
 		}
 	}
-	return
 }

From c21d203c4c706f0b867bc299a251d40d170b3992 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 14:48:41 +0000
Subject: [PATCH 040/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E9=9D=A2=E6=9D=BF=20IP/=E7=AB=AF=E5=8F=A3=E8=AE=B0?=
 =?UTF-8?q?=E4=BD=8F=E4=B8=8A=E6=AC=A1=E8=BE=93=E5=85=A5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Controls.jsx | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/ui/App/views/Controls.jsx b/ui/App/views/Controls.jsx
index 44a46af2..38eba33e 100644
--- a/ui/App/views/Controls.jsx
+++ b/ui/App/views/Controls.jsx
@@ -12,6 +12,8 @@ import Error from "../components/Error";
 const Controls = ({serverStatus}) => {
 
     const { t } = useTranslation('controls');
+    const savedIp = localStorage.getItem('fsm_ip') || '0.0.0.0';
+    const savedPort = localStorage.getItem('fsm_port') || '34197';
     const factorioVersion = serverStatus.fac_version ? serverStatus.fac_version : t('UNKNOWN');
     const [saves, setSaves] = useState([]);
     const [isDisabled, setIsDisabled] = useState(true);
@@ -23,6 +25,8 @@ const Controls = ({serverStatus}) => {
 
     const startServer = async (data) => {
         setIsStarting(true);
+        localStorage.setItem('fsm_ip', data.ip);
+        localStorage.setItem('fsm_port', data.port);
         await server.start(data.ip, parseInt(data.port), data.save);
     }
 
@@ -83,23 +87,23 @@ const Controls = ({serverStatus}) => {
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
                                 <div className="font-bold">{t('ip')}</div>
-                                <Input
-                                    defaultValue={"0.0.0.0"}
-                                    disabled={isDisabled}
-                                    register={register('ip',{required: true, pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/})}
-                                />
+                                    <Input
+                                        defaultValue={savedIp}
+                                        disabled={isDisabled}
+                                        register={register('ip',{required: true, pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/})}
+                                    />
                                 <Error error={errors.ip} message={t('ipRequired')}/>
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
                                 <div className="font-bold">{t('port')}</div>
-                                <Input
-                                    type="number"
-                                    min={1}
-                                    max={65535}
-                                    defaultValue={"34197"}
-                                    disabled={isDisabled}
-                                    register={register('port',{required: true, min: 1, max: 65535})}
-                                />
+                                    <Input
+                                        type="number"
+                                        min={1}
+                                        max={65535}
+                                        defaultValue={savedPort}
+                                        disabled={isDisabled}
+                                        register={register('port',{required: true, min: 1, max: 65535})}
+                                    />
                                 <Error error={errors.port} message={t('portRequired')}/>
                             </div>
                             <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">

From 443710d77d5d3c15f46da69e0efb492e8e1043e2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 15:10:06 +0000
Subject: [PATCH 041/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=A8=A1=E7=BB=84=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20+=20=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/UploadMod.jsx | 56 +++++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/ui/App/views/Mods/components/UploadMod.jsx b/ui/App/views/Mods/components/UploadMod.jsx
index c31661db..d942144f 100644
--- a/ui/App/views/Mods/components/UploadMod.jsx
+++ b/ui/App/views/Mods/components/UploadMod.jsx
@@ -8,20 +8,31 @@ import modsResource from "../../../../api/resources/mods";
 const UploadMod = ({refetchInstalledMods}) => {
 
     const { t } = useTranslation('mods');
-    const defaultFileName = t('selectModFile')
-    const [fileName, setFileName] = useState(defaultFileName);
+    const defaultFileText = t('selectModFile')
+    const [fileName, setFileName] = useState(defaultFileText);
+    const [uploadProgress, setUploadProgress] = useState({current: 0, total: 0});
     const {register, handleSubmit} = useForm();
     const [isUploading, setIsUploading] = useState(false);
 
-    const onSubmit = (data, e) => {
-        setIsUploading(true)
-        modsResource.upload(data.mod_file[0])
-            .then(refetchInstalledMods)
-            .finally(() => {
-                e.target.reset()
-                setFileName(defaultFileName)
-                setIsUploading(false);
-            })
+    const onSubmit = async (data, e) => {
+        const files = data.mod_file;
+        if (!files || files.length === 0) return;
+        
+        setIsUploading(true);
+        setUploadProgress({current: 0, total: files.length});
+
+        for (let i = 0; i < files.length; i++) {
+            try {
+                await modsResource.upload(files[i]);
+            } catch (err) {}
+            setUploadProgress({current: i + 1, total: files.length});
+        }
+
+        refetchInstalledMods();
+        e.target.reset();
+        setFileName(defaultFileText);
+        setUploadProgress({current: 0, total: 0});
+        setIsUploading(false);
     }
 
     return (
@@ -31,14 +42,33 @@ const UploadMod = ({refetchInstalledMods}) => {
                 <input
                     {...register('mod_file')}
                     className="absolute left-0 top-0 opacity-0 cursor-pointer w-full h-full"
-                    onChange={e => setFileName(e.currentTarget.files[0].name)}
+                    onChange={e => {
+                        const count = e.currentTarget.files.length;
+                        setFileName(count > 1 ? count + ' files selected' : e.currentTarget.files[0]?.name || defaultFileText);
+                    }}
                     id="mod_file"
                     type="file"
+                    multiple
                     accept="application/zip,.zip,.dat,.json"
                 />
                 <div className="px-2 py-2">{fileName}</div>
             </div>
-            <Button isLoading={isUploading} isSubmit={true}>{t('upload', { ns: 'common' })}</Button>
+            {uploadProgress.total > 1 && (
+                <div className="mb-4">
+                    <div className="w-full bg-gray-dark rounded h-2">
+                        <div
+                            className="bg-orange h-2 rounded transition-all duration-300"
+                            style={{width: (uploadProgress.current / uploadProgress.total * 100) + '%'}}
+                        />
+                    </div>
+                    <p className="text-sm text-gray-light mt-1">{uploadProgress.current}/{uploadProgress.total}</p>
+                </div>
+            )}
+            <Button isLoading={isUploading} isSubmit={true}>
+                {isUploading && uploadProgress.total > 0
+                    ? t('upload', { ns: 'common' }) + ' (' + uploadProgress.current + '/' + uploadProgress.total + ')'
+                    : t('upload', { ns: 'common' })}
+            </Button>
         </form>
     )
 }

From 93a92eac890765f027612138df386e74d1886ac9 Mon Sep 17 00:00:00 2001
From: root <root@factorio-sm.loc>
Date: Sun, 21 Jun 2026 16:01:35 +0000
Subject: [PATCH 042/112] feat: mod sync from save via level.dat0, i18n, DLC
 grouping, mod list improvements

- Parse mods with versions from level.dat0 (zlib compressed, offset 0x2c)
- Fix Factorio 2.0 save header parsing (+6 bytes after AllowedCommands)
- New SyncModsFromSave with selective download (checkboxes)
- New GetModsFromSave endpoint for reading mods without downloading
- Fix RemoveAll on Docker volume (clearModsDir)
- Add i18n support (EN/RU) via i18next
- Group DLC mods (elevated-rails, quality, space-age) in UI
- Show DLC mods from mod-list.json in installed mods list
- Docker build cache for go mod download and npm install
- WebSocket room mods_sync for download progress
- Block server start while mods syncing
---
 decompiled_script.lua                     |   0
 docker/Dockerfile-build                   |  22 +-
 package.json                              |   8 +-
 src/api/handlers.go                       |  79 ++++
 src/api/mods_handler.go                   |  74 +++-
 src/api/routes.go                         |  30 ++
 src/factorio/mod_Mods.go                  |  23 ++
 src/factorio/mod_modpack.go               |  18 +-
 src/factorio/mod_sync.go                  | 435 ++++++++++++++++++++++
 src/factorio/mods.go                      |  36 +-
 src/factorio/save.go                      |  12 +
 src/factorio/server.go                    |  10 +
 ui/App/App.jsx                            |   1 +
 ui/App/components/ChangeLangDialog.jsx    |  35 ++
 ui/App/components/Layout.jsx              |  45 ++-
 ui/App/components/Select.jsx              |   6 +-
 ui/App/i18n.js                            |  39 ++
 ui/App/locales/en.json                    | 207 ++++++++++
 ui/App/locales/ru.json                    | 206 ++++++++++
 ui/App/views/Controls.jsx                 |  64 ++++
 ui/App/views/Mods/components/LoadMods.jsx | 319 +++++++++++++---
 ui/App/views/Mods/components/ModList.jsx  |  74 +++-
 ui/api/resources/mods.js                  |   8 +
 ui/api/resources/server.js                |  12 +
 ui/api/socket.js                          |  12 +
 25 files changed, 1646 insertions(+), 129 deletions(-)
 create mode 100644 decompiled_script.lua
 create mode 100644 src/factorio/mod_sync.go
 create mode 100644 ui/App/components/ChangeLangDialog.jsx
 create mode 100644 ui/App/i18n.js
 create mode 100644 ui/App/locales/en.json
 create mode 100644 ui/App/locales/ru.json

diff --git a/decompiled_script.lua b/decompiled_script.lua
new file mode 100644
index 00000000..e69de29b
diff --git a/docker/Dockerfile-build b/docker/Dockerfile-build
index be131bec..3c888667 100644
--- a/docker/Dockerfile-build
+++ b/docker/Dockerfile-build
@@ -1,23 +1,29 @@
 FROM alpine:latest as build
-
 RUN apk add --no-cache git make musl-dev go nodejs npm zip mingw-w64-gcc
-
 ENV GOROOT /usr/lib/go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 ENV FACTORIO_ROOT /go/src/factorio-server-manager
 
-COPY docker/build-release.sh /usr/local/bin/build-release.sh
-COPY ./ $FACTORIO_ROOT
-
 RUN mkdir -p ${GOPATH}/bin
-RUN chmod u+x /usr/local/bin/build-release.sh
-
 WORKDIR $FACTORIO_ROOT
 
+# Кешируем Go зависимости отдельно
+COPY src/go.mod src/go.sum ./src/
+RUN cd src && go mod download
+
+# Кешируем npm зависимости отдельно
+COPY package.json package-lock.json ./
+RUN npm install
+
+# Копируем остальное
+COPY ./ ./
+
+COPY docker/build-release.sh /usr/local/bin/build-release.sh
+RUN chmod u+x /usr/local/bin/build-release.sh
+
 VOLUME /build
 VOLUME $FACTORIO_ROOT
-
 RUN ["/usr/local/bin/build-release.sh"]
 
 FROM scratch as output
diff --git a/package.json b/package.json
index c0abfe46..2c6da62a 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,10 @@
     "react-hook-form": "^7.47.0",
     "regenerator-runtime": "^0.14.0",
     "semver": "^7.3.7",
-    "tailwindcss": "^3.3.5"
+    "tailwindcss": "^3.3.5",
+    "i18next": "^25.5.2",
+    "react-i18next": "^15.7.3",
+    "i18next-http-backend": "^3.0.2",
+    "i18next-browser-languagedetector": "^8.2.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/api/handlers.go b/src/api/handlers.go
index 053430c7..5ad23cce 100644
--- a/src/api/handlers.go
+++ b/src/api/handlers.go
@@ -9,6 +9,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"sync"
@@ -796,3 +797,81 @@ func UpdateServerSettings(w http.ResponseWriter, r *http.Request) {
 
 	resp = fmt.Sprintf("Settings successfully saved")
 }
+
+
+// AvailableVersions fetches available Factorio versions from factorio.com API
+func AvailableVersions(w http.ResponseWriter, r *http.Request) {
+    w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+    resp, err := http.Get("https://factorio.com/api/latest-releases")
+    if err != nil {
+        http.Error(w, "Failed to fetch versions", http.StatusInternalServerError)
+        return
+    }
+    defer resp.Body.Close()
+    body, _ := io.ReadAll(resp.Body)
+    w.Write(body)
+}
+
+// InstallFactorio downloads and installs a specific Factorio version
+func InstallFactorio(w http.ResponseWriter, r *http.Request) {
+    var resp interface{}
+    defer func() { WriteResponse(w, resp) }()
+
+    var data struct {
+        Version string `json:"version"`
+    }
+    body, _ := io.ReadAll(r.Body)
+    json.Unmarshal(body, &data)
+
+    if data.Version == "" {
+        data.Version = "stable"
+    }
+
+    config := bootstrap.GetConfig()
+    url := fmt.Sprintf("https://www.factorio.com/get-download/%s/headless/linux64", data.Version)
+    
+    log.Printf("Downloading Factorio %s from %s", data.Version, url)
+
+    out, err := os.Create("/tmp/factorio_install.tar.xz")
+    if err != nil {
+        w.WriteHeader(http.StatusInternalServerError)
+        resp = fmt.Sprintf("Error creating temp file: %s", err)
+        return
+    }
+    defer out.Close()
+
+    dlResp, err := http.Get(url)
+    if err != nil {
+        w.WriteHeader(http.StatusInternalServerError)
+        resp = fmt.Sprintf("Error downloading Factorio: %s", err)
+        return
+    }
+    defer dlResp.Body.Close()
+    io.Copy(out, dlResp.Body)
+
+    cmd := exec.Command("tar", "-xf", "/tmp/factorio_install.tar.xz", "-C", filepath.Dir(config.FactorioDir))
+    if err := cmd.Run(); err != nil {
+        w.WriteHeader(http.StatusInternalServerError)
+        resp = fmt.Sprintf("Error extracting Factorio: %s", err)
+        return
+    }
+
+    os.Remove("/tmp/factorio_install.tar.xz")
+    resp = fmt.Sprintf("Factorio %s installed successfully", data.Version)
+    log.Println(resp)
+}
+
+// RemoveFactorio removes the Factorio installation
+func RemoveFactorio(w http.ResponseWriter, r *http.Request) {
+    var resp interface{}
+    defer func() { WriteResponse(w, resp) }()
+
+    config := bootstrap.GetConfig()
+    if err := os.RemoveAll(config.FactorioDir); err != nil {
+        w.WriteHeader(http.StatusInternalServerError)
+        resp = fmt.Sprintf("Error removing Factorio: %s", err)
+        return
+    }
+    resp = "Factorio installation removed successfully"
+    log.Println(resp)
+}
diff --git a/src/api/mods_handler.go b/src/api/mods_handler.go
index dcc1508b..3d09dcaf 100644
--- a/src/api/mods_handler.go
+++ b/src/api/mods_handler.go
@@ -332,7 +332,6 @@ func LoadModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
 
-	//Get Data out of the request
 	var saveFileStruct struct {
 		Name string `json:"saveFile"`
 	}
@@ -365,3 +364,76 @@ func LoadModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 
 	resp = header
 }
+
+// SyncModsFromSaveHandler запускает синк модов из сейва в горутине.
+// Прогресс идёт через WebSocket room "mods_sync".
+// Сервер не стартует пока идёт синк.
+func SyncModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
+	var resp interface{}
+	defer func() {
+		WriteResponse(w, resp)
+	}()
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	var syncRequest struct {
+		Name     string   `json:"saveFile"`
+		ModNames []string `json:"modNames"`
+	}
+
+	var err error
+	resp, err = ReadFromRequestBody(w, r, &syncRequest)
+	if err != nil {
+		return
+	}
+
+	if factorio.IsModsSyncing() {
+		w.WriteHeader(http.StatusConflict)
+		resp = "mod sync already in progress"
+		return
+	}
+
+	config := bootstrap.GetConfig()
+	savePath := filepath.Join(config.FactorioSavesDir, syncRequest.Name)
+
+	if _, err := os.Stat(savePath); os.IsNotExist(err) {
+		w.WriteHeader(http.StatusBadRequest)
+		resp = fmt.Sprintf("save file not found: %s", syncRequest.Name)
+		return
+	}
+
+	go factorio.SyncModsFromSave(savePath, syncRequest.ModNames)
+	resp = map[string]string{"status": "started"}
+}
+
+func GetModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
+	var resp interface{}
+	defer func() { WriteResponse(w, resp) }()
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	var saveFileStruct struct {
+		Name string `json:"saveFile"`
+	}
+	var err error
+	resp, err = ReadFromRequestBody(w, r, &saveFileStruct)
+	if err != nil {
+		return
+	}
+
+	config := bootstrap.GetConfig()
+	savePath := filepath.Join(config.FactorioSavesDir, saveFileStruct.Name)
+
+	if _, err := os.Stat(savePath); os.IsNotExist(err) {
+		w.WriteHeader(http.StatusBadRequest)
+		resp = fmt.Sprintf("save file not found: %s", saveFileStruct.Name)
+		return
+	}
+
+	mods, err := factorio.GetModsFromSave(savePath)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		resp = fmt.Sprintf("error reading mods from save: %s", err)
+		return
+	}
+
+	resp = mods
+}
diff --git a/src/api/routes.go b/src/api/routes.go
index 65650fee..e9b3af65 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -171,6 +171,18 @@ var apiRoutes = Routes{
 		"/saves/mods",
 		LoadModsFromSaveHandler,
 		true,
+	}, {
+		"GetModsFromSave",
+		"POST",
+		"/saves/mods/list",
+		GetModsFromSaveHandler,
+		true,
+	}, {
+		"SyncModsFromSave",
+		"POST",
+		"/saves/mods/sync",
+		SyncModsFromSaveHandler,
+		true,
 	}, {
 		"LogTail",
 		"GET",
@@ -213,6 +225,24 @@ var apiRoutes = Routes{
 		"/server/facVersion",
 		FactorioVersion,
 		false,
+	}, {
+		"AvailableVersions",
+		"GET",
+		"/server/availableVersions",
+		AvailableVersions,
+		false,
+	}, {
+		"InstallFactorio",
+		"POST",
+		"/server/install",
+		InstallFactorio,
+		true,
+	}, {
+		"RemoveFactorio",
+		"DELETE",
+		"/server/install",
+		RemoveFactorio,
+		true,
 	}, {
 		"LogoutUser",
 		"GET",
diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index c9f32983..6370ba04 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -71,6 +71,29 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		result.ModsResult = append(result.ModsResult, modsResult)
 	}
 
+	// Добавляем моды из mod-list.json которых нет как zip (DLC моды)
+	for _, simpleMod := range mods.ModSimpleList.Mods {
+		if simpleMod.Name == "base" {
+			continue
+		}
+		// Проверяем — есть ли уже в результатах
+		found := false
+		for _, r := range result.ModsResult {
+			if r.Name == simpleMod.Name {
+				found = true
+				break
+			}
+		}
+		if !found {
+			// DLC мод — только в mod-list.json, без zip
+			var modsResult ModsResult
+			modsResult.Name = simpleMod.Name
+			modsResult.Title = simpleMod.Name
+			modsResult.Enabled = simpleMod.Enabled
+			modsResult.Compatibility = true
+			result.ModsResult = append(result.ModsResult, modsResult)
+		}
+	}
 	return result
 }
 
diff --git a/src/factorio/mod_modpack.go b/src/factorio/mod_modpack.go
index 2b10f5e2..3ed696b8 100644
--- a/src/factorio/mod_modpack.go
+++ b/src/factorio/mod_modpack.go
@@ -218,24 +218,10 @@ func (modPackMap *ModPackMap) DeleteModPack(modPackName string) error {
 func (modPack *ModPack) LoadModPack() error {
 	var err error
 	config := bootstrap.GetConfig()
-	//get filemode, so it can be restored
-	fileInfo, err := os.Stat(config.FactorioModsDir)
-	if err != nil {
-		log.Printf("error on trying to save folder infos: %s", err)
-		return err
-	}
-	folderMode := fileInfo.Mode()
-
 	//clean factorio mod directory
-	err = os.RemoveAll(config.FactorioModsDir)
-	if err != nil {
-		log.Printf("error on removing the factorio mods dir: %s", err)
-		return err
-	}
-
-	err = os.Mkdir(config.FactorioModsDir, folderMode)
+	err = clearModsDir(config.FactorioModsDir)
 	if err != nil {
-		log.Printf("error on recreating mod dir: %s", err)
+		log.Printf("error on clearing the factorio mods dir: %s", err)
 		return err
 	}
 
diff --git a/src/factorio/mod_sync.go b/src/factorio/mod_sync.go
new file mode 100644
index 00000000..c94339d8
--- /dev/null
+++ b/src/factorio/mod_sync.go
@@ -0,0 +1,435 @@
+package factorio
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"bytes"
+	"compress/flate"
+	"compress/zlib"
+	"net/http"
+	"sync/atomic"
+
+	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
+	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
+)
+
+var modsSyncing atomic.Bool
+
+func IsModsSyncing() bool {
+	return modsSyncing.Load()
+}
+
+type ModSyncResult struct {
+	Name    string `json:"name"`
+	Version string `json:"version"`
+	Status  string `json:"status"` // downloaded, already_installed, builtin, not_found
+}
+
+type ModSyncProgress struct {
+	Type    string        `json:"type"`
+	Status  string        `json:"status"`
+	Current int           `json:"current,omitempty"`
+	Total   int           `json:"total,omitempty"`
+	Mod     string        `json:"mod,omitempty"`
+	Message string        `json:"message,omitempty"`
+	Warning string        `json:"warning,omitempty"`
+	Mods    []ModSyncResult `json:"mods,omitempty"`
+}
+
+// baseModNames — моды которые есть в любом vanilla + DLC сейве
+var baseModNames = map[string]bool{
+	"base":           true,
+	"elevated-rails": true,
+	"quality":        true,
+	"space-age":      true,
+}
+
+// isVanillaSave — true если сейв создан без геймплейных модов
+func isVanillaSave(mods []Mod) bool {
+	for _, m := range mods {
+		if !baseModNames[m.Name] {
+			return false
+		}
+	}
+	return true
+}
+
+func sendSyncProgress(p ModSyncProgress) {
+	p.Type = "mods_sync"
+	data, _ := json.Marshal(p)
+	room := websocket.WebsocketHub.GetRoom("mods_sync")
+	room.Send(string(data))
+}
+
+type portalModRelease struct {
+	DownloadURL string `json:"download_url"`
+	FileName    string `json:"file_name"`
+	Version     string `json:"version"`
+}
+
+type portalModInfo struct {
+	Releases []portalModRelease `json:"releases"`
+}
+
+// normalizeVersion убирает четвёртый компонент если он 0
+// version48 читает только 3 части, v[3] всегда 0
+// info.json хранит версию как "1.2.3", поэтому приводим к одному формату
+func normalizeVersion(v Version) string {
+	if v[3] == 0 {
+		return fmt.Sprintf("%d.%d.%d", v[0], v[1], v[2])
+	}
+	return v.String()
+}
+
+var ErrModNotOnPortal = fmt.Errorf("mod not available on portal (builtin or DLC)")
+
+// LevelDatMod хранит мод из level.dat0
+type LevelDatMod struct {
+	Name    string
+	Version Version
+}
+
+// readModsFromLevelDat читает полный список модов с версиями из level.dat0
+// Это работает для всех модов включая добавленные после создания сейва
+func readModsFromLevelDat(savePath string) ([]LevelDatMod, error) {
+	f, err := OpenArchiveFile(savePath, "level.dat0")
+	if err != nil {
+		return nil, fmt.Errorf("cannot open level.dat0: %v", err)
+	}
+	defer f.Close()
+
+	compressed, err := ioutil.ReadAll(f)
+	if err != nil {
+		return nil, fmt.Errorf("cannot read level.dat0: %v", err)
+	}
+
+	// Распаковываем zlib
+	data, err := zlibDecompress(compressed)
+	if err != nil {
+		return nil, fmt.Errorf("cannot decompress level.dat0: %v", err)
+	}
+
+	// Таблица модов начинается на смещении 0x2c
+	if len(data) < 0x2d {
+		return nil, fmt.Errorf("level.dat0 too small")
+	}
+
+	pos := 0x2c
+	n := int(data[pos]); pos++
+
+	var mods []LevelDatMod
+	for i := 0; i < n; i++ {
+		if pos >= len(data) {
+			break
+		}
+		nameLen := int(data[pos]); pos++
+		if pos+nameLen+7 > len(data) {
+			break
+		}
+		name := string(data[pos : pos+nameLen]); pos += nameLen
+		v0, v1, v2 := uint(data[pos]), uint(data[pos+1]), uint(data[pos+2]); pos += 3
+		pos += 4 // CRC
+		mods = append(mods, LevelDatMod{
+			Name:    name,
+			Version: Version{v0, v1, v2, 0},
+		})
+	}
+
+	return mods, nil
+}
+
+// zlibDecompress распаковывает zlib данные
+func zlibDecompress(data []byte) ([]byte, error) {
+	// Пробуем стандартный zlib
+	r, err := zlib.NewReader(bytes.NewReader(data))
+	if err == nil {
+		defer r.Close()
+		return ioutil.ReadAll(r)
+	}
+	// Пробуем raw deflate
+	r2 := flate.NewReader(bytes.NewReader(data))
+	defer r2.Close()
+	return ioutil.ReadAll(r2)
+}
+
+func getModRelease(modName string, version string) (portalModRelease, error) {
+	url := fmt.Sprintf("https://mods.factorio.com/api/mods/%s", modName)
+	resp, err := http.Get(url)
+	if err != nil {
+		return portalModRelease{}, fmt.Errorf("portal request failed: %v", err)
+	}
+	defer resp.Body.Close()
+
+	// 404 — мод не на портале (DLC или встроенный)
+	if resp.StatusCode == 404 {
+		return portalModRelease{}, ErrModNotOnPortal
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return portalModRelease{}, fmt.Errorf("reading portal response: %v", err)
+	}
+
+	// category: internal — встроенный DLC мод, не качаем
+	var fullInfo struct {
+		Category string             `json:"category"`
+		Releases []portalModRelease `json:"releases"`
+	}
+	if err := json.Unmarshal(body, &fullInfo); err == nil {
+		// no-category — DLC заглушка без релизов
+		if fullInfo.Category == "no-category" {
+			return portalModRelease{}, ErrModNotOnPortal
+		}
+		// internal без релизов — встроенный DLC (elevated-rails, space-age)
+		// internal с релизами — обычный мод (flib)
+		if fullInfo.Category == "internal" && len(fullInfo.Releases) == 0 {
+			return portalModRelease{}, ErrModNotOnPortal
+		}
+	}
+
+	var info portalModInfo
+	if err := json.Unmarshal(body, &info); err != nil {
+		return portalModRelease{}, fmt.Errorf("parsing portal response: %v", err)
+	}
+
+	for _, release := range info.Releases {
+		if release.Version == version {
+			return release, nil
+		}
+	}
+
+	return portalModRelease{}, fmt.Errorf("version %s not found for mod %s on portal", version, modName)
+}
+
+// SyncModsFromSave читает моды из сейва, сравнивает с установленными,
+// качает только недостающие. Прогресс через WebSocket room "mods_sync".
+// Пока идёт синк — IsModsSyncing() возвращает true, сервер не стартует.
+func SyncModsFromSave(savePath string, modNames []string) {
+	if !modsSyncing.CompareAndSwap(false, true) {
+		log.Println("SyncModsFromSave: already syncing, skipping")
+		sendSyncProgress(ModSyncProgress{Status: "error", Message: "sync already in progress"})
+		return
+	}
+	defer modsSyncing.Store(false)
+
+	config := bootstrap.GetConfig()
+
+	// 1. Читаем список модов из сейва
+	f, err := OpenArchiveFile(savePath, "level.dat", "level-init.dat")
+	if err != nil {
+		sendSyncProgress(ModSyncProgress{Status: "error", Message: fmt.Sprintf("cannot open save: %v", err)})
+		return
+	}
+	defer f.Close()
+
+	var header SaveHeader
+	if err := header.ReadFrom(f); err != nil {
+		sendSyncProgress(ModSyncProgress{Status: "error", Message: fmt.Sprintf("cannot read save header: %v", err)})
+		return
+	}
+
+	// 1.5. Читаем полный список модов из level.dat0
+	levelMods, err := readModsFromLevelDat(savePath)
+	if err != nil {
+		log.Printf("SyncModsFromSave: cannot read level.dat0, falling back to header: %v", err)
+	} else {
+		header.Mods = nil
+		for _, lm := range levelMods {
+			header.Mods = append(header.Mods, Mod{Name: lm.Name, Version: lm.Version})
+		}
+		log.Printf("SyncModsFromSave: loaded %d mods from level.dat0", len(header.Mods))
+	}
+
+		// 1.6. Проверяем тип сейва
+	var vanillaWarning string
+	if isVanillaSave(header.Mods) {
+		vanillaWarning = "Сейв создан без геймплейных модов. Моды могли быть добавлены позже — синхронизация может быть неполной."
+		log.Println("SyncModsFromSave: vanilla save detected, mods may have been added later")
+	}
+
+	// 2. Читаем установленные моды
+	mods, err := NewMods(config.FactorioModsDir)
+	if err != nil {
+		sendSyncProgress(ModSyncProgress{Status: "error", Message: fmt.Sprintf("cannot read installed mods: %v", err)})
+		return
+	}
+
+	// 3. Map установленных: name -> version (из info.json, формат "1.2.3")
+	installed := make(map[string]string)
+	for _, m := range mods.ModInfoList.Mods {
+		installed[m.Name] = m.Version
+	}
+
+	// Строим set модов для скачивания если передан список
+	filterMods := make(map[string]bool)
+	for _, name := range modNames {
+		filterMods[name] = true
+	}
+
+	// 4. Обходим все моды из сейва — собираем результаты
+	var results []ModSyncResult
+	var toDownload []Mod
+
+	for _, saveMod := range header.Mods {
+		if saveMod.Name == "base" {
+			continue
+		}
+		// Если передан список — качаем только выбранные
+		if len(filterMods) > 0 && !filterMods[saveMod.Name] {
+			continue
+		}
+		wantVersion := normalizeVersion(saveMod.Version)
+		if gotVersion, ok := installed[saveMod.Name]; ok && gotVersion == wantVersion {
+			log.Printf("SyncModsFromSave: %s %s already installed, skipping", saveMod.Name, wantVersion)
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "already_installed"})
+			continue
+		}
+		toDownload = append(toDownload, saveMod)
+	}
+
+	total := len(toDownload)
+	log.Printf("SyncModsFromSave: %d mods to download", total)
+
+	if total == 0 {
+		sendSyncProgress(ModSyncProgress{Status: "done", Total: 0, Mods: results, Warning: vanillaWarning})
+		return
+	}
+
+	// 5. Качаем недостающие
+	for i, saveMod := range toDownload {
+		wantVersion := normalizeVersion(saveMod.Version)
+
+		sendSyncProgress(ModSyncProgress{
+			Status:  "progress",
+			Current: i + 1,
+			Total:   total,
+			Mod:     saveMod.Name,
+		})
+
+		// Сначала проверяем локальный список DLC/базовых модов
+		if baseModNames[saveMod.Name] {
+			log.Printf("SyncModsFromSave: %s is builtin/DLC (local list), skipping", saveMod.Name)
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
+			continue
+		}
+
+		release, err := getModRelease(saveMod.Name, wantVersion)
+		if err == ErrModNotOnPortal {
+			log.Printf("SyncModsFromSave: %s is builtin/DLC, skipping", saveMod.Name)
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
+			continue
+		}
+		if err != nil {
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+			log.Printf("SyncModsFromSave: %s not found on portal: %v", saveMod.Name, err)
+			continue
+		}
+
+		mods, err = NewMods(config.FactorioModsDir)
+		if err != nil {
+			sendSyncProgress(ModSyncProgress{Status: "error", Message: fmt.Sprintf("cannot refresh mods: %v", err)})
+			return
+		}
+
+		if err = mods.DownloadMod(release.DownloadURL, release.FileName, saveMod.Name); err != nil {
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+			log.Printf("SyncModsFromSave: download failed for %s: %v", saveMod.Name, err)
+			continue
+		}
+
+		results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "downloaded"})
+		log.Printf("SyncModsFromSave: downloaded %s %s (%d/%d)", saveMod.Name, wantVersion, i+1, total)
+	}
+
+	// Обновляем mod-list.json — включаем нужные, выключаем лишние
+	finalMods, err := NewMods(config.FactorioModsDir)
+	if err == nil {
+		// Строим set модов из сейва
+		saveModSet := make(map[string]bool)
+		for _, saveMod := range header.Mods {
+			if saveMod.Name != "base" {
+				saveModSet[saveMod.Name] = true
+			}
+		}
+		// Включаем моды из сейва, выключаем остальные
+		for i, m := range finalMods.ModSimpleList.Mods {
+			if m.Name == "base" {
+				continue
+			}
+			if saveModSet[m.Name] {
+				finalMods.ModSimpleList.Mods[i].Enabled = true
+			} else {
+				finalMods.ModSimpleList.Mods[i].Enabled = false
+			}
+		}
+		if saveErr := finalMods.ModSimpleList.saveModInfoJson(); saveErr != nil {
+			log.Printf("SyncModsFromSave: error saving mod-list.json: %v", saveErr)
+		}
+	}
+
+	sendSyncProgress(ModSyncProgress{Status: "done", Total: total, Mods: results, Warning: vanillaWarning})
+}
+
+// ModStatus — статус мода при сравнении сейва с установленными
+type ModStatus struct {
+	Name            string `json:"name"`
+	VersionRequired string `json:"version_required"` // версия в сейве
+	VersionInstalled string `json:"version_installed"` // версия установленная (если есть)
+	Status          string `json:"status"` // missing, installed, wrong_version, builtin
+	PortalURL       string `json:"portal_url"`
+}
+
+// GetModsFromSave читает моды из сейва и сравнивает с установленными
+func GetModsFromSave(savePath string) ([]ModStatus, error) {
+	config := bootstrap.GetConfig()
+
+	// Читаем моды из level.dat0
+	levelMods, err := readModsFromLevelDat(savePath)
+	if err != nil {
+		return nil, fmt.Errorf("cannot read mods from save: %v", err)
+	}
+
+	// Читаем установленные моды
+	mods, err := NewMods(config.FactorioModsDir)
+	if err != nil {
+		return nil, fmt.Errorf("cannot read installed mods: %v", err)
+	}
+
+	installed := make(map[string]string)
+	for _, m := range mods.ModInfoList.Mods {
+		installed[m.Name] = m.Version
+	}
+
+	var result []ModStatus
+	for _, lm := range levelMods {
+		if lm.Name == "base" {
+			continue
+		}
+
+		wantVersion := normalizeVersion(lm.Version)
+		status := ModStatus{
+			Name:            lm.Name,
+			VersionRequired: wantVersion,
+			PortalURL:       "https://mods.factorio.com/mod/" + lm.Name,
+		}
+
+		if baseModNames[lm.Name] {
+			status.Status = "builtin"
+		} else if gotVersion, ok := installed[lm.Name]; ok {
+			status.VersionInstalled = gotVersion
+			if gotVersion == wantVersion {
+				status.Status = "installed"
+			} else {
+				status.Status = "wrong_version"
+			}
+		} else {
+			status.Status = "missing"
+		}
+
+		result = append(result, status)
+	}
+
+	return result, nil
+}
diff --git a/src/factorio/mods.go b/src/factorio/mods.go
index 9fc4083e..e7cb44bd 100644
--- a/src/factorio/mods.go
+++ b/src/factorio/mods.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
@@ -23,28 +24,12 @@ type LoginSuccessResponse struct {
 }
 
 func DeleteAllMods() error {
-	var err error
 	config := bootstrap.GetConfig()
-	modsDirInfo, err := os.Stat(config.FactorioModsDir)
+	err := clearModsDir(config.FactorioModsDir)
 	if err != nil {
-		log.Printf("error getting stats of FactorioModsDir: %s", err)
+		log.Printf("Error deleting all mods: %s", err)
 		return err
 	}
-
-	modsDirPerm := modsDirInfo.Mode().Perm()
-
-	err = os.RemoveAll(config.FactorioModsDir)
-	if err != nil {
-		log.Printf("removing FactorioModsDir failed: %s", err)
-		return err
-	}
-
-	err = os.Mkdir(config.FactorioModsDir, modsDirPerm)
-	if err != nil {
-		log.Printf("error recreating modPackDir: %s", err)
-		return err
-	}
-
 	return nil
 }
 
@@ -187,3 +172,18 @@ func ModStartUp() {
 		}
 	}
 }
+
+// clearModsDir удаляет содержимое директории, но не саму директорию.
+// Используется вместо os.RemoveAll когда директория примонтирована как Docker volume.
+func clearModsDir(dir string) error {
+	entries, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return fmt.Errorf("clearModsDir ReadDir: %v", err)
+	}
+	for _, entry := range entries {
+		if err := os.RemoveAll(filepath.Join(dir, entry.Name())); err != nil {
+			return fmt.Errorf("clearModsDir remove %s: %v", entry.Name(), err)
+		}
+	}
+	return nil
+}
diff --git a/src/factorio/save.go b/src/factorio/save.go
index 3d37b0f4..c48f024f 100644
--- a/src/factorio/save.go
+++ b/src/factorio/save.go
@@ -210,6 +210,18 @@ func (h *SaveHeader) ReadFrom(r io.Reader) (err error) {
 		}
 	}
 
+	// Factorio 2.0 добавил два байта и uint32 перед списком модов
+	if !h.FactorioVersion.Less(Version{2, 0, 0, 0}) {
+		_, err = r.Read(scratch[:2])
+		if err != nil {
+			return fmt.Errorf("read 2.0 unknown bytes: %v", err)
+		}
+		_, err = r.Read(scratch[:4])
+		if err != nil {
+			return fmt.Errorf("read 2.0 extra uint32: %v", err)
+		}
+	}
+
 	var n uint32
 	if atLeast016 {
 		n, err = readOptimUint(r, Version(h.FactorioVersion), 32)
diff --git a/src/factorio/server.go b/src/factorio/server.go
index a8a80d97..6ca74dcf 100644
--- a/src/factorio/server.go
+++ b/src/factorio/server.go
@@ -14,6 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
 	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
@@ -300,6 +301,15 @@ func (server *Server) Run() error {
 	go server.parseRunningCommand(server.StdOut)
 	go server.parseRunningCommand(server.StdErr)
 
+	// Ждём завершения синка модов если он идёт
+	if IsModsSyncing() {
+		log.Println("Waiting for mod sync to complete before starting server...")
+		for IsModsSyncing() {
+			time.Sleep(1 * time.Second)
+		}
+		log.Println("Mod sync complete, starting server")
+	}
+
 	err = server.Cmd.Start()
 	if err != nil {
 		log.Printf("Factorio process failed to start: %s", err)
diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index 9ed229f0..353698ea 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -16,6 +16,7 @@ import GameSettings from "./views/GameSettings";
 import Console from "./views/Console";
 import Help from "./views/Help";
 import socket from "../api/socket";
+import "./i18n";
 import {Flash} from "./components/Flash";
 
 
diff --git a/ui/App/components/ChangeLangDialog.jsx b/ui/App/components/ChangeLangDialog.jsx
new file mode 100644
index 00000000..58ebae22
--- /dev/null
+++ b/ui/App/components/ChangeLangDialog.jsx
@@ -0,0 +1,35 @@
+import React, {useState} from 'react';
+import Modal from "./Modal";
+import Button from "./Button";
+import { useTranslation } from "react-i18next";
+
+function ChangeLangDialog({isOpen, close, onSuccess}) {
+
+    const { t, i18n } = useTranslation();
+
+    const changeLang = (langKey) => {
+        i18n.changeLanguage(langKey)
+        close()
+    }
+
+    return (
+        <Modal
+            title={t("lang")}
+            content={
+                <>
+                    <Button className="w-full" onClick={() => changeLang("en")}>English</Button>
+                    <Button className="w-full" onClick={() => changeLang("ru")}>Русский</Button>
+                    {/* Other languages */}
+                </>
+            }
+            actions={
+            <>
+                <Button size="sm" type="danger" className="mr-2" onClick={close}>{t("cancel")}</Button>
+            </>}
+            isOpen={isOpen}
+            onSuccess={onSuccess}
+        />
+    );
+}
+
+export default ChangeLangDialog;
\ No newline at end of file
diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 2f47a676..d5086fea 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -4,21 +4,26 @@ import Button from "./Button";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faBars} from "@fortawesome/free-solid-svg-icons";
 import {Flash} from "./Flash";
+import ChangeLangDialog from "./ChangeLangDialog";
+import { useTranslation } from "react-i18next";
 
 const Layout = ({handleLogout, serverStatus}) => {
 
+    const { t, i18n } = useTranslation();
+
     const [isNavCollapsed, setIsNavCollapsed] = useState(true);
+    const [isChangingLang, setIsChangingLang] = useState(false);
 
     const Status = ({info}) => {
 
-        let text = 'Unknown';
+        let text = t("controls.unknown");
         let color = 'gray-light';
 
         if (info && info.running) {
-            text = 'Running';
+            text = t("controls.running");
             color = 'green';
         } else if (info && !info.running) {
-            text = 'Stopped';
+            text = t("controls.stopped");
             color = 'red';
         }
 
@@ -48,7 +53,7 @@ const Layout = ({handleLogout, serverStatus}) => {
             <div className="w-full md:w-88 md:fixed md:top-0 md:left-0 bg-gray-dark md:h-screen overflow-y-auto">
                 <div className="py-4 px-2 accentuated">
                     <div className="mx-4 justify-between flex text-center">
-                        <span className="text-dirty-white text-xl">Factorio Server Manager</span>
+                        <span className="text-dirty-white text-xl">{t("main_title")}</span>
                         <button
                             className="md:hidden cursor-pointer text-white hover:text-dirty-white"
                             onClick={() => setIsNavCollapsed(!isNavCollapsed)}
@@ -59,33 +64,39 @@ const Layout = ({handleLogout, serverStatus}) => {
                 </div>
                 <div className={isNavCollapsed ? "hidden md:block" : "block"}>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">Server Status</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t("server_status")}</h1>
                         <div className="mx-4 mb-4 text-center">
                             <Status info={serverStatus}/>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">Server Management</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t("server_management")}</h1>
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Link to="/">Controls</Link>
-                            <Link to="/saves">Saves</Link>
-                            <Link to="/mods">Mods</Link>
-                            <Link to="/server-settings">Server Settings</Link>
-                            <Link to="/game-settings">Game Settings</Link>
-                            <Link to="/console">Console</Link>
-                            <Link to="/logs" last={true}>Logs</Link>
+                            <Link to="/">{t("controls.title")}</Link>
+                            <Link to="/saves">{t("saves.title")}</Link>
+                            <Link to="/mods">{t("mods.title")}</Link>
+                            <Link to="/server-settings">{t("server_settings.title")}</Link>
+                            <Link to="/game-settings">{t("game_settings.title")}</Link>
+                            <Link to="/console">{t("console.title")}</Link>
+                            <Link to="/logs" last={true}>{t("logs.title")}</Link>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
-                        <h1 className="text-dirty-white text-lg mb-2 mx-4">FSM Administration</h1>
+                        <h1 className="text-dirty-white text-lg mb-2 mx-4">{t("FSM_administration")}</h1>
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Link to="/user-management">Users</Link>
-                            <Link to="/help" last={true}>Help</Link>
+                            <Link to="/user-management">{t("users.title")}</Link>
+                            <Button className="w-full mb-1" onClick={() => setIsChangingLang(true)}>{t("lang")}</Button>
+                            <Link to="/help" last={true}>{t("help.title")}</Link>
+                            <ChangeLangDialog
+                                isOpen={isChangingLang}
+                                close={() => setIsChangingLang(false)}
+                                onSuccess={() => console.log("new lang apply")}
+                            />
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
-                            <Button type="danger" className="w-full" onClick={handleLogout}>Logout</Button>
+                            <Button type="danger" className="w-full" onClick={handleLogout}>{t("logout")}</Button>
                         </div>
                     </div>
                     <div className="accentuated-t accentuated-x md:block hidden"/>
diff --git a/ui/App/components/Select.jsx b/ui/App/components/Select.jsx
index f3de0573..9d93aac8 100644
--- a/ui/App/components/Select.jsx
+++ b/ui/App/components/Select.jsx
@@ -15,9 +15,11 @@ const Select = ({register, options, className = "", defaultValue = "", disabled
         <select
             className="shadow appearance-none border w-full py-2 px-3 text-black"
             {...register}
-            value={value}
             disabled={disabled}
-            onChange={optionElement => setValue(optionElement.target.value)}
+            onChange={e => {
+                setValue(e.target.value);
+                if (register?.onChange) register.onChange(e);
+            }}
         >
             {options.map(option => <option value={option.value} key={option.value}>{option.name}</option>)}
         </select>
diff --git a/ui/App/i18n.js b/ui/App/i18n.js
new file mode 100644
index 00000000..8f318336
--- /dev/null
+++ b/ui/App/i18n.js
@@ -0,0 +1,39 @@
+import i18n from "i18next";
+import { initReactI18next } from "react-i18next";
+import Backend from 'i18next-http-backend'
+import LanguageDetector from "i18next-browser-languagedetector";
+import enTranslations from "./locales/en.json";
+import ruTranslations from "./locales/ru.json";
+
+const resources =
+{
+    en:
+    {
+        translation: enTranslations,
+    },
+    ru:
+    {
+        translation: ruTranslations,
+    }
+};
+
+i18n
+    .use(Backend)
+    .use(LanguageDetector)
+    .use(initReactI18next)
+    .init({
+        resources,
+        fallbackLng: "en", // Default Language
+        // Detecting and caching of language cookies
+        detection:
+        {
+            order: ["localStorage", "cookie", "navigator"],
+            cache: ["localStorage", "cookie"]
+        },
+        interpolation:
+        {
+            escapeValue: false // react already safes from xss
+        }
+    });
+
+export default i18n;
\ No newline at end of file
diff --git a/ui/App/locales/en.json b/ui/App/locales/en.json
new file mode 100644
index 00000000..9280a472
--- /dev/null
+++ b/ui/App/locales/en.json
@@ -0,0 +1,207 @@
+{
+    "save": "Save",
+    "upload": "Upload",
+    "saved": "Settings saved.",
+    "create": "Create",
+    "cancel": "Cancel",
+    "confirm": "Confirm",
+    "name": "Name",
+    "username": "Username",
+    "password": "Password",
+    "logout": "Logout",
+    "install": "Install",
+    "actions": "Actions",
+    "role": "Role",
+    "email": "Email",
+    "change": "Change",
+    "load": "Load",
+    "server_status": "Server Status",
+    "server_management": "Server Management",
+    "FSM_administration": "FSM Administration",
+    "main_title": "Factorio Server Manager",
+    "server_settings": {
+        "title": "Server settings",
+        "admins": "Admins",
+        "name": "Name",
+        "description": "Description",
+        "tags": "Tags",
+        "_comment_max_players": "Maximum number of players allowed, admins can join even a full server. 0 means unlimited.",
+        "max_players": "Max players",
+        "_comment_visibility": "Public: Game will be published on the official Factorio matching server. Lan: Game will be broadcast on LAN",
+        "visibility______": {
+            "public_": "Public",
+            "lan_": "Lan"
+        },
+        "visibility": "Visibility",
+        "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
+        "username": "Username",
+        "password": "Password",
+        "_comment_token": "Authentication token. May be used instead of 'password' above.",
+        "token": "Token",
+        "game_password": "Game password",
+        "_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
+        "require_user_verification": "Require user verification",
+        "_comment_max_upload_in_kilobytes_per_second": "Optional, default value is 0. 0 means unlimited.",
+        "max_upload_in_kilobytes_per_second": "Max upload in kilobytes per second",
+        "_comment_max_upload_slots": "Optional, default value is 5. 0 means unlimited.",
+        "max_upload_slots": "Max upload slots",
+        "_comment_minimum_latency_in_ticks": "Optional one tick is 16ms in default speed, default value is 0. 0 means no minimum.",
+        "minimum_latency_in_ticks": "Minimum latency in ticks",
+        "_comment_max_heartbeats_per_second": "Network tick rate. Maximum rate game updates packets are sent at before bundling them together. Minimum value is 6, maximum value is 240.",
+        "max_heartbeats_per_second": "Max heartbeats per second",
+        "_comment_ignore_player_limit_for_returning_players": "Players that played on this map already can join even when the max player limit was reached.",
+        "ignore_player_limit_for_returning_players": "Ignore player limit for returning players",
+        "_comment_allow_commands": "Possible values are: true, false and admins-only",
+        "allow_commands": "Allow commands",
+        "_comment_autosave_interval": "Autosave interval in minutes",
+        "autosave_interval": "Autosave interval",
+        "_comment_autosave_slots": "Server autosave slots, it is cycled through when the server autosaves.",
+        "autosave_slots": "Autosave slots",
+        "_comment_afk_autokick_interval": "How many minutes until someone is kicked when doing nothing, 0 for never.",
+        "afk_autokick_interval": "Afk autokick interval",
+        "_comment_auto_pause": "Whether should the server be paused when no players are present.",
+        "auto_pause": "Auto pause",
+        "_comment_auto_pause_when_players_connect": "Whether should the server be paused when someone is connecting to the server.",
+        "auto_pause_when_players_connect": "Auto pause when players connect",
+        "only_admins_can_pause_the_game": "Only admins can pause the game",
+        "_comment_autosave_only_on_server": "Whether autosaves should be saved only on server or also on all connected clients. Default is true.",
+        "autosave_only_on_server": "Autosave only on server",
+        "_comment_non_blocking_saving": "Highly experimental feature, enable only at your own risk of losing your saves. On UNIX systems, server will fork itself to create an autosave. Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.",
+        "non_blocking_saving": "Non blocking saving",
+        "_comment_segment_sizes": "Long network messages are split into segments that are sent over multiple ticks. Their size depends on the number of peers currently connected. Increasing the segment size will increase upload bandwidth requirement for the server and download bandwidth requirement for clients. This setting only affects server outbound messages. Changing these settings can have a negative impact on connection stability for some clients.",
+        "minimum_segment_size": "Minimum segment size",
+        "minimum_segment_size_peer_count": "Minimum segment size peer count",
+        "maximum_segment_size": "Maximum segment size",
+        "maximum_segment_size_peer_count": "Maximum segment size peer count"
+    },
+    "saves": {
+        "create_save": "Create Save",
+        "upload_save": "Upload Save",
+        "title": "Saves",
+        "last_modified": "Last Modified At",
+        "size": "Size",
+        "actions": "Actions",
+        "create_new_save_only_when_server_not_running": "Create a new Save is only possible if the Factorio server is not running.",
+        "save_form": {
+            "file_name": "Savefile Name",
+            "save_file_error_message": "Savefile Name is required",
+            "create_save": "Create Save"
+        },
+        "upload_form": {
+            "select_file": "Select File ...",
+            "file_name": "Savefile",
+            "save_file_error_message": "Savefile is required",
+            "upload": "Upload"
+        }
+    },
+    "controls": {
+        "title": "Server Status",
+        "status": "Status",
+        "unknown": "Unknown",
+        "running": "Running",
+        "stopped": "Stopped",
+        "port": "Port",
+        "IP_error_message": "IP is required and must be valid.",
+        "port_error_message": "Port is required within range 1-65535",
+        "save_error_message": "Save is required and must be valid.",
+        "f_version": "Factorio version",
+        "save": "Save",
+        "save&stop": "Save & Stop Server",
+        "kill_server": "Kill Server",
+        "start_server": "Start Server"
+    },
+    "mods": {
+        "change_mods_while_running_error_message": "Changing mods is disabled while the server is running!",
+        "install_mod": "Install Mod",
+        "upload_mod": "Upload Mod",
+        "load_mods": "Load Mods from Save",
+        "title": "Mods",
+        "delete_all": "Delete all Mods",
+        "update_all": "Update all Mods",
+        "download_all": "Download all Mods",
+        "mod_packs": "Mod packs",
+        "select_file": "Select File ...",
+        "mods_loaded_from_save": "Mods are loaded from save file @@@.",
+        "load_mods_from_save": "Load Mods from Save",
+        "load_confirm_dialog": "Loading the Mods from Save @@@ will remove all currently installed Mods.",
+        "add_modpack_with_current_mods": "Add ModPack with current installed Mods",
+        "add_mod": {
+            "loading_mod_list": "Loading List of Mods from",
+            "version": "Version",
+            "compatibility": "Compatibility"
+        },
+        "mod_list": {
+            "enabled": "Enabled",
+            "compatibility": "Compatibility",
+            "mod_version": "Mod Version",
+            "factorio_version": "Factorio Version"
+        },
+        "mod_pack": {
+            "load_modpack": "Load ModPack",
+            "load_confirm_dialog": "Loading the ModPack @@@ will remove all installed Mods."
+        },
+        "sync_from_save": "Sync Mods from Save",
+        "sync_started": "Sync started...",
+        "sync_downloading": "Downloading",
+        "sync_done": "Sync complete",
+        "sync_error": "Sync error",
+        "sync_warning_vanilla": "Save was created without gameplay mods. Mods may have been added later — sync may be incomplete.",
+        "status_downloaded": "Downloaded",
+        "status_already_installed": "Already installed",
+        "status_builtin": "Built-in / DLC",
+        "status_not_found": "Not found on portal",
+        "status_downloading": "Downloading..."
+    },
+    "login": {
+        "login_failed_message": "Login failed. Username or Password wrong.",
+        "title": "Login",
+        "login": "Login",
+        "username_error_message": "Username is required",
+        "password_error_message": "Password is required",
+        "sign_in": "Sign In",
+        "factorio_login_error_message": "Given username or email and password do not match any account."
+    },
+    "console": {
+        "title": "Console",
+        "error": "The console is not available, because Factorio is not running."
+    },
+    "logs": {
+        "title": "Logs"
+    },
+    "help": {
+        "title": "Help",
+        "fsm": "Factorio Server Manager",
+        "fsm_content": "The Factorio Server Manager (FSM) is an open source project and is not affiliated to the game Factorio or Wube Software.",
+        "bugs_help": "Bugs and Help",
+        "bugs_help_content": "Please use the <0>GitHub repository</0> to report bugs or seek for help.",
+        "helpful_resources": "Helpful Resources",
+        "factorio_link_text": "Official Factorio Wiki about Multiplayer"
+    },
+    "users": {
+        "title": "Users",
+        "user_list": "List of Users",
+        "change_password": {
+            "title": "Change Password",
+            "update_successful": "Password changed",
+            "old_password": "Old Password",
+            "old_password_error": "Old Password is required",
+            "new_password": "New Password",
+            "new_password_error": "New Password is required",
+            "new_password_confirmation": "New Password Confirmation",
+            "new_password_confirmation_error": "New Password Confirmation is required"
+        },
+        "create_user": {
+            "title": "Create User",
+            "username_error": "Username is required",
+            "role_error": "Role is required",
+            "email_error": "Email is required",
+            "password_error": "Password is required",
+            "password_confirmation": "Password Confirmation",
+            "password_confirmation_error": "Password Confirmation is required and must match the Password"
+        }
+    },
+    "game_settings": {
+        "title": "Game Settings"
+    },
+    "lang": "Language"
+}
\ No newline at end of file
diff --git a/ui/App/locales/ru.json b/ui/App/locales/ru.json
new file mode 100644
index 00000000..c25555a7
--- /dev/null
+++ b/ui/App/locales/ru.json
@@ -0,0 +1,206 @@
+{
+    "save": "Сохранить",
+    "upload": "Загрузить",
+    "saved": "Настройки сохранены.",
+    "create": "Создать",
+    "cancel": "Отмена",
+    "confirm": "Подтвердить",
+    "name": "Имя",
+    "username": "Имя пользователя",
+    "password": "Пароль",
+    "logout": "Выйти",
+    "install": "Установить",
+    "actions": "Действия",
+    "role": "Роль",
+    "email": "Email",
+    "change": "Изменить",
+    "load": "Загрузить",
+    "server_status": "Состояние сервера",
+    "server_management": "Управление сервером",
+    "FSM_administration": "Администрирование FSM",
+    "main_title": "Factorio Server Manager",
+    "server_settings": {
+        "title": "Настройки сервера",
+        "admins": "Админы",
+        "name": "Название",
+        "description": "Описание",
+        "tags": "Теги",
+        "_comment_max_players": "Максимальное количество игроков. Администраторы могут присоединиться даже к полному серверу. 0 означает без ограничений.",
+        "max_players": "Максимум игроков",
+        "_comment_visibility": "Public: Игра будет опубликована на официальном сервере подбора Factorio. Lan: Игра будет транслироваться в локальной сети",
+        "visibility_____": {
+            "public_": "Публичный",
+            "lan_": "Локальная сеть"
+        },
+        "visibility": "Видимость",
+        "_comment_credentials": "Ваши учётные данные для входа на factorio.com. Требуется для игр с публичной видимостью",
+        "username": "Имя пользователя",
+        "password": "Пароль",
+        "_comment_token": "Токен аутентификации. Может использоваться вместо 'пароля' выше.",
+        "token": "Токен",
+        "game_password": "Пароль игры",
+        "_comment_require_user_verification": "Если установлено значение true, сервер будет разрешать подключение только клиентам с действующей учётной записью Factorio.com",
+        "require_user_verification": "Требуется проверка пользователя",
+        "_comment_max_upload_in_kilobytes_per_second": "Необязательно, значение по умолчанию — 0. 0 означает без ограничений.",
+        "max_upload_in_kilobytes_per_second": "Максимальная загрузка в килобайтах в секунду",
+        "_comment_max_upload_slots": "Необязательно, значение по умолчанию — 5. 0 означает без ограничений.",
+        "max_upload_slots": "Максимальное количество слотов загрузки",
+        "_comment_minimum_latency_in_ticks": "Необязательно, один тик — это 16 мс при стандартной скорости, значение по умолчанию — 0. 0 означает отсутствие минимума.",
+        "minimum_latency_in_ticks": "Минимальная задержка в тиках",
+        "_comment_max_heartbeats_per_second": "Сетевая частота тиков. Максимальная частота, с которой пакеты обновлений игры отправляются перед их объединением. Минимальное значение — 6, максимальное — 240.",
+        "max_heartbeats_per_second": "Максимум сердечных сокращений в секунду",
+        "_comment_ignore_player_limit_for_returning_players": "Игроки, которые уже играли на этой карте, могут присоединиться даже при достижении лимита игроков.",
+        "ignore_player_limit_for_returning_players": "Игнорировать лимит игроков для возвращающихся игроков",
+        "_comment_allow_commands": "Возможные значения: true, false и только-админы",
+        "allow_commands": "Разрешить команды",
+        "_comment_autosave_interval": "Интервал автосохранения в минутах",
+        "autosave_interval": "Интервал автосохранения",
+        "_comment_autosave_slots": "Слоты автосохранения сервера, циклически используемые при автосохранении.",
+        "autosave_slots": "Слоты автосохранения",
+        "_comment_afk_autokick_interval": "Сколько минут до кика игрока за бездействие, 0 — никогда.",
+        "afk_autokick_interval": "Интервал автокика за AFK",
+        "_comment_auto_pause": "Следует ли ставить игру на паузу, когда нет игроков.",
+        "auto_pause": "Автопауза",
+        "_comment_auto_pause_when_players_connect": "Следует ли ставить игру на паузу, когда игрок подключается к серверу.",
+        "auto_pause_when_players_connect": "Автопауза при подключении игроков",
+        "only_admins_can_pause_the_game": "Только админы могут ставить игру на паузу",
+        "_comment_autosave_only_on_server": "Следует ли сохранять автосохранения только на сервере или также на всех подключённых клиентах. По умолчанию — true.",
+        "autosave_only_on_server": "Автосохранение только на сервере",
+        "_comment_non_blocking_saving": "Экспериментальная функция, включайте на свой страх и риск потери сохранений. На UNIX-системах сервер будет форкаться для создания автосохранения. Автосохранение на подключённых Windows-клиентах будет отключено независимо от опции autosave_only_on_server.",
+        "non_blocking_saving": "Неблокирующее сохранение",
+        "_comment_segment_sizes": "Длинные сетевые сообщения разбиваются на сегменты, которые отправляются за несколько тиков. Их размер зависит от количества подключённых пиров. Увеличение размера сегмента увеличит требования к пропускной способности загрузки для сервера и скачивания для клиентов. Эта настройка влияет только на исходящие сообщения сервера. Изменение этих настроек может негативно сказаться на стабильности соединения для некоторых клиентов.",
+        "minimum_segment_size": "Минимальный размер сегмента",
+        "minimum_segment_size_peer_count": "Количество пиров для минимального размера сегмента",
+        "maximum_segment_size": "Максимальный размер сегмента",
+        "maximum_segment_size_peer_count": "Количество пиров для максимального размера сегмента"
+    },
+    "saves": {
+        "create_save": "Создать сохранение",
+        "upload_save": "Загрузить сохранение",
+        "title": "Сохранения",
+        "last_modified": "Последние изменение",
+        "size": "Вес",
+        "actions": "Действия",
+        "create_new_save_only_when_server_not_running": "Создать новый сохранённый файл возможно только если сервер Factorio не запущен.",
+        "save_form": {
+            "file_name": "Имя файла",
+            "save_file_error": "Имя файла обязательное поле",
+            "create_save": "Создать сохранение"
+        },
+        "upload_form": {
+            "select_file": "Выберите сохранение ...",
+            "file_name": "Файл сохранения",
+            "save_file_error": "Файл сохранения обязателен",
+            "upload": "Загрузить"
+        }
+    },
+    "controls": {
+        "title": "Статус сервера",
+        "status": "Статус",
+        "running": "Запущен",
+        "stopped": "Остановлен",
+        "port": "Порт",
+        "IP_error_message": "Требуется IP-адрес, который должен быть действительным.",
+        "port_error_message": "Требуется порт в диапазоне 1-65535",
+        "save_error_message": "Сохранение обязательно и должно быть действительным.",
+        "f_version": "Версия Factorio",
+        "save": "Сохранить",
+        "save&stop": "Сохранить и остановить сервер",
+        "kill_server": "Убить сервер",
+        "start_server": "Запустить сервер"
+    },
+    "mods": {
+        "change_mods_while_running_error_message": "Изменение модов отключено, пока сервер работает!",
+        "install_mod": "Установить мод",
+        "upload_mod": "Загрузить мод",
+        "load_mods": "Загрузить моды из сохранения",
+        "title": "Моды",
+        "delete_all": "Удалить все моды",
+        "update_all": "Обновить все моды",
+        "download_all": "Скачать все моды",
+        "mod_packs": "Паки модов",
+        "select_file": "Выбрать файл...",
+        "mods_loaded_from_save": "Моды загружены из файла сохранения @@@.",
+        "load_mods_from_save": "Загрузить моды из сохранения",
+        "load_confirm_dialog": "Загрузка модов из сохранения @@@ удалит все текущие установленные моды.",
+        "add_modpack_with_current_mods": "Добавить пак модов с текущими установленными модами",
+        "add_mod": {
+            "loading_mod_list": "Загрузка списка модов из",
+            "version": "Версия",
+            "compatibility": "Совместимость"
+        },
+        "mod_list": {
+            "enabled": "Включён",
+            "compatibility": "Совместимость",
+            "mod_version": "Версия мода",
+            "factorio_version": "Версия Factorio"
+        },
+        "mod_pack": {
+            "load_modpack": "Загрузить пак модов",
+            "load_confirm_dialog": "Загрузка пака модов @@@ удалит все установленные моды."
+        },
+        "sync_from_save": "Синхронизировать моды из сейва",
+        "sync_started": "Синхронизация запущена...",
+        "sync_downloading": "Скачивание",
+        "sync_done": "Синхронизация завершена",
+        "sync_error": "Ошибка синхронизации",
+        "sync_warning_vanilla": "Сейв создан без геймплейных модов. Моды могли быть добавлены позже — синхронизация может быть неполной.",
+        "status_downloaded": "Скачан",
+        "status_already_installed": "Уже установлен",
+        "status_builtin": "Встроенный / DLC",
+        "status_not_found": "Не найден на портале",
+        "status_downloading": "Скачивается..."
+    },
+    "login": {
+        "login_failed_message": "Ошибка входа. Неверное имя пользователя или пароль.",
+        "title": "Вход",
+        "login": "Вход",
+        "username_error_message": "Требуется имя пользователя",
+        "password_error_message": "Требуется пароль",
+        "sing_in": "Войти",
+        "factorio_login_error_message": "Указанные имя пользователя, email или пароль не соответствуют ни одному аккаунту."
+    },
+    "console": {
+        "title": "Консоль",
+        "error": "Консоль недоступна, так как Factorio не запущен."
+    },
+    "logs": {
+        "title": "Логи"
+    },
+    "help": {
+        "title": "Помощь",
+        "fsm": "Менеджер серверов Factorio",
+        "fsm_content": "Factorio Server Manager (FSM) — проект с открытым исходным кодом и не связан с игрой Factorio или компанией Wube Software.",
+        "bugs_help": "Сообщения об ошибках и помощь",
+        "bugs_help_content": "Пожалуйста, используйте <0>репозиторий GitHub</0> для сообщения об ошибках или запроса помощи.",
+        "helpful_resources": "Полезные ресурсы",
+        "factorio_link_text": "Официальная вики Factorio о многопользовательской игре"
+    },
+    "users": {
+        "title": "Пользователи",
+        "user_list": "Список пользователей",
+        "change_password": {
+            "title": "Изменить пароль",
+            "update_successful": "Пароль изменён",
+            "old_password": "Старый пароль",
+            "old_password_error": "Требуется старый пароль",
+            "new_password": "Новый пароль",
+            "new_password_error": "Требуется новый пароль",
+            "new_password_confirmation": "Подтверждение нового пароля",
+            "new_password_confirmation_error": "Требуется подтверждение нового пароля"
+        },
+        "create_user": {
+            "title": "Создать пользователя",
+            "username_error": "Требуется имя пользователя",
+            "role_error": "Требуется роль",
+            "email_error": "Требуется email",
+            "password_error": "Требуется пароль",
+            "password_confirmation": "Подтверждение пароля",
+            "password_confirmation_error": "Требуется подтверждение пароля, и оно должно совпадать с паролем"
+        }
+    },
+    "game_settings": {
+        "title": "Настройки игры"
+    },
+    "lang": "Язык"
+}
\ No newline at end of file
diff --git a/ui/App/views/Controls.jsx b/ui/App/views/Controls.jsx
index 62b31d9e..f881b25c 100644
--- a/ui/App/views/Controls.jsx
+++ b/ui/App/views/Controls.jsx
@@ -11,6 +11,27 @@ import Error from "../components/Error";
 const Controls = ({serverStatus}) => {
 
     const factorioVersion = serverStatus.fac_version ? serverStatus.fac_version : 'Unknown';
+    const [availableVersions, setAvailableVersions] = useState({});
+    const [isInstalling, setIsInstalling] = useState(false);
+    const [isRemoving, setIsRemoving] = useState(false);
+    const [selectedVersion, setSelectedVersion] = useState('stable');
+
+    useEffect(() => {
+        server.availableVersions()
+            .then(res => setAvailableVersions(res));
+    }, []);
+
+    const installVersion = async () => {
+        setIsInstalling(true);
+        await server.installVersion(selectedVersion);
+        setIsInstalling(false);
+    }
+
+    const removeInstallation = async () => {
+        setIsRemoving(true);
+        await server.removeInstallation();
+        setIsRemoving(false);
+    }
     const [saves, setSaves] = useState([]);
     const [isDisabled, setIsDisabled] = useState(true);
     const [isStopping, setIsStopping] = useState(false);
@@ -135,6 +156,49 @@ const Controls = ({serverStatus}) => {
                 </div>
             }
         />
+        <Panel
+            title="Factorio Installation"
+            content={
+                <div className="lg:flex">
+                    <div className="lg:w-1/4 mb-2 mr-0 lg:mr-4">
+                        <div className="font-bold">Installed Version</div>
+                        <div>{factorioVersion}</div>
+                    </div>
+                    <div className="lg:w-1/4 mb-2 mr-0 lg:mr-4">
+                        <div className="font-bold">Available Versions</div>
+                        <select
+                            className="w-full border rounded px-2 py-1"
+                            value={selectedVersion}
+                            onChange={e => setSelectedVersion(e.target.value)}
+                            disabled={serverStatus.running}
+                        >
+                            <option value="stable">stable ({availableVersions?.stable?.headless || '...'})</option>
+                            <option value="experimental">experimental ({availableVersions?.experimental?.headless || '...'})</option>
+                        </select>
+                    </div>
+                </div>
+            }
+            actions={
+                <div className="md:flex">
+                    <Button
+                        onClick={installVersion}
+                        isLoading={isInstalling}
+                        isDisabled={serverStatus.running || isRemoving}
+                        size="sm"
+                        type="success"
+                        className="w-full md:w-auto mb-2 md:mb-0 md:mr-2"
+                    >Download & Install</Button>
+                    <Button
+                        onClick={removeInstallation}
+                        isLoading={isRemoving}
+                        isDisabled={serverStatus.running || isInstalling}
+                        size="sm"
+                        type="danger"
+                        className="w-full md:w-auto"
+                    >Remove Installation</Button>
+                </div>
+            }
+        />
         </form>
     )
 };
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 331c3527..86936e08 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,83 +1,302 @@
 import React, {useEffect, useState} from "react";
 import savesResource from "../../../../api/resources/saves";
-import Select from "../../../components/Select";
 import Label from "../../../components/Label";
-import {useForm} from "react-hook-form";
 import Button from "../../../components/Button";
 import modsResource from "../../../../api/resources/mods";
-import modResource from "../../../../api/resources/mods";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
-import ConfirmDialog from "../../../components/ConfirmDialog";
+import socket from "../../../../api/socket";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {useTranslation} from "react-i18next";
+import {faSpinner, faCheck, faTimes, faMinusCircle, faExternalLinkAlt} from "@fortawesome/free-solid-svg-icons";
 
-const LoadMods = ({refreshMods}) => {
+const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
+
+const STATUS_ICON = {
+    downloading:   <FontAwesomeIcon icon={faSpinner} spin={true} className="text-orange"/>,
+    downloaded:    <FontAwesomeIcon icon={faCheck} className="text-green"/>,
+    installed:     <FontAwesomeIcon icon={faCheck} className="text-green"/>,
+    wrong_version: <FontAwesomeIcon icon={faCheck} className="text-yellow-500"/>,
+    missing:       <FontAwesomeIcon icon={faTimes} className="text-red"/>,
+    builtin:       <FontAwesomeIcon icon={faMinusCircle} className="text-blue-400"/>,
+    not_found:     <FontAwesomeIcon icon={faTimes} className="text-red"/>,
+};
 
+const STATUS_TEXT = {
+    downloading:   "Downloading...",
+    downloaded:    "Downloaded",
+    installed:     "Installed",
+    wrong_version: "Wrong version",
+    missing:       "Missing",
+    builtin:       "Built-in / DLC",
+    not_found:     "Not found on portal",
+};
+
+const LoadMods = ({refreshMods}) => {
+    const {t} = useTranslation();
     const [saves, setSaves] = useState([]);
-    const {register, reset, handleSubmit} = useForm();
+    const [selectedSave, setSelectedSave] = useState("");
     const [isLoading, setIsLoading] = useState(false);
+    const [isSyncing, setIsSyncing] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
-    const [loadModsData, setLoadModsData] = useState(undefined);
+    const [modRows, setModRows] = useState([]);
+    const [checkedMods, setCheckedMods] = useState({});
+    const [syncError, setSyncError] = useState(null);
+    const [currentMod, setCurrentMod] = useState(null);
+    const [warning, setWarning] = useState(null);
 
     useEffect(() => {
         (async () => {
-            setIsFactorioAuthenticated(await modResource.portal.status())
-
-            const s = await savesResource.list()
+            setIsFactorioAuthenticated(await modsResource.portal.status());
+            const s = await savesResource.list();
             setSaves(s);
             if (s.length > 0) {
                 setIsDisabled(false);
+                setSelectedSave(s[0].name);
             }
-            reset();
         })();
     }, []);
 
-    const loadModsRequested = data => {
+    useEffect(() => {
+        const handler = (message) => {
+            const data = JSON.parse(message);
+            if (data.status === "progress") {
+                setCurrentMod(data.mod);
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "downloading"} : r
+                ));
+            } else if (data.status === "done") {
+                setIsSyncing(false);
+                setCurrentMod(null);
+                setWarning(data.warning || null);
+                if (data.mods) {
+                    setModRows(data.mods);
+                    setCheckedMods({});
+                }
+                refreshMods();
+            } else if (data.status === "error") {
+                setIsSyncing(false);
+                setCurrentMod(null);
+                setSyncError(data.message);
+            }
+        };
+
+        socket.on('mods_sync', handler);
+        socket.emit('mods sync subscribe');
+        return () => {
+            socket.off('mods_sync', handler);
+            socket.emit('mods sync unsubscribe');
+        };
+    }, []);
+
+    const onReadSave = async () => {
+        if (!selectedSave) return;
         setIsLoading(true);
-        setLoadModsData(data);
-    }
+        setModRows([]);
+        setCheckedMods({});
+        setSyncError(null);
+        setWarning(null);
 
-    const loadMods = async data => {
-        await modResource.deleteAll();
-        const {mods} = await savesResource.mods(data.save).catch(() => {
+        try {
+            const mods = await modsResource.getFromSave(selectedSave);
+            setModRows(mods || []);
+            // По умолчанию отмечаем missing и wrong_version
+            const checked = {};
+            (mods || []).forEach(m => {
+                if (m.status === 'missing' || m.status === 'wrong_version') {
+                    checked[m.name] = true;
+                }
+            });
+            setCheckedMods(checked);
+        } catch(e) {
+            setSyncError("Failed to read save: " + e.message);
+        } finally {
             setIsLoading(false);
-            setLoadModsData(undefined);
+        }
+    };
+
+    const onSync = async () => {
+        const toSync = modRows
+            .filter(m => checkedMods[m.name])
+            .map(m => m.name);
+        if (toSync.length === 0) return;
+
+        setIsSyncing(true);
+        setSyncError(null);
+        try {
+            const selectedModNames = Object.keys(checkedMods).filter(k => checkedMods[k]);
+            await modsResource.syncFromSave(selectedSave, selectedModNames);
+        } catch(e) {
+            setIsSyncing(false);
+            setSyncError("Failed to start sync: " + e.message);
+        }
+    };
+
+    const toggleCheck = (name) => {
+        setCheckedMods(prev => ({...prev, [name]: !prev[name]}));
+    };
+
+    const selectAll = () => {
+        const checked = {};
+        modRows.forEach(m => {
+            if (m.status !== 'builtin' && m.status !== 'installed') {
+                checked[m.name] = true;
+            }
         });
+        setCheckedMods(checked);
+    };
 
-        await modResource.portal.installMultiple(mods)
-            .then(() => {
-                refreshMods();
-                window.flash(`Mods are loaded from save file ${data.save}.`, "green");
-            }).finally(() => {
-                setIsLoading(false);
-                setLoadModsData(undefined);
-            });
+    const clearAll = () => setCheckedMods({});
+
+    const checkedCount = Object.values(checkedMods).filter(Boolean).length;
+
+    if (!isFactorioAuthenticated) {
+        return <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>;
     }
 
-    return isFactorioAuthenticated
-        ? <form onSubmit={handleSubmit(loadModsRequested)}>
+    return (
+        <div>
+            {/* Выбор сейва */}
             <Label text="Save" htmlFor="save"/>
-            <Select
-                register={register('save')}
-                className="mb-4"
+            <select
+                className="shadow appearance-none border w-full py-2 px-3 text-black mb-4"
                 disabled={isDisabled}
-                options={saves?.map(save => new Object({
-                    name: save.name,
-                    value: save.name
-                }))}
-            />
-            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>Load</Button>
-            <ConfirmDialog
-                title="Load Mods from Save"
-                content={`Loading the Mods from Save "${loadModsData?.save}" will remove all currently installed Mods.`}
-                isOpen={loadModsData !== undefined}
-                close={() => {
-                    setIsLoading(false);
-                    setLoadModsData(undefined);
-                }}
-                onSuccess={() => loadMods(loadModsData)}
-            />
-        </form>
-        : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
-}
+                value={selectedSave}
+                onChange={e => { setSelectedSave(e.target.value); setModRows([]); setCheckedMods({}); }}
+            >
+                {saves?.map(save => (
+                    <option key={save.name} value={save.name}>{save.name}</option>
+                ))}
+            </select>
+
+            <Button
+                isDisabled={isDisabled || isLoading}
+                isLoading={isLoading}
+                onClick={onReadSave}
+                className="mr-2"
+            >
+                Read Mods from Save
+            </Button>
+
+            {/* Ошибка */}
+            {syncError && (
+                <div className="mt-4 p-3 bg-red-100 text-red font-bold">
+                    ⚠ {syncError}
+                </div>
+            )}
+
+            {/* Предупреждение */}
+            {warning && (
+                <div className="mt-4 p-3 bg-yellow-100 text-yellow-800">
+                    ⚠ {warning}
+                </div>
+            )}
+
+            {/* Таблица модов */}
+            {modRows.length > 0 && (
+                <div className="mt-4">
+                    {/* Кнопки выбора */}
+                    <div className="flex mb-2 gap-2">
+                        <Button size="sm" onClick={selectAll}>Select missing</Button>
+                        <Button size="sm" onClick={clearAll}>Clear selection</Button>
+                        <Button
+                            size="sm"
+                            isDisabled={checkedCount === 0 || isSyncing}
+                            isLoading={isSyncing}
+                            onClick={onSync}
+                        >
+                            Sync selected ({checkedCount})
+                        </Button>
+                    </div>
+
+                    {/* Прогресс */}
+                    {currentMod && (
+                        <div className="mb-2 text-sm text-orange">
+                            <FontAwesomeIcon icon={faSpinner} spin={true} className="mr-2"/>
+                            Downloading: {currentMod}
+                        </div>
+                    )}
+
+                    <table className="w-full text-sm">
+                        <thead>
+                            <tr className="border-b font-bold">
+                                <td className="py-1 pr-2 w-6"></td>
+                                <td className="py-1 pr-4">Mod</td>
+                                <td className="py-1 pr-4">Required</td>
+                                <td className="py-1 pr-4">Installed</td>
+                                <td className="py-1">Status</td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {/* DLC группа */}
+                            {modRows.some(m => DLC_MODS.has(m.name)) && (() => {
+                                const dlcMods = modRows.filter(m => DLC_MODS.has(m.name));
+                                const dlcKey = 'dlc-group';
+                                const allInstalled = dlcMods.every(m => m.status === 'installed' || m.status === 'builtin');
+                                return (
+                                    <tr key={dlcKey} className="border-b hover:bg-gray-100 cursor-pointer bg-blue-50"
+                                        onClick={() => !allInstalled && toggleCheck(dlcKey)}>
+                                        <td className="py-1 pr-2"></td>
+                                        <td className="py-1 pr-4 italic text-blue-600">
+                                            Space Age DLC
+                                            <span className="ml-2 text-xs text-gray-500">
+                                                (elevated-rails, quality, space-age)
+                                            </span>
+                                        </td>
+                                        <td className="py-1 pr-4">{dlcMods[0]?.version_required}</td>
+                                        <td className="py-1 pr-4">{dlcMods[0]?.version_installed || '—'}</td>
+                                        <td className="py-1">
+                                            <span className="mr-2">{STATUS_ICON[allInstalled ? 'installed' : 'builtin']}</span>
+                                            {allInstalled ? 'Installed' : 'Built-in / DLC'}
+                                        </td>
+                                    </tr>
+                                );
+                            })()}
+                            {/* Остальные моды */}
+                            {modRows.filter(m => !DLC_MODS.has(m.name)).map((mod, i) => (
+                                <tr
+                                    key={i}
+                                    className="border-b hover:bg-gray-100 cursor-pointer"
+                                    onClick={() => mod.status !== 'builtin' && toggleCheck(mod.name)}
+                                >
+                                    <td className="py-1 pr-2">
+                                        {mod.status !== 'builtin' && mod.status !== 'installed' && (
+                                            <input
+                                                type="checkbox"
+                                                checked={!!checkedMods[mod.name]}
+                                                onChange={() => toggleCheck(mod.name)}
+                                                onClick={e => e.stopPropagation()}
+                                            />
+                                        )}
+                                    </td>
+                                    <td className="py-1 pr-4">
+                                        {mod.name}
+                                        {mod.status !== 'builtin' && (
+                                            <a
+                                                href={mod.portal_url}
+                                                target="_blank"
+                                                rel="noopener noreferrer"
+                                                className="ml-2 text-blue hover:text-blue-light"
+                                                onClick={e => e.stopPropagation()}
+                                            >
+                                                <FontAwesomeIcon icon={faExternalLinkAlt} size="xs"/>
+                                            </a>
+                                        )}
+                                    </td>
+                                    <td className="py-1 pr-4">{mod.version_required}</td>
+                                    <td className="py-1 pr-4">{mod.version_installed || '—'}</td>
+                                    <td className="py-1">
+                                        <span className="mr-2">{STATUS_ICON[mod.status]}</span>
+                                        {STATUS_TEXT[mod.status] || mod.status}
+                                    </td>
+                                </tr>
+                            ))}
+                        </tbody>
+                    </table>
+                </div>
+            )}
+        </div>
+    );
+};
 
 export default LoadMods;
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 1cb67270..98c52d62 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -1,24 +1,69 @@
 import Mod from "./Mod";
 import React from "react";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faCheck, faTimes, faToggleOff, faToggleOn} from "@fortawesome/free-solid-svg-icons";
 
+const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
 const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
 
+    const dlcMods = mods.filter(m => DLC_MODS.has(m.name));
+    const regularMods = mods.filter(m => !DLC_MODS.has(m.name));
+    const dlcEnabled = dlcMods.some(m => m.enabled);
+
+    const toggleDLC = () => {
+        dlcMods.forEach(m => {
+            // Если хотя бы один включён — выключаем все, иначе включаем все
+            if (dlcEnabled === m.enabled) {
+                toggleMod(m.name);
+            }
+        });
+    };
+
     return (
         <table className="w-full">
             <thead>
-            <tr className="text-left py-1">
-                <th>Name</th>
-                <th>Enabled</th>
-                <th>Compatibility</th>
-                <th>Mod Version</th>
-                <th>Factorio Version</th>
-                <th/>
-            </tr>
+                <tr className="text-left py-1">
+                    <th>Name</th>
+                    <th>Enabled</th>
+                    <th>Compatibility</th>
+                    <th>Mod Version</th>
+                    <th>Factorio Version</th>
+                    <th/>
+                </tr>
             </thead>
             <tbody>
-            {
-                factorioVersion !== null && mods.map(
+                {/* DLC группа */}
+                {factorioVersion !== null && dlcMods.length > 0 && (
+                    <tr className="py-1 bg-blue-50 hover:bg-blue-100">
+                        <td className="pr-4 italic text-blue-600">
+                            Space Age DLC
+                            <span className="ml-2 text-xs text-gray-500 not-italic">
+                                (elevated-rails, quality, space-age)
+                            </span>
+                        </td>
+                        <td className="pr-4">
+                            {disabled
+                                ? dlcEnabled
+                                    ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
+                                    : <FontAwesomeIcon className="text-red" icon={faTimes}/>
+                                : dlcEnabled
+                                    ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green"
+                                                       icon={faToggleOn} onClick={toggleDLC}/>
+                                    : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red"
+                                                       icon={faToggleOff} onClick={toggleDLC}/>
+                            }
+                        </td>
+                        <td className="pr-4">
+                            <FontAwesomeIcon className="text-green" icon={faCheck}/>
+                        </td>
+                        <td className="pr-4">{dlcMods[0]?.version}</td>
+                        <td className="pr-4">{dlcMods[0]?.factorio_version}</td>
+                        <td/>
+                    </tr>
+                )}
+                {/* Остальные моды */}
+                {factorioVersion !== null && regularMods.map(
                     (mod, i) =>
                         <Mod mod={mod} key={i}
                              updateMod={updateMod}
@@ -28,11 +73,10 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                              factorioVersion={factorioVersion}
                              disabled={disabled}
                         />
-                )
-            }
+                )}
             </tbody>
         </table>
-    )
-}
+    );
+};
 
-export default ModList;
\ No newline at end of file
+export default ModList;
diff --git a/ui/api/resources/mods.js b/ui/api/resources/mods.js
index 8d35521d..f4ba818b 100644
--- a/ui/api/resources/mods.js
+++ b/ui/api/resources/mods.js
@@ -32,6 +32,14 @@ const mods = {
         const response = await client.post('/api/mods/delete/all');
         return response.data;
     },
+    getFromSave: async saveFile => {
+        const response = await client.post('/api/saves/mods/list', {saveFile});
+        return response.data;
+    },
+    syncFromSave: async (saveFile, modNames) => {
+        const response = await client.post('/api/saves/mods/sync', {saveFile, modNames});
+        return response.data;
+    },
     downloadAllURL: '/api/mods/download',
     portal: {
         login: async (username, token) => {
diff --git a/ui/api/resources/server.js b/ui/api/resources/server.js
index 38d8b548..ee8ac544 100644
--- a/ui/api/resources/server.js
+++ b/ui/api/resources/server.js
@@ -1,6 +1,10 @@
 import client from "../client";
 
 export default {
+    availableVersions: async () => {
+        const response = await client.get('/api/server/availableVersions');
+        return response.data;
+    },
     factorioVersion: async () => {
         const response = await client.get('/api/server/facVersion');
         return response.data;
@@ -21,6 +25,14 @@ export default {
         });
         return response.data;
     },
+    installVersion: async (version) => {
+        const response = await client.post('/api/server/install', {version});
+        return response.data;
+    },
+    removeInstallation: async () => {
+        const response = await client.delete('/api/server/install');
+        return response.data;
+    },
     kill: async () => {
         const response = await client.get('/api/server/kill');
         return response.data;
diff --git a/ui/api/socket.js b/ui/api/socket.js
index 14b6ea2c..f9f711b2 100644
--- a/ui/api/socket.js
+++ b/ui/api/socket.js
@@ -63,11 +63,21 @@ function connect() {
         );
     }
 
+    function modsSyncSubscribeEvent() {
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "mods_sync"}}));
+    }
+
+    function modsSyncUnsubscribeEvent() {
+        socket.send(JSON.stringify({room_name: "", controls: {type: "unsubscribe", value: "mods_sync"}}));
+    }
+
     function registerEventEmitter() {
         bus.on('log subscribe', logSubscribeEvent);
         bus.on('log unsubscribe', logUnsubscribeEvent);
         bus.on('server status subscribe', serverStatusSubscribeEvent);
         bus.on('command send', commandSendEvent);
+        bus.on('mods sync subscribe', modsSyncSubscribeEvent);
+        bus.on('mods sync unsubscribe', modsSyncUnsubscribeEvent);
     }
 
     function unregisterEventEmitter() {
@@ -75,6 +85,8 @@ function connect() {
         bus.off('log unsubscribe', logUnsubscribeEvent);
         bus.off('server status subscribe', serverStatusSubscribeEvent);
         bus.off('command send', commandSendEvent);
+        bus.off('mods sync subscribe', modsSyncSubscribeEvent);
+        bus.off('mods sync unsubscribe', modsSyncUnsubscribeEvent);
     }
 
     socket.onmessage = e => {

From d205fb83600451ffde7634828cd286326c8f9822 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:01:38 +0000
Subject: [PATCH 043/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E4=B8=8B=E8=BD=BD=E6=94=B9=E4=B8=BA=205=20=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E5=B9=B6=E5=8F=91=20+=20=E8=BF=9B=E5=BA=A6=E6=8C=81?=
 =?UTF-8?q?=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go             | 90 ++++++++++++++++-------
 ui/App/views/Mods/components/LoadMods.jsx | 37 +++++++++-
 2 files changed, 98 insertions(+), 29 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index f56d7430..cb38062d 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -188,38 +188,76 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 
 	wsRoom := websocket.WebsocketHub.GetRoom("mod_install")
 	total := len(data)
-	current := 0
 
-	for _, datum := range data {
-		// skip base mod because it is already included in factorio
-		if datum.Name == "base" {
-			current++
-			continue
-		}
-		details, err, statusCode := factorio.ModPortalModDetails(datum.Name)
-		if err != nil || statusCode != http.StatusOK {
-			log.Printf("Error in getting mod details from mod portal: %s", err)
-			current++
-			continue
-		}
+	type job struct {
+		index int
+		name  string
+		ver   factorio.Version
+	}
+	type result struct {
+		index int
+		name  string
+		size  int64
+		err   error
+	}
+
+	jobs := make(chan job, total)
+	results := make(chan result, total)
+
+	workers := 5
+	if total < workers {
+		workers = total
+	}
 
-		var found = false
-		for _, release := range details.Releases {
-			if release.Version.Equals(datum.Version) {
-				found = true
-				err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
-				if err != nil {
-					log.Printf("Error downloading mod {%s}, error: %s", details.Name, err)
-					break
+	for w := 0; w < workers; w++ {
+		go func() {
+			for j := range jobs {
+				var r result
+				r.index = j.index
+				r.name = j.name
+				details, err, statusCode := factorio.ModPortalModDetails(j.name)
+				if err != nil || statusCode != http.StatusOK {
+					r.err = fmt.Errorf("portal lookup failed")
+					results <- r
+					continue
+				}
+				found := false
+				for _, release := range details.Releases {
+					if release.Version.Equals(j.ver) {
+						found = true
+						dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+						if dl != nil {
+							r.err = dl
+						}
+						break
+					}
+				}
+				if !found {
+					r.err = fmt.Errorf("version not found")
 				}
-				break
+				results <- r
 			}
+		}()
+	}
+
+	for i, datum := range data {
+		if datum.Name != "base" {
+			jobs <- job{index: i, name: datum.Name, ver: datum.Version}
+		} else {
+			results <- result{index: i, name: "base"}
 		}
-		if !found {
-			log.Printf("Error downloading mod {%s}, error: %s", details.Name, "version not found")
+	}
+	close(jobs)
+
+	completed := 0
+	wsRoom.Send(fmt.Sprintf("{\"type\":\"start\",\"total\":%d}", total))
+	for completed < total {
+		r := <-results
+		completed++
+		if r.err != nil {
+			log.Printf("Error downloading mod {%s}: %v", r.name, r.err)
 		}
-		current++
-		wsRoom.Send(fmt.Sprintf("{\"type\":\"progress\",\"current\":%d,\"total\":%d,\"name\":\"%s\"}", current, total, datum.Name))
+		wsRoom.Send(fmt.Sprintf("{\"type\":\"progress\",\"current\":%d,\"total\":%d,\"name\":\"%s\",\"active\":%d}", completed, total, r.name, workers))
 	}
 
 	wsRoom.Send(fmt.Sprintf("{\"type\":\"complete\",\"total\":%d}", total))
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index ae4f6bbf..cc1b6ab9 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -22,11 +22,24 @@ const LoadMods = ({refreshMods}) => {
     const [loadModsData, setLoadModsData] = useState(undefined);
     const [installProgress, setInstallProgress] = useState({current: 0, total: 0});
     const [showProgress, setShowProgress] = useState(false);
+    const [activeCount, setActiveCount] = useState(0);
+    const [completedNames, setCompletedNames] = useState([]);
     const [modList, setModList] = useState([]);
     const [selectedMods, setSelectedMods] = useState(new Set());
     const [showModList, setShowModList] = useState(false);
 
     useEffect(() => {
+        const stored = localStorage.getItem('mod_install_pending');
+        if (stored) {
+            try {
+                const data = JSON.parse(stored);
+                setInstallProgress({current: 0, total: data.total});
+                setShowProgress(true);
+                const done = JSON.parse(localStorage.getItem('mod_install_done') || '[]');
+                setCompletedNames(done);
+            } catch(e) {}
+        }
+
         (async () => {
             setIsFactorioAuthenticated(await modResource.portal.status())
 
@@ -41,11 +54,26 @@ const LoadMods = ({refreshMods}) => {
         const handleProgress = (msg) => {
             try {
                 const data = JSON.parse(typeof msg === 'string' ? msg : JSON.stringify(msg));
-                if (data.type === 'progress') {
+                if (data.type === 'start') {
+                    setInstallProgress({current: 0, total: data.total});
+                    setShowProgress(true);
+                    setActiveCount(0);
+                    setCompletedNames([]);
+                    localStorage.setItem('mod_install_pending', JSON.stringify(data));
+                } else if (data.type === 'progress') {
                     setInstallProgress({current: data.current, total: data.total});
+                    setActiveCount(data.active || 0);
+                    setCompletedNames(prev => {
+                        const next = [...prev, data.name];
+                        localStorage.setItem('mod_install_done', JSON.stringify(next));
+                        return next;
+                    });
                     setShowProgress(true);
                 } else if (data.type === 'complete') {
                     setShowProgress(false);
+                    setActiveCount(0);
+                    localStorage.removeItem('mod_install_pending');
+                    localStorage.removeItem('mod_install_done');
                 }
             } catch (e) {}
         };
@@ -140,15 +168,18 @@ const LoadMods = ({refreshMods}) => {
             {showProgress && (
                 <div className="mt-4">
                     <div className="flex justify-between text-sm text-gray-light mb-1">
-                        <span>{t('installingMods', { ns: 'mods' })}</span>
+                        <span>{t('installingMods', { ns: 'mods' })} {activeCount > 0 ? `(${activeCount} concurrent)` : ''}</span>
                         <span>{installProgress.current}/{installProgress.total}</span>
                     </div>
-                    <div className="w-full bg-gray-dark rounded h-2">
+                    <div className="w-full bg-gray-dark rounded h-2 mb-2">
                         <div
                             className="bg-orange h-2 rounded transition-all duration-300"
                             style={{width: `${installProgress.total > 0 ? (installProgress.current / installProgress.total * 100) : 0}%`}}
                         />
                     </div>
+                    <p className="text-xs text-gray-light">
+                        {completedNames.slice(-5).join(', ')}
+                    </p>
                 </div>
             )}
             <Modal

From 66706086b85501e813e8217f568a83f1a57433a3 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:11:06 +0000
Subject: [PATCH 044/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=A4=9A?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E8=BF=9B=E5=BA=A6=E6=9D=A1=20+=20=E6=96=AD?=
 =?UTF-8?q?=E8=BF=9E=E6=81=A2=E5=A4=8D=E2=80=94=E2=80=94=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?/=E5=88=B7=E6=96=B0=E5=90=8E=E8=87=AA=E5=8A=A8=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E5=AE=8C=E6=88=90=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go             | 10 ++++-
 ui/App/views/Mods/components/LoadMods.jsx | 50 +++++++++++++++++------
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index cb38062d..2a9e217e 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -210,14 +210,16 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for w := 0; w < workers; w++ {
-		go func() {
+		go func(wid int) {
 			for j := range jobs {
 				var r result
 				r.index = j.index
 				r.name = j.name
+				wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"start\"}", wid, j.name))
 				details, err, statusCode := factorio.ModPortalModDetails(j.name)
 				if err != nil || statusCode != http.StatusOK {
 					r.err = fmt.Errorf("portal lookup failed")
+					wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
 					results <- r
 					continue
 				}
@@ -228,16 +230,20 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 						dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 						if dl != nil {
 							r.err = dl
+							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
+						} else {
+							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"done\"}", wid, j.name))
 						}
 						break
 					}
 				}
 				if !found {
 					r.err = fmt.Errorf("version not found")
+					wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
 				}
 				results <- r
 			}
-		}()
+		}(w)
 	}
 
 	for i, datum := range data {
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index cc1b6ab9..8cc6ac39 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -24,6 +24,7 @@ const LoadMods = ({refreshMods}) => {
     const [showProgress, setShowProgress] = useState(false);
     const [activeCount, setActiveCount] = useState(0);
     const [completedNames, setCompletedNames] = useState([]);
+    const [workerStates, setWorkerStates] = useState({});
     const [modList, setModList] = useState([]);
     const [selectedMods, setSelectedMods] = useState(new Set());
     const [showModList, setShowModList] = useState(false);
@@ -32,11 +33,14 @@ const LoadMods = ({refreshMods}) => {
         const stored = localStorage.getItem('mod_install_pending');
         if (stored) {
             try {
-                const data = JSON.parse(stored);
-                setInstallProgress({current: 0, total: data.total});
-                setShowProgress(true);
-                const done = JSON.parse(localStorage.getItem('mod_install_done') || '[]');
-                setCompletedNames(done);
+                if (localStorage.getItem('mod_install_done') === 'true') {
+                    localStorage.removeItem('mod_install_pending');
+                    localStorage.removeItem('mod_install_done');
+                } else {
+                    const data = JSON.parse(stored);
+                    setInstallProgress({current: 0, total: data.total});
+                    setShowProgress(true);
+                }
             } catch(e) {}
         }
 
@@ -69,11 +73,20 @@ const LoadMods = ({refreshMods}) => {
                         return next;
                     });
                     setShowProgress(true);
+                } else if (data.type === 'worker') {
+                    setWorkerStates(prev => ({
+                        ...prev,
+                        [data.worker]: {
+                            name: data.name,
+                            state: data.state
+                        }
+                    }));
                 } else if (data.type === 'complete') {
                     setShowProgress(false);
                     setActiveCount(0);
+                    setWorkerStates({});
+                    localStorage.setItem('mod_install_done', 'true');
                     localStorage.removeItem('mod_install_pending');
-                    localStorage.removeItem('mod_install_done');
                 }
             } catch (e) {}
         };
@@ -168,18 +181,31 @@ const LoadMods = ({refreshMods}) => {
             {showProgress && (
                 <div className="mt-4">
                     <div className="flex justify-between text-sm text-gray-light mb-1">
-                        <span>{t('installingMods', { ns: 'mods' })} {activeCount > 0 ? `(${activeCount} concurrent)` : ''}</span>
+                        <span>{t('installingMods', { ns: 'mods' })} ({activeCount} workers)</span>
                         <span>{installProgress.current}/{installProgress.total}</span>
                     </div>
-                    <div className="w-full bg-gray-dark rounded h-2 mb-2">
+                    <div className="w-full bg-gray-dark rounded h-2 mb-3">
                         <div
-                            className="bg-orange h-2 rounded transition-all duration-300"
+                            className="bg-green h-2 rounded transition-all duration-300"
                             style={{width: `${installProgress.total > 0 ? (installProgress.current / installProgress.total * 100) : 0}%`}}
                         />
                     </div>
-                    <p className="text-xs text-gray-light">
-                        {completedNames.slice(-5).join(', ')}
-                    </p>
+                    {[0,1,2,3,4].map(w => {
+                        const ws = workerStates[w];
+                        if (!ws) return null;
+                        const color = ws.state === 'done' ? 'bg-green' : ws.state === 'error' ? 'bg-red' : ws.state === 'start' ? 'bg-orange' : 'bg-gray-light';
+                        return (
+                            <div key={w} className="mb-1">
+                                <div className="w-full bg-gray-dark rounded h-1.5">
+                                    <div
+                                        className={`${color} h-1.5 rounded transition-all duration-300`}
+                                        style={{width: ws.state === 'done' ? '100%' : ws.state === 'error' ? '100%' : '60%'}}
+                                    />
+                                </div>
+                                <p className="text-xs text-gray-light truncate">{ws.name} {ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : ''}</p>
+                            </div>
+                        );
+                    })}
                 </div>
             )}
             <Modal

From b8988284c8c12550d17cae6d6bcabf49f8a0dd12 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:12:59 +0000
Subject: [PATCH 045/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E9=A1=B5=E6=96=B0=E5=A2=9E=E5=B8=B8=E9=A9=BB=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=89=80=E6=9C=89=E6=A8=A1=E7=BB=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 23158e6e..07184eab 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -148,13 +148,13 @@ const Mods = ({serverStatus}) => {
                     <>
                         {
                             !disabled &&
-                            <Button size="sm" className="mr-2" type="danger" isLoading={isDeletingAllMods}
-                                    onClick={deleteAllMods}>{t('deleteAllMods')}</Button> &&
                             <Button size="sm" className="mr-2" isLoading={isUpdatingAllMods}
                                     onClick={updateAllMods}>{t('updateAllMods')}</Button>
                         }
                         <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
                            href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
+                        <button className="bg-red-light hover:bg-red py-1 px-2 inline-block accentuated text-white font-bold ml-2"
+                                onClick={deleteAllMods}>{t('deleteAllMods')}</button>
                     </>
                 }
             />

From ed05ea0f4b64530ddccde3678ff9e0212e3f494c Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:16:30 +0000
Subject: [PATCH 046/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=20Mod=20=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AF=E7=94=A8=20+=20=E7=BB=9F=E4=B8=80=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2=E6=8C=89=E9=92=AE=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 07184eab..0bf17368 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -151,10 +151,15 @@ const Mods = ({serverStatus}) => {
                             <Button size="sm" className="mr-2" isLoading={isUpdatingAllMods}
                                     onClick={updateAllMods}>{t('updateAllMods')}</Button>
                         }
-                        <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
-                           href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
-                        <button className="bg-red-light hover:bg-red py-1 px-2 inline-block accentuated text-white font-bold ml-2"
-                                onClick={deleteAllMods}>{t('deleteAllMods')}</button>
+                        {!disabled ? (
+                            <>
+                                <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
+                                   href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
+                                <Button size="sm" type="danger" className="ml-2" onClick={deleteAllMods}>{t('deleteAllMods')}</Button>
+                            </>
+                        ) : (
+                            <span className="text-gray-light text-sm italic">{t('changingModsDisabled')}</span>
+                        )}
                     </>
                 }
             />

From 271d37282f8f8c308d2b7e6a5a47ecd62a967ec9 Mon Sep 17 00:00:00 2001
From: root <root@factorio-sm.loc>
Date: Sun, 21 Jun 2026 16:17:16 +0000
Subject: [PATCH 047/112] docs: add ROADMAP.md

---
 ROADMAP.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 ROADMAP.md

diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 00000000..f44122c9
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,36 @@
+# FSM Roadmap
+
+## ✅ Done
+
+- [x] Fix mod folder cleanup on Docker volume
+- [x] Fix save file parsing for Factorio 2.0
+- [x] Read all mods with exact versions directly from save file
+- [x] New endpoint to read mods from save without downloading
+- [x] Selective mod sync with checkboxes (select/deselect all)
+- [x] Real-time download progress via WebSocket
+- [x] DLC mods auto-detected and grouped in UI with single toggle
+- [x] DLC mods visible in installed mods list with enable/disable
+- [x] Server start blocked while mod sync is in progress
+- [x] i18n support (EN/RU)
+- [x] Token-based authentication on factorio.com
+
+## 🚧 Planned
+
+### Mods
+- [ ] Auto-resolve mod dependencies when creating a new save
+- [ ] Portal link icon next to each mod in the list
+- [ ] Row highlight on hover in mod list
+
+### Authentication
+- [ ] Show logged-in username on mod portal tab
+- [ ] Refresh button for saved credentials
+- [ ] Proper FSM login (registration form on first launch)
+
+### Server
+- [ ] Server Status tab refactor:
+  - Autostart checkbox
+  - Factorio version dropdown with auto-download
+  - Server name field
+- [ ] Multi-server support
+- [ ] Dual logs — Factorio server logs + FSM manager logs
+

From 5200922d26a3d2a8e5637f0128e232810c0155d2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:18:03 +0000
Subject: [PATCH 048/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20401=20=E6=97=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=20Could?=
 =?UTF-8?q?=20not=20read=20username?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/api/client.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/api/client.js b/ui/api/client.js
index 911935b2..627529e9 100644
--- a/ui/api/client.js
+++ b/ui/api/client.js
@@ -14,7 +14,11 @@ client.interceptors.response.use(res => res, err => {
     }
     if(err.response.status === 502) {
         window.flash("Service not available", "red");
-    } else if (err.response.status !== 401) {
+    } else if (err.response.status === 401) {
+        if (!window.location.pathname.startsWith('/login')) {
+            window.location.href = '/login';
+        }
+    } else {
         window.flash(err.response.data, "red");
     }
     return Promise.reject(err);

From a3e8788bca832c0863b957921a5e89f28eb7d446 Mon Sep 17 00:00:00 2001
From: root <root@factorio-sm.loc>
Date: Sun, 21 Jun 2026 16:18:35 +0000
Subject: [PATCH 049/112] docs: add ROADMAP.md

---
 ROADMAP.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index f44122c9..c2adce03 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -33,4 +33,3 @@
   - Server name field
 - [ ] Multi-server support
 - [ ] Dual logs — Factorio server logs + FSM manager logs
-

From 924163fe725a4b0046e8efbf24a36ca974a27bf3 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:22:35 +0000
Subject: [PATCH 050/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20401=20=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=94=B9=E7=94=A8=20replace=20+=20=E6=8C=82=E8=B5=B7?=
 =?UTF-8?q?=20Promise=E2=80=94=E2=80=94=E9=98=B2=E6=AD=A2=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=20reject=20=E5=B9=B2=E6=89=B0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/api/client.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/api/client.js b/ui/api/client.js
index 627529e9..b99da358 100644
--- a/ui/api/client.js
+++ b/ui/api/client.js
@@ -9,17 +9,18 @@ const client = Axios.create({
 
 client.interceptors.response.use(res => res, err => {
     if (!err.response) {
-        window.flash("Network error or request timeout", "red");
+        if (window.flash) window.flash("Network error or request timeout", "red");
         return Promise.reject(err);
     }
     if(err.response.status === 502) {
-        window.flash("Service not available", "red");
+        if (window.flash) window.flash("Service not available", "red");
     } else if (err.response.status === 401) {
-        if (!window.location.pathname.startsWith('/login')) {
-            window.location.href = '/login';
+        if (window.location.pathname !== '/login') {
+            window.location.replace('/login');
+            return new Promise(() => {});
         }
     } else {
-        window.flash(err.response.data, "red");
+        if (window.flash) window.flash(err.response.data, "red");
     }
     return Promise.reject(err);
 });

From 24fa7ef04011bb8facfe5c2576e3e731568b0c2e Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:24:53 +0000
Subject: [PATCH 051/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=20Mod=20=E7=9A=84=20Factorio=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=98=BE=E7=A4=BA=20>=3D=20=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_Mods.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index 38b65db7..6ddcbe16 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -60,7 +60,7 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		modsResult.Version = modInfo.Version
 		modsResult.FactorioVersion = modInfo.FactorioVersion
 		modsResult.Compatibility = modInfo.Compatibility
-		modsResult.DepOp = modInfo.DepOp
+		modsResult.DepOp = ">="
 
 		for _, simpleMod := range mods.ModSimpleList.Mods {
 			if simpleMod.Name == modsResult.Name {

From 485e69d9e178e6e6cfdc418e5201d39739a8a487 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:27:27 +0000
Subject: [PATCH 052/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=89=80=E6=9C=89=E6=A8=A1=E7=BB=84=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 17 ++++++++++++++++-
 ui/locales/en/mods.json    |  1 +
 ui/locales/zh-CN/mods.json |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 0bf17368..e2ab4f5a 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -13,6 +13,7 @@ import Fuse from "fuse.js";
 import CreateModPack from "./components/CreateModPack";
 import ModPack from "./components/ModPack";
 import ModList from "./components/ModList";
+import ConfirmDialog from "../../components/ConfirmDialog";
 
 const Mods = ({serverStatus}) => {
 
@@ -25,6 +26,7 @@ const Mods = ({serverStatus}) => {
     const [isDeletingAllMods, setIsDeletingAllMods] = useState(false);
     const [isUpdatingAllMods, setIsUpdatingAllMods] = useState(false);
     const [updatableMods, setUpdatableMods] = useState([]);
+    const [showDeleteAllConfirm, setShowDeleteAllConfirm] = useState(false);
 
     const addUpdatableMod = mod => {
         setUpdatableMods(mods => [...mods, mod])
@@ -155,7 +157,9 @@ const Mods = ({serverStatus}) => {
                             <>
                                 <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
                                    href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
-                                <Button size="sm" type="danger" className="ml-2" onClick={deleteAllMods}>{t('deleteAllMods')}</Button>
+                                <Button size="sm" type="danger" className="ml-2"
+                                    isLoading={isDeletingAllMods}
+                                    onClick={() => setShowDeleteAllConfirm(true)}>{t('deleteAllMods')}</Button>
                             </>
                         ) : (
                             <span className="text-gray-light text-sm italic">{t('changingModsDisabled')}</span>
@@ -183,6 +187,17 @@ const Mods = ({serverStatus}) => {
                     <CreateModPack onSuccess={fetchModPacks}/>
                 }
             />
+            <ConfirmDialog
+                title={t('deleteAllMods')}
+                content={t('confirmDeleteAllMods')}
+                isOpen={showDeleteAllConfirm}
+                close={() => setShowDeleteAllConfirm(false)}
+                onSuccess={() => {
+                    setShowDeleteAllConfirm(false);
+                    deleteAllMods();
+                }}
+                closeImmediately={true}
+            />
         </div>
     )
 }
diff --git a/ui/locales/en/mods.json b/ui/locales/en/mods.json
index a0c1e14b..6e0e9fa8 100644
--- a/ui/locales/en/mods.json
+++ b/ui/locales/en/mods.json
@@ -36,6 +36,7 @@
   "selectModsToInstall": "Select mods to install from this save:",
   "installSelected": "Install ({count})",
   "noModsSelected": "No mods selected.",
+  "confirmDeleteAllMods": "This will permanently delete all installed mods and mod packs. The Factorio server must be stopped before proceeding. Are you sure you want to continue?",
   "compatibility": "Compatibility",
   "modVersion": "Mod Version",
   "factorioVersion": "Factorio Version"
diff --git a/ui/locales/zh-CN/mods.json b/ui/locales/zh-CN/mods.json
index 3f4404ce..7651ec10 100644
--- a/ui/locales/zh-CN/mods.json
+++ b/ui/locales/zh-CN/mods.json
@@ -36,6 +36,7 @@
   "selectModsToInstall": "选择要从此存档安装的模组：",
   "installSelected": "安装 ({count})",
   "noModsSelected": "未选择任何模组。",
+  "confirmDeleteAllMods": "此操作将永久删除所有已安装的模组和模组合集。执行前必须停止 Factorio 服务器。确认继续吗？",
   "compatibility": "兼容性",
   "modVersion": "模组版本",
   "factorioVersion": "Factorio 版本"

From 056d71ba85542e83e9022bc7b18ebcd173ab6def Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:29:21 +0000
Subject: [PATCH 053/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Worker=20?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=94=B9=E4=B8=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E6=98=BE=E7=A4=BA=E5=AE=9E=E9=99=85=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 8cc6ac39..9e2b37af 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -193,16 +193,12 @@ const LoadMods = ({refreshMods}) => {
                     {[0,1,2,3,4].map(w => {
                         const ws = workerStates[w];
                         if (!ws) return null;
-                        const color = ws.state === 'done' ? 'bg-green' : ws.state === 'error' ? 'bg-red' : ws.state === 'start' ? 'bg-orange' : 'bg-gray-light';
+                        const icon = ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : '↓';
+                        const color = ws.state === 'done' ? 'text-green' : ws.state === 'error' ? 'text-red' : 'text-orange';
                         return (
-                            <div key={w} className="mb-1">
-                                <div className="w-full bg-gray-dark rounded h-1.5">
-                                    <div
-                                        className={`${color} h-1.5 rounded transition-all duration-300`}
-                                        style={{width: ws.state === 'done' ? '100%' : ws.state === 'error' ? '100%' : '60%'}}
-                                    />
-                                </div>
-                                <p className="text-xs text-gray-light truncate">{ws.name} {ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : ''}</p>
+                            <div key={w} className="flex items-center text-xs">
+                                <span className={`${color} w-4`}>{icon}</span>
+                                <span className="text-gray-light truncate">{ws.name}</span>
                             </div>
                         );
                     })}

From 93813b70804898e806eb366170d928509b974f42 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:32:29 +0000
Subject: [PATCH 054/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20Worker=20?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F=EF=BC=88=E6=9D=A5=E8=87=AA=20Conten?=
 =?UTF-8?q?t-Length=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_modpack_handler.go            |  4 ++--
 src/api/mod_portal_handler.go             |  6 +++---
 src/factorio/mod_Mods.go                  | 20 ++++++++------------
 ui/App/views/Mods/components/LoadMods.jsx |  6 ++++--
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/api/mod_modpack_handler.go b/src/api/mod_modpack_handler.go
index e1d9f29f..402be15e 100644
--- a/src/api/mod_modpack_handler.go
+++ b/src/api/mod_modpack_handler.go
@@ -454,7 +454,7 @@ func ModPackModPortalInstallHandler(w http.ResponseWriter, r *http.Request) {
 
 	modList := packMap[packName].Mods
 
-	err = modList.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
+	_, err = modList.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
 	if err != nil {
 		resp = fmt.Sprintf("Error downloading a mod: %s", err)
 		log.Println(resp)
@@ -505,7 +505,7 @@ func ModPackModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Reque
 			if release.Version.Equals(datum.Version) {
 				found = true
 
-				err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+				_, err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 				if err != nil {
 					resp = fmt.Sprintf("Error downloading mod {%s}, error: %s", details.Name, err)
 					log.Println(resp)
diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 2a9e217e..4a69b0c2 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -83,7 +83,7 @@ func ModPortalInstallHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = mods.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
+	_, err = mods.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
 	if err != nil {
 		resp = fmt.Sprintf("Error downloading a mod: %s", err)
 		log.Println(resp)
@@ -227,12 +227,12 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 				for _, release := range details.Releases {
 					if release.Version.Equals(j.ver) {
 						found = true
-						dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+						size, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 						if dl != nil {
 							r.err = dl
 							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
 						} else {
-							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"done\"}", wid, j.name))
+							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"done\",\"size\":%d}", wid, j.name, size))
 						}
 						break
 					}
diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index 6ddcbe16..2d929e4e 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -131,27 +131,26 @@ func (mods *Mods) createMod(modName string, fileName string, fileRc io.Reader) e
 	return nil
 }
 
-func (mods *Mods) DownloadMod(url string, filename string, modId string) error {
+func (mods *Mods) DownloadMod(url string, filename string, modId string) (int64, error) {
 	var err error
 
 	var credentials Credentials
 	status, err := credentials.Load()
 	if err != nil {
 		log.Printf("error loading credentials: %s", err)
-		return err
+		return 0, err
 	}
 	if status == false {
 		log.Printf("error: credentials are invalid")
-		return errors.New("error: credentials are invalid")
+		return 0, errors.New("error: credentials are invalid")
 	}
 
-	//download the mod from the mod portal api
 	completeUrl := "https://mods.factorio.com" + url + "?username=" + credentials.Username + "&token=" + credentials.Userkey
 
 	response, err := http.Get(completeUrl)
 	if err != nil {
 		log.Printf("error on downloading mod: %s", err)
-		return err
+		return 0, err
 	}
 
 	log.Printf("download complete\n StatusCode: %d\n Status: %s", response.StatusCode, response.Status)
@@ -160,21 +159,18 @@ func (mods *Mods) DownloadMod(url string, filename string, modId string) error {
 
 	if response.StatusCode != 200 {
 		log.Printf("StatusCode: %d", response.StatusCode)
-
-		return errors.New("Statuscode not 200: " + fmt.Sprint(response.StatusCode))
+		return 0, errors.New("Statuscode not 200: " + fmt.Sprint(response.StatusCode))
 	}
 
 	err = mods.createMod(modId, filename, response.Body)
 	if err != nil {
 		log.Printf("error when creating Mod: %s", err)
-		return err
+		return 0, err
 	}
 
 	log.Printf("completed copying the response.Body")
 
-	//done everything is made inside the createMod
-
-	return nil
+	return response.ContentLength, nil
 }
 
 func (mods *Mods) UploadMod(file multipart.File, header *multipart.FileHeader) error {
@@ -216,7 +212,7 @@ func (mods *Mods) UploadMod(file multipart.File, header *multipart.FileHeader) e
 func (mods *Mods) UpdateMod(modName string, url string, filename string) error {
 	var err error
 
-	err = mods.DownloadMod(url, filename, modName)
+	_, err = mods.DownloadMod(url, filename, modName)
 	if err != nil {
 		log.Printf("updateMod ... error when downloading the new Mod: %s", err)
 		return err
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 9e2b37af..c3e3c397 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -78,7 +78,8 @@ const LoadMods = ({refreshMods}) => {
                         ...prev,
                         [data.worker]: {
                             name: data.name,
-                            state: data.state
+                            state: data.state,
+                            size: data.size || 0
                         }
                     }));
                 } else if (data.type === 'complete') {
@@ -195,10 +196,11 @@ const LoadMods = ({refreshMods}) => {
                         if (!ws) return null;
                         const icon = ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : '↓';
                         const color = ws.state === 'done' ? 'text-green' : ws.state === 'error' ? 'text-red' : 'text-orange';
+                        const sizeText = ws.size > 0 ? ` (${(ws.size / 1024).toFixed(0)}KB)` : '';
                         return (
                             <div key={w} className="flex items-center text-xs">
                                 <span className={`${color} w-4`}>{icon}</span>
-                                <span className="text-gray-light truncate">{ws.name}</span>
+                                <span className="text-gray-light truncate">{ws.name}{sizeText}</span>
                             </div>
                         );
                     })}

From 0b1ab6a43576536032676960b5155b9f380df04f Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 04:01:53 +0000
Subject: [PATCH 055/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=B8=85=E9=99=A4=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E8=BF=9B=E5=BA=A6=E7=8A=B6=E6=80=81=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E6=97=A7=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index c3e3c397..76d6e95c 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -30,19 +30,11 @@ const LoadMods = ({refreshMods}) => {
     const [showModList, setShowModList] = useState(false);
 
     useEffect(() => {
-        const stored = localStorage.getItem('mod_install_pending');
-        if (stored) {
-            try {
-                if (localStorage.getItem('mod_install_done') === 'true') {
-                    localStorage.removeItem('mod_install_pending');
-                    localStorage.removeItem('mod_install_done');
-                } else {
-                    const data = JSON.parse(stored);
-                    setInstallProgress({current: 0, total: data.total});
-                    setShowProgress(true);
-                }
-            } catch(e) {}
-        }
+        localStorage.removeItem('mod_install_pending');
+        localStorage.removeItem('mod_install_done');
+        setShowProgress(false);
+        setWorkerStates({});
+        setActiveCount(0);
 
         (async () => {
             setIsFactorioAuthenticated(await modResource.portal.status())

From 454b4d3a3d2ad39eb4eda2517fd37a4f522dd132 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 04:02:42 +0000
Subject: [PATCH 056/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=2060=20=E7=A7=92?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B8=85=E9=99=A4=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=20+=20=E7=A7=BB=E9=99=A4=20localStorage=20=E6=8C=81?=
 =?UTF-8?q?=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 76d6e95c..26b49881 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from "react";
+import React, {useEffect, useRef, useState} from "react";
 import { useTranslation } from 'react-i18next';
 import savesResource from "../../../../api/resources/saves";
 import Select from "../../../components/Select";
@@ -22,6 +22,7 @@ const LoadMods = ({refreshMods}) => {
     const [loadModsData, setLoadModsData] = useState(undefined);
     const [installProgress, setInstallProgress] = useState({current: 0, total: 0});
     const [showProgress, setShowProgress] = useState(false);
+    const progressTimer = useRef(null);
     const [activeCount, setActiveCount] = useState(0);
     const [completedNames, setCompletedNames] = useState([]);
     const [workerStates, setWorkerStates] = useState({});
@@ -55,16 +56,16 @@ const LoadMods = ({refreshMods}) => {
                     setShowProgress(true);
                     setActiveCount(0);
                     setCompletedNames([]);
-                    localStorage.setItem('mod_install_pending', JSON.stringify(data));
+                    clearTimeout(progressTimer.current);
                 } else if (data.type === 'progress') {
                     setInstallProgress({current: data.current, total: data.total});
                     setActiveCount(data.active || 0);
-                    setCompletedNames(prev => {
-                        const next = [...prev, data.name];
-                        localStorage.setItem('mod_install_done', JSON.stringify(next));
-                        return next;
-                    });
-                    setShowProgress(true);
+                    clearTimeout(progressTimer.current);
+                    progressTimer.current = setTimeout(() => {
+                        setShowProgress(false);
+                        setWorkerStates({});
+                        setActiveCount(0);
+                    }, 60 * 1000);
                 } else if (data.type === 'worker') {
                     setWorkerStates(prev => ({
                         ...prev,
@@ -78,8 +79,7 @@ const LoadMods = ({refreshMods}) => {
                     setShowProgress(false);
                     setActiveCount(0);
                     setWorkerStates({});
-                    localStorage.setItem('mod_install_done', 'true');
-                    localStorage.removeItem('mod_install_pending');
+                    clearTimeout(progressTimer.current);
                 }
             } catch (e) {}
         };
@@ -88,6 +88,7 @@ const LoadMods = ({refreshMods}) => {
 
         return () => {
             socket.off('mod_install', handleProgress);
+            clearTimeout(progressTimer.current);
         };
     }, []);
 

From da77fc3e63d0c3e60df9de304ad262e4409c90d8 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:21:14 +0000
Subject: [PATCH 057/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Worker=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20downloading=20=E7=8A=B6=E6=80=81=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E5=AE=8C=E6=88=90=E6=97=B6=E6=98=BE=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 4a69b0c2..cfdc642d 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -227,6 +227,7 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 				for _, release := range details.Releases {
 					if release.Version.Equals(j.ver) {
 						found = true
+						wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"downloading\"}", wid, j.name))
 						size, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 						if dl != nil {
 							r.err = dl

From c5e3f9a7a37df615d034f0f54979db2523f585d9 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:24:48 +0000
Subject: [PATCH 058/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20HEAD=20=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=A2=84=E5=8F=96=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E2=80=94=E2=80=94Worker=20=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=8D=B3?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index cfdc642d..5ae8f8c3 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -227,8 +227,9 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 				for _, release := range details.Releases {
 					if release.Version.Equals(j.ver) {
 						found = true
-						wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"downloading\"}", wid, j.name))
-						size, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+						size := getContentLength(release.DownloadURL)
+						wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"downloading\",\"size\":%d}", wid, j.name, size))
+						_, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
 						if dl != nil {
 							r.err = dl
 							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
@@ -271,3 +272,13 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 
 	resp = modList.ListInstalledMods()
 }
+
+func getContentLength(downloadURL string) int64 {
+	u := "https://mods.factorio.com" + downloadURL
+	resp, err := http.Head(u)
+	if err != nil {
+		return 0
+	}
+	resp.Body.Close()
+	return resp.ContentLength
+}

From a692dcb453dfc7b86b2e6a57124605ddf55418e4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:25:09 +0000
Subject: [PATCH 059/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=8B=E8=BD=BD=E4=B8=AD=E4=B9=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 26b49881..61799a78 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -189,7 +189,7 @@ const LoadMods = ({refreshMods}) => {
                         if (!ws) return null;
                         const icon = ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : '↓';
                         const color = ws.state === 'done' ? 'text-green' : ws.state === 'error' ? 'text-red' : 'text-orange';
-                        const sizeText = ws.size > 0 ? ` (${(ws.size / 1024).toFixed(0)}KB)` : '';
+                        const sizeText = ws.size > 0 ? ' (' + (ws.size / 1024).toFixed(0) + 'KB)' : '';
                         return (
                             <div key={w} className="flex items-center text-xs">
                                 <span className={`${color} w-4`}>{icon}</span>

From 292edde1df78767c0f34edbc9dd84e74902d6086 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:19:50 +0000
Subject: [PATCH 060/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20Mod=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=20+=20=E4=BF=AE=E5=A4=8D=20HEAD=20=E8=AF=B7=E6=B1=82=E6=97=A0?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_portal_handler.go            | 6 +++++-
 src/factorio/mod_Mods.go                 | 1 +
 src/factorio/mod_modInfo.go              | 2 ++
 ui/App/views/Mods/components/Mod.jsx     | 1 +
 ui/App/views/Mods/components/ModList.jsx | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 5ae8f8c3..89a6b09d 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -274,7 +274,11 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func getContentLength(downloadURL string) int64 {
-	u := "https://mods.factorio.com" + downloadURL
+	var creds factorio.Credentials
+	if ok, _ := creds.Load(); !ok {
+		return 0
+	}
+	u := "https://mods.factorio.com" + downloadURL + "?username=" + creds.Username + "&token=" + creds.Userkey
 	resp, err := http.Head(u)
 	if err != nil {
 		return 0
diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index 2d929e4e..cd101768 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -55,6 +55,7 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		var modsResult ModsResult
 		modsResult.Name = modInfo.Name
 		modsResult.FileName = modInfo.FileName
+		modsResult.FileSize = modInfo.FileSize
 		modsResult.Author = modInfo.Author
 		modsResult.Title = modInfo.Title
 		modsResult.Version = modInfo.Version
diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 3e9225c4..7dda8711 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -24,6 +24,7 @@ type ModInfo struct {
 	Title           string   `json:"title"`
 	Author          string   `json:"author"`
 	FileName        string   `json:"file_name"`
+	FileSize        int64    `json:"file_size"`
 	FactorioVersion Version  `json:"factorio_version"`
 	Dependencies    []string `json:"dependencies"`
 	Compatibility   bool     `json:"compatibility"`
@@ -77,6 +78,7 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 			}
 
 			modInfo.FileName = info.Name()
+			modInfo.FileSize = info.Size()
 
 			var base Version
 			var op string
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 35c4a930..857420c7 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -102,6 +102,7 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                                                 className="hover:text-orange cursor-pointer ml-1"
                                                 icon={icon}/>}</td>
             <td className="pr-4">{mod.dep_op ? mod.dep_op + ' ' + mod.factorio_version : mod.factorio_version}</td>
+            <td className="pr-4 text-gray-light text-sm">{mod.file_size > 0 ? ((mod.file_size / 1024).toFixed(0) + ' KB') : '-'}</td>
             {
                 !disabled &&
                 <td className="pr-4">
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 7c9c1881..188d7b54 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -15,6 +15,7 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                 <th>{t('compatibility')}</th>
                 <th>{t('modVersion')}</th>
                 <th>{t('factorioVersion')}</th>
+                <th>{t('size', { ns: 'common' })}</th>
                 <th/>
             </tr>
             </thead>

From 4edaa86aa7c5dec985af87e579df037776856638 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:26:10 +0000
Subject: [PATCH 061/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20Mod=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=AF=8F=205=20=E7=A7=92=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E2=80=94=E2=80=94=E6=96=87=E4=BB=B6=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=E5=8D=B3=E6=97=B6=E5=8F=8D=E6=98=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index e2ab4f5a..2a91fdff 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -88,6 +88,12 @@ const Mods = ({serverStatus}) => {
                 }));
             });
 
+        const interval = setInterval(() => {
+            fetchInstalledMods();
+            fetchModPacks();
+        }, 5000);
+
+        return () => clearInterval(interval);
     }, []);
 
     const toggleMod = modName => {

From 4d6dc49d3e722ba713172bb8b8f0ea4803877565 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:27:29 +0000
Subject: [PATCH 062/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=202s=20=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=20+=20=E5=90=8E=E5=8F=B0=E6=A0=87=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 2a91fdff..0d6d02fc 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -89,9 +89,10 @@ const Mods = ({serverStatus}) => {
             });
 
         const interval = setInterval(() => {
+            if (document.hidden) return;
             fetchInstalledMods();
             fetchModPacks();
-        }, 5000);
+        }, 2000);
 
         return () => clearInterval(interval);
     }, []);

From 4c650ab112d763bd2dc525202ddd63687fa4b583 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:57:53 +0000
Subject: [PATCH 063/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20Mod=20=E9=97=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=87=92=E5=8A=A0=E8=BD=BD=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E4=BB=85=E5=9C=A8=E7=82=B9=E5=AE=89=E8=A3=85=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E6=A0=87=E7=AD=BE=E6=97=B6=E6=89=8D=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=206000+=20=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx                    | 19 +------------------
 .../views/Mods/components/AddMod/AddMod.jsx   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 0d6d02fc..8c576560 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -70,23 +70,6 @@ const Mods = ({serverStatus}) => {
                 fetchModPacks();
             })
 
-        // fetch list of mods
-        modsResource.portal.list()
-            .then(res => {
-                setFuse(new Fuse(res.results, {
-                    keys: [
-                        {
-                            "name": "name",
-                            weight: 2
-                        },
-                        {
-                            "name": "title",
-                            weight: 1
-                        }
-                    ],
-                    minMatchCharLength: 3
-                }));
-            });
 
         const interval = setInterval(() => {
             if (document.hidden) return;
@@ -130,7 +113,7 @@ const Mods = ({serverStatus}) => {
                 :
                 <TabControl>
                     <Tab title={t('installMod')}>
-                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse}/>
+                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} setFuse={setFuse}/>
                     </Tab>
                     <Tab title={t('uploadMod')}>
                         <UploadMod refetchInstalledMods={fetchInstalledMods}/>
diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index 9a645566..d0183b89 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -2,10 +2,9 @@ import React, {useEffect, useState} from "react";
 import AddModForm from "./components/AddModForm";
 import FactorioLogin from "./components/FactorioLogin";
 import modResource from "../../../../../api/resources/mods";
+import Fuse from "fuse.js";
 
-
-
-const AddMod = ({refetchInstalledMods, fuse}) => {
+const AddMod = ({refetchInstalledMods, fuse, setFuse}) => {
 
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
@@ -13,6 +12,14 @@ const AddMod = ({refetchInstalledMods, fuse}) => {
         (async () => {
             setIsFactorioAuthenticated(await modResource.portal.status())
         })();
+        if (!fuse) {
+            modResource.portal.list().then(res => {
+                setFuse(new Fuse(res.results, {
+                    keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
+                    minMatchCharLength: 3
+                }));
+            });
+        }
     }, []);
 
     return isFactorioAuthenticated
@@ -20,4 +27,4 @@ const AddMod = ({refetchInstalledMods, fuse}) => {
         : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
 }
 
-export default AddMod;
\ No newline at end of file
+export default AddMod;

From bd54b8fe63d76ad60bde9e907144b1899f1238cc Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:59:37 +0000
Subject: [PATCH 064/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E7=82=B9=E5=AE=89=E8=A3=85=E6=A8=A1=E7=BB=84=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=8A=A0=E8=BD=BD=E9=97=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20+=20TabControl=20=E6=94=AF=E6=8C=81=20onActivate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/Tabs/TabControl.jsx          | 10 +++++++++-
 ui/App/views/Mods/Mods.jsx                     | 17 +++++++++++++++--
 ui/App/views/Mods/components/AddMod/AddMod.jsx | 11 +----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ui/App/components/Tabs/TabControl.jsx b/ui/App/components/Tabs/TabControl.jsx
index a2a7d94e..05371074 100644
--- a/ui/App/components/Tabs/TabControl.jsx
+++ b/ui/App/components/Tabs/TabControl.jsx
@@ -4,6 +4,14 @@ import TabTitle from "./TabTitle";
 const TabControl = ({children}) => {
     const [selectedTab, setSelectedTab] = useState(0)
 
+    const handleSelect = (index) => {
+        setSelectedTab(index);
+        const child = children[index];
+        if (child && child.props.onActivate) {
+            child.props.onActivate();
+        }
+    }
+
     return (
         <div className="mb-6">
             <div className="px-4 pt-3">
@@ -13,7 +21,7 @@ const TabControl = ({children}) => {
                         title={item.props.title}
                         index={index}
                         isActive={index === selectedTab}
-                        setSelectedTab={setSelectedTab}
+                        setSelectedTab={handleSelect}
                     />
                 ))}
             </div>
diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 8c576560..7c7f747f 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -23,6 +23,19 @@ const Mods = ({serverStatus}) => {
     const [modPacks, setModPacks] = useState([])
     const [factorioVersion, setFactorioVersion] = useState(null);
     const [fuse, setFuse] = useState(undefined);
+    const [portalLoaded, setPortalLoaded] = useState(false);
+
+    const loadPortalList = () => {
+        if (portalLoaded) return;
+        setPortalLoaded(true);
+        modsResource.portal.list()
+            .then(res => {
+                setFuse(new Fuse(res.results, {
+                    keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
+                    minMatchCharLength: 3
+                }));
+            });
+    };
     const [isDeletingAllMods, setIsDeletingAllMods] = useState(false);
     const [isUpdatingAllMods, setIsUpdatingAllMods] = useState(false);
     const [updatableMods, setUpdatableMods] = useState([]);
@@ -112,8 +125,8 @@ const Mods = ({serverStatus}) => {
                 />
                 :
                 <TabControl>
-                    <Tab title={t('installMod')}>
-                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} setFuse={setFuse}/>
+                    <Tab title={t('installMod')} onActivate={loadPortalList}>
+                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse}/>
                     </Tab>
                     <Tab title={t('uploadMod')}>
                         <UploadMod refetchInstalledMods={fetchInstalledMods}/>
diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index d0183b89..b85b293b 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -2,9 +2,8 @@ import React, {useEffect, useState} from "react";
 import AddModForm from "./components/AddModForm";
 import FactorioLogin from "./components/FactorioLogin";
 import modResource from "../../../../../api/resources/mods";
-import Fuse from "fuse.js";
 
-const AddMod = ({refetchInstalledMods, fuse, setFuse}) => {
+const AddMod = ({refetchInstalledMods, fuse}) => {
 
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
@@ -12,14 +11,6 @@ const AddMod = ({refetchInstalledMods, fuse, setFuse}) => {
         (async () => {
             setIsFactorioAuthenticated(await modResource.portal.status())
         })();
-        if (!fuse) {
-            modResource.portal.list().then(res => {
-                setFuse(new Fuse(res.results, {
-                    keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
-                    minMatchCharLength: 3
-                }));
-            });
-        }
     }, []);
 
     return isFactorioAuthenticated

From 58a1c85bd51e594c092e6979e3e2d5da76056ac8 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:00:52 +0000
Subject: [PATCH 065/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E6=96=B0=E5=A2=9E=E6=A3=80=E6=9F=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E6=9B=B4=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/Layout.jsx |  4 ++++
 ui/App/views/Mods/Mods.jsx   | 11 ++++++++++-
 ui/locales/en/layout.json    |  1 +
 ui/locales/zh-CN/layout.json |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index dccc4443..652819df 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -100,6 +100,10 @@ const Layout = ({handleLogout, serverStatus}) => {
                     </div>
                     <div className="py-4 px-2 accentuated">
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
+                            <button className="bg-gray-light hover:bg-orange hover:glow-orange py-2 px-4 w-full block accentuated text-black font-bold mb-1"
+                                    onClick={() => window.dispatchEvent(new CustomEvent('fsm_refresh_mods'))}>
+                                {t('refreshMods', { ns: 'layout' })}
+                            </button>
                             <Button type="danger" className="w-full" onClick={handleLogout}>{t('logout', { ns: 'common' })}</Button>
                         </div>
                     </div>
diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 7c7f747f..87de02d3 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -90,7 +90,16 @@ const Mods = ({serverStatus}) => {
             fetchModPacks();
         }, 2000);
 
-        return () => clearInterval(interval);
+        const handleRefresh = () => {
+            fetchInstalledMods();
+            fetchModPacks();
+        };
+        window.addEventListener('fsm_refresh_mods', handleRefresh);
+
+        return () => {
+            clearInterval(interval);
+            window.removeEventListener('fsm_refresh_mods', handleRefresh);
+        };
     }, []);
 
     const toggleMod = modName => {
diff --git a/ui/locales/en/layout.json b/ui/locales/en/layout.json
index 83a7e7a9..6e673956 100644
--- a/ui/locales/en/layout.json
+++ b/ui/locales/en/layout.json
@@ -13,6 +13,7 @@
   "linkLogs": "Logs",
   "linkUsers": "Users",
   "linkHelp": "Help",
+  "refreshMods": "Check Mod Updates",
   "languageLabel": "Language",
   "helpTitle": "Help",
   "helpBugsAndHelp": "Bugs and Help",
diff --git a/ui/locales/zh-CN/layout.json b/ui/locales/zh-CN/layout.json
index dcca2e8c..c132450c 100644
--- a/ui/locales/zh-CN/layout.json
+++ b/ui/locales/zh-CN/layout.json
@@ -13,6 +13,7 @@
   "linkLogs": "日志",
   "linkUsers": "用户",
   "linkHelp": "帮助",
+  "refreshMods": "检查模组更新",
   "languageLabel": "语言",
   "helpTitle": "帮助",
   "helpBugsAndHelp": "Bug 与帮助",

From e25f5c7b1fe3156a64b1011a54d0fc7c19579b35 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:04:08 +0000
Subject: [PATCH 066/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E9=97=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98=201=20=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E2=80=94=E2=80=94=E9=81=BF=E5=85=8D=E6=AF=8F=E6=AC=A1?=
 =?UTF-8?q?=E9=83=BD=E8=AF=B7=E6=B1=82=206000+=20=E6=A8=A1=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 87de02d3..9ca304f1 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -27,9 +27,27 @@ const Mods = ({serverStatus}) => {
 
     const loadPortalList = () => {
         if (portalLoaded) return;
+        const cached = sessionStorage.getItem('mod_portal_cache');
+        if (cached) {
+            try {
+                const {data, time} = JSON.parse(cached);
+                if (Date.now() - time < 3600000) {
+                    setFuse(new Fuse(data, {
+                        keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
+                        minMatchCharLength: 3
+                    }));
+                    setPortalLoaded(true);
+                    return;
+                }
+            } catch(e) {}
+        }
         setPortalLoaded(true);
         modsResource.portal.list()
             .then(res => {
+                sessionStorage.setItem('mod_portal_cache', JSON.stringify({
+                    data: res.results,
+                    time: Date.now()
+                }));
                 setFuse(new Fuse(res.results, {
                     keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
                     minMatchCharLength: 3

From c137b6bb7e528c38a794f7698060ab68af789a96 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:08:50 +0000
Subject: [PATCH 067/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=BC=93=E5=AD=98=E9=97=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=201=20=E5=B0=8F=E6=97=B6=E2=80=94=E2=80=94=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=2012MB=20=E4=BC=A0=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/mod_portal.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/factorio/mod_portal.go b/src/factorio/mod_portal.go
index 37db290c..b3b4a846 100644
--- a/src/factorio/mod_portal.go
+++ b/src/factorio/mod_portal.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"sync"
 	"time"
 )
 
@@ -29,7 +30,21 @@ type ModPortalStruct struct {
 }
 
 // get all mods uploaded to the factorio modPortal
+var portalCache struct {
+	data      interface{}
+	expiresAt time.Time
+	mu        sync.RWMutex
+}
+
 func ModPortalList() (interface{}, error, int) {
+	portalCache.mu.RLock()
+	if portalCache.data != nil && time.Now().Before(portalCache.expiresAt) {
+		data := portalCache.data
+		portalCache.mu.RUnlock()
+		return data, nil, http.StatusOK
+	}
+	portalCache.mu.RUnlock()
+
 	req, err := http.NewRequest(http.MethodGet, "https://mods.factorio.com/api/mods?page_size=max", nil)
 	if err != nil {
 		return "error", err, http.StatusInternalServerError
@@ -56,6 +71,11 @@ func ModPortalList() (interface{}, error, int) {
 		return "error", err, http.StatusInternalServerError
 	}
 
+	portalCache.mu.Lock()
+	portalCache.data = jsonVal
+	portalCache.expiresAt = time.Now().Add(1 * time.Hour)
+	portalCache.mu.Unlock()
+
 	return jsonVal, nil, resp.StatusCode
 }
 

From ae9a7578b9d24a7c76d00cb9711919eb3df23e63 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:11:44 +0000
Subject: [PATCH 068/112] =?UTF-8?q?=E5=9B=9E=E9=80=80:=20=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E9=97=A8=E6=88=B7=E5=88=97=E8=A1=A8=E9=A2=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E2=80=94=E2=80=94=E5=90=8E=E7=AB=AF=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=9F=E5=BF=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 40 ++++++++------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 9ca304f1..cd67c0b2 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -23,37 +23,6 @@ const Mods = ({serverStatus}) => {
     const [modPacks, setModPacks] = useState([])
     const [factorioVersion, setFactorioVersion] = useState(null);
     const [fuse, setFuse] = useState(undefined);
-    const [portalLoaded, setPortalLoaded] = useState(false);
-
-    const loadPortalList = () => {
-        if (portalLoaded) return;
-        const cached = sessionStorage.getItem('mod_portal_cache');
-        if (cached) {
-            try {
-                const {data, time} = JSON.parse(cached);
-                if (Date.now() - time < 3600000) {
-                    setFuse(new Fuse(data, {
-                        keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
-                        minMatchCharLength: 3
-                    }));
-                    setPortalLoaded(true);
-                    return;
-                }
-            } catch(e) {}
-        }
-        setPortalLoaded(true);
-        modsResource.portal.list()
-            .then(res => {
-                sessionStorage.setItem('mod_portal_cache', JSON.stringify({
-                    data: res.results,
-                    time: Date.now()
-                }));
-                setFuse(new Fuse(res.results, {
-                    keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
-                    minMatchCharLength: 3
-                }));
-            });
-    };
     const [isDeletingAllMods, setIsDeletingAllMods] = useState(false);
     const [isUpdatingAllMods, setIsUpdatingAllMods] = useState(false);
     const [updatableMods, setUpdatableMods] = useState([]);
@@ -101,6 +70,13 @@ const Mods = ({serverStatus}) => {
                 fetchModPacks();
             })
 
+        modsResource.portal.list()
+            .then(res => {
+                setFuse(new Fuse(res.results, {
+                    keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
+                    minMatchCharLength: 3
+                }));
+            });
 
         const interval = setInterval(() => {
             if (document.hidden) return;
@@ -152,7 +128,7 @@ const Mods = ({serverStatus}) => {
                 />
                 :
                 <TabControl>
-                    <Tab title={t('installMod')} onActivate={loadPortalList}>
+                    <Tab title={t('installMod')}>
                         <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse}/>
                     </Tab>
                     <Tab title={t('uploadMod')}>

From 4242595fb9e984ca0830dc9b2189b52acd84beff Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:13:19 +0000
Subject: [PATCH 069/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=88=97=E8=A1=A8=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=84=89=E5=86=B2=E8=BF=9B=E5=BA=A6=E6=9D=A1=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E9=81=BF=E5=85=8D=E4=BD=93=E6=84=9F=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/AddMod/components/AddModForm.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
index 3b93a35e..f6d8220a 100644
--- a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
@@ -108,6 +108,9 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) =>
                     ? <Input register={register('mod',{required: true})} hasAutoComplete={false} onKeyDown={handleKeyDown}/>
                     : <div className="border border-gray-medium w-full py-2 px-3 text-white">
                         <FontAwesomeIcon icon={faSpinner} spin={true}/> {t('loadingModList')} <LinkModPortal/>
+                        <div className="mt-2 w-full bg-gray-dark rounded h-1.5 overflow-hidden">
+                            <div className="bg-orange h-1.5 animate-pulse rounded" style={{width: '100%'}}/>
+                        </div>
                     </div>
                 }
                 {suggestedMods.length > 0 &&

From cc7126997cdbc35bf8567f76a028bf4eac181ff2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:16:37 +0000
Subject: [PATCH 070/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=88=86=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E2=80=94=E2=80=941/3=20=E5=AE=BD=E5=BA=A6=E8=84=89?=
 =?UTF-8?q?=E5=86=B2=E9=81=BF=E5=85=8D=E5=85=A8=E5=AE=BD=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E6=84=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx                                  | 6 ++++--
 ui/App/views/Mods/components/AddMod/AddMod.jsx              | 4 ++--
 .../views/Mods/components/AddMod/components/AddModForm.jsx  | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index cd67c0b2..eec60b4a 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -23,6 +23,7 @@ const Mods = ({serverStatus}) => {
     const [modPacks, setModPacks] = useState([])
     const [factorioVersion, setFactorioVersion] = useState(null);
     const [fuse, setFuse] = useState(undefined);
+    const [portalLoading, setPortalLoading] = useState(false);
     const [isDeletingAllMods, setIsDeletingAllMods] = useState(false);
     const [isUpdatingAllMods, setIsUpdatingAllMods] = useState(false);
     const [updatableMods, setUpdatableMods] = useState([]);
@@ -70,13 +71,14 @@ const Mods = ({serverStatus}) => {
                 fetchModPacks();
             })
 
+        setPortalLoading(true);
         modsResource.portal.list()
             .then(res => {
                 setFuse(new Fuse(res.results, {
                     keys: [{name: "name", weight: 2}, {name: "title", weight: 1}],
                     minMatchCharLength: 3
                 }));
-            });
+            }).finally(() => setPortalLoading(false));
 
         const interval = setInterval(() => {
             if (document.hidden) return;
@@ -129,7 +131,7 @@ const Mods = ({serverStatus}) => {
                 :
                 <TabControl>
                     <Tab title={t('installMod')}>
-                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse}/>
+                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}/>
                     </Tab>
                     <Tab title={t('uploadMod')}>
                         <UploadMod refetchInstalledMods={fetchInstalledMods}/>
diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index b85b293b..3f1f524c 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -3,7 +3,7 @@ import AddModForm from "./components/AddModForm";
 import FactorioLogin from "./components/FactorioLogin";
 import modResource from "../../../../../api/resources/mods";
 
-const AddMod = ({refetchInstalledMods, fuse}) => {
+const AddMod = ({refetchInstalledMods, fuse, loading}) => {
 
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
@@ -14,7 +14,7 @@ const AddMod = ({refetchInstalledMods, fuse}) => {
     }, []);
 
     return isFactorioAuthenticated
-        ? <AddModForm fuse={fuse} setIsFactorioAuthenticated={setIsFactorioAuthenticated} refetchInstalledMods={refetchInstalledMods}/>
+        ? <AddModForm fuse={fuse} loading={loading} setIsFactorioAuthenticated={setIsFactorioAuthenticated} refetchInstalledMods={refetchInstalledMods}/>
         : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
 }
 
diff --git a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
index f6d8220a..fb813fe0 100644
--- a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
@@ -15,7 +15,7 @@ const LinkModPortal = () => {
     return <a href="https://mods.factorio.com" target="_blank" className="px-2 text-blue hover:text-blue-light">{t('modPortal')} <FontAwesomeIcon icon={faExternalLinkAlt}/></a>
 }
 
-const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) => {
+const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods, loading}) => {
 
     const { t } = useTranslation('mods');
     const {register, watch, setValue, handleSubmit} = useForm();
@@ -109,7 +109,7 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods}) =>
                     : <div className="border border-gray-medium w-full py-2 px-3 text-white">
                         <FontAwesomeIcon icon={faSpinner} spin={true}/> {t('loadingModList')} <LinkModPortal/>
                         <div className="mt-2 w-full bg-gray-dark rounded h-1.5 overflow-hidden">
-                            <div className="bg-orange h-1.5 animate-pulse rounded" style={{width: '100%'}}/>
+                            <div className="bg-orange h-1.5 w-1/3 rounded animate-pulse"/>
                         </div>
                     </div>
                 }

From 0c10a40048fe6fe75317971256dd318bd71ae62b Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:21:14 +0000
Subject: [PATCH 071/112] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=99=9A=E5=81=87=E8=BF=9B=E5=BA=A6=E6=9D=A1=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E5=8A=A0=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BB=85=E6=98=BE=E7=A4=BA=E7=9C=9F=E5=AE=9E=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/Mods/components/AddMod/components/AddModForm.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
index fb813fe0..c7e057ea 100644
--- a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
@@ -107,10 +107,9 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods, loa
                 { typeof fuse !== "undefined"
                     ? <Input register={register('mod',{required: true})} hasAutoComplete={false} onKeyDown={handleKeyDown}/>
                     : <div className="border border-gray-medium w-full py-2 px-3 text-white">
-                        <FontAwesomeIcon icon={faSpinner} spin={true}/> {t('loadingModList')} <LinkModPortal/>
-                        <div className="mt-2 w-full bg-gray-dark rounded h-1.5 overflow-hidden">
-                            <div className="bg-orange h-1.5 w-1/3 rounded animate-pulse"/>
-                        </div>
+                        <FontAwesomeIcon icon={faSpinner} spin={true}/>
+                        {loading ? ' ' + t('loadingModList') : ' ' + t('downloadComplete', { ns: 'common' }) + '...'}
+                        <LinkModPortal/>
                     </div>
                 }
                 {suggestedMods.length > 0 &&

From 9cf5a39fef3d1e67e15b3b880f25e32500f1d2b2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:27:26 +0000
Subject: [PATCH 072/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Factorio=20?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E5=A4=8D=E7=94=A8=20localS?=
 =?UTF-8?q?torage=E2=80=94=E2=80=94=E9=81=BF=E5=85=8D=E6=AF=8F=E6=AC=A1?=
 =?UTF-8?q?=E9=87=8D=E6=9F=A5=20API=20=E5=AF=BC=E8=87=B4=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=97=AA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/AddMod/AddMod.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index 3f1f524c..b3c87782 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -8,8 +8,14 @@ const AddMod = ({refetchInstalledMods, fuse, loading}) => {
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
     useEffect(() => {
+        const saved = localStorage.getItem('fsm_portal_auth');
+        if (saved === 'true') {
+            setIsFactorioAuthenticated(true);
+        }
         (async () => {
-            setIsFactorioAuthenticated(await modResource.portal.status())
+            const status = await modResource.portal.status();
+            setIsFactorioAuthenticated(status);
+            localStorage.setItem('fsm_portal_auth', status ? 'true' : '');
         })();
     }, []);
 

From 4fd25f40f137f573ec14eee8917cf17f975753e8 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 17:48:35 +0000
Subject: [PATCH 073/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20Worker=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=20+=20=E7=99=BE=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mod_modpack_handler.go            |  4 +--
 src/api/mod_portal_handler.go             |  8 +++--
 src/factorio/mod_Mods.go                  | 36 +++++++++++++++++++----
 ui/App/views/Mods/components/LoadMods.jsx | 18 +++++++++---
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/api/mod_modpack_handler.go b/src/api/mod_modpack_handler.go
index 402be15e..77c8f227 100644
--- a/src/api/mod_modpack_handler.go
+++ b/src/api/mod_modpack_handler.go
@@ -454,7 +454,7 @@ func ModPackModPortalInstallHandler(w http.ResponseWriter, r *http.Request) {
 
 	modList := packMap[packName].Mods
 
-	_, err = modList.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
+	_, err = modList.DownloadMod(data.DownloadURL, data.Filename, data.ModName, nil)
 	if err != nil {
 		resp = fmt.Sprintf("Error downloading a mod: %s", err)
 		log.Println(resp)
@@ -505,7 +505,7 @@ func ModPackModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Reque
 			if release.Version.Equals(datum.Version) {
 				found = true
 
-				_, err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+				_, err := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name, nil)
 				if err != nil {
 					resp = fmt.Sprintf("Error downloading mod {%s}, error: %s", details.Name, err)
 					log.Println(resp)
diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index 89a6b09d..d9f9967e 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -83,7 +83,7 @@ func ModPortalInstallHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, err = mods.DownloadMod(data.DownloadURL, data.Filename, data.ModName)
+	_, err = mods.DownloadMod(data.DownloadURL, data.Filename, data.ModName, nil)
 	if err != nil {
 		resp = fmt.Sprintf("Error downloading a mod: %s", err)
 		log.Println(resp)
@@ -229,7 +229,11 @@ func ModPortalInstallMultipleHandler(w http.ResponseWriter, r *http.Request) {
 						found = true
 						size := getContentLength(release.DownloadURL)
 						wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"downloading\",\"size\":%d}", wid, j.name, size))
-						_, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name)
+						_, dl := modList.DownloadMod(release.DownloadURL, release.FileName, details.Name, func(read, total int64) {
+							pct := 0
+							if total > 0 { pct = int(read * 100 / total) }
+							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"downloading\",\"size\":%d,\"pct\":%d}", wid, j.name, size, pct))
+						})
 						if dl != nil {
 							r.err = dl
 							wsRoom.Send(fmt.Sprintf("{\"type\":\"worker\",\"worker\":%d,\"name\":\"%s\",\"state\":\"error\"}", wid, j.name))
diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index cd101768..22c8ae5b 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -132,7 +132,7 @@ func (mods *Mods) createMod(modName string, fileName string, fileRc io.Reader) e
 	return nil
 }
 
-func (mods *Mods) DownloadMod(url string, filename string, modId string) (int64, error) {
+func (mods *Mods) DownloadMod(url string, filename string, modId string, progressCb func(int64, int64)) (int64, error) {
 	var err error
 
 	var credentials Credentials
@@ -154,8 +154,6 @@ func (mods *Mods) DownloadMod(url string, filename string, modId string) (int64,
 		return 0, err
 	}
 
-	log.Printf("download complete\n StatusCode: %d\n Status: %s", response.StatusCode, response.Status)
-
 	defer response.Body.Close()
 
 	if response.StatusCode != 200 {
@@ -163,7 +161,17 @@ func (mods *Mods) DownloadMod(url string, filename string, modId string) (int64,
 		return 0, errors.New("Statuscode not 200: " + fmt.Sprint(response.StatusCode))
 	}
 
-	err = mods.createMod(modId, filename, response.Body)
+	size := response.ContentLength
+	var body io.Reader = response.Body
+	if progressCb != nil && size > 0 {
+		body = &progressReader{
+			Reader:   response.Body,
+			Total:    size,
+			Callback: func(read int64) { progressCb(read, size) },
+		}
+	}
+
+	err = mods.createMod(modId, filename, body)
 	if err != nil {
 		log.Printf("error when creating Mod: %s", err)
 		return 0, err
@@ -171,7 +179,23 @@ func (mods *Mods) DownloadMod(url string, filename string, modId string) (int64,
 
 	log.Printf("completed copying the response.Body")
 
-	return response.ContentLength, nil
+	return size, nil
+}
+
+type progressReader struct {
+	Reader   io.Reader
+	Total    int64
+	read     int64
+	Callback func(int64)
+}
+
+func (pr *progressReader) Read(p []byte) (int, error) {
+	n, err := pr.Reader.Read(p)
+	pr.read += int64(n)
+	if pr.Callback != nil {
+		pr.Callback(pr.read)
+	}
+	return n, err
 }
 
 func (mods *Mods) UploadMod(file multipart.File, header *multipart.FileHeader) error {
@@ -213,7 +237,7 @@ func (mods *Mods) UploadMod(file multipart.File, header *multipart.FileHeader) e
 func (mods *Mods) UpdateMod(modName string, url string, filename string) error {
 	var err error
 
-	_, err = mods.DownloadMod(url, filename, modName)
+	_, err = mods.DownloadMod(url, filename, modName, nil)
 	if err != nil {
 		log.Printf("updateMod ... error when downloading the new Mod: %s", err)
 		return err
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 61799a78..8b32f1d6 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -72,7 +72,8 @@ const LoadMods = ({refreshMods}) => {
                         [data.worker]: {
                             name: data.name,
                             state: data.state,
-                            size: data.size || 0
+                            size: data.size || 0,
+                            pct: data.pct || 0
                         }
                     }));
                 } else if (data.type === 'complete') {
@@ -190,10 +191,19 @@ const LoadMods = ({refreshMods}) => {
                         const icon = ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : '↓';
                         const color = ws.state === 'done' ? 'text-green' : ws.state === 'error' ? 'text-red' : 'text-orange';
                         const sizeText = ws.size > 0 ? ' (' + (ws.size / 1024).toFixed(0) + 'KB)' : '';
+                        const pct = ws.pct || 0;
                         return (
-                            <div key={w} className="flex items-center text-xs">
-                                <span className={`${color} w-4`}>{icon}</span>
-                                <span className="text-gray-light truncate">{ws.name}{sizeText}</span>
+                            <div key={w} className="mb-1">
+                                <div className="flex items-center text-xs">
+                                    <span className={color + ' w-4'}>{icon}</span>
+                                    <span className="text-gray-light truncate flex-1">{ws.name}{sizeText}</span>
+                                    {ws.state === 'downloading' && pct > 0 ? <span className="text-gray-light ml-1">{pct}%</span> : null}
+                                </div>
+                                {ws.state === 'downloading' ? (
+                                    <div className="w-full bg-gray-dark rounded h-1 ml-4">
+                                        <div className="bg-orange h-1 rounded" style={{width: pct + '%'}}/>
+                                    </div>
+                                ) : null}
                             </div>
                         );
                     })}

From 94a8b66888399f435c21e0796ffd29f629aa36b5 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 23:37:48 +0000
Subject: [PATCH 074/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E5=A7=8B=E7=BB=88=E5=8D=A0=E4=BD=8D=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E4=B8=8D=E5=86=8D=E5=9B=A0=E5=A4=A7=E5=B0=8F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=BB=B6=E8=BF=9F=E8=80=8C=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 8b32f1d6..ec9417b6 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -190,20 +190,19 @@ const LoadMods = ({refreshMods}) => {
                         if (!ws) return null;
                         const icon = ws.state === 'done' ? '✓' : ws.state === 'error' ? '✗' : '↓';
                         const color = ws.state === 'done' ? 'text-green' : ws.state === 'error' ? 'text-red' : 'text-orange';
-                        const sizeText = ws.size > 0 ? ' (' + (ws.size / 1024).toFixed(0) + 'KB)' : '';
+                        const sizeText = ws.size > 0 ? ' (' + (ws.size / 1024).toFixed(0) + 'KB)' : ' (...KB)';
                         const pct = ws.pct || 0;
+                        const showBar = ws.state === 'downloading' || ws.state === 'done' || ws.state === 'error';
                         return (
                             <div key={w} className="mb-1">
                                 <div className="flex items-center text-xs">
                                     <span className={color + ' w-4'}>{icon}</span>
                                     <span className="text-gray-light truncate flex-1">{ws.name}{sizeText}</span>
-                                    {ws.state === 'downloading' && pct > 0 ? <span className="text-gray-light ml-1">{pct}%</span> : null}
+                                    {ws.state === 'downloading' ? <span className="text-gray-light ml-1">{pct}%</span> : null}
+                                </div>
+                                <div className="w-full bg-gray-dark rounded h-1 ml-4" style={{opacity: showBar ? 1 : 0.15}}>
+                                    <div className="bg-orange h-1 rounded" style={{width: pct + '%'}}/>
                                 </div>
-                                {ws.state === 'downloading' ? (
-                                    <div className="w-full bg-gray-dark rounded h-1 ml-4">
-                                        <div className="bg-orange h-1 rounded" style={{width: pct + '%'}}/>
-                                    </div>
-                                ) : null}
                             </div>
                         );
                     })}

From 9a09bf15a33a99fb4b9794fdc0bcb63cf37974a4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 23:47:24 +0000
Subject: [PATCH 075/112] =?UTF-8?q?=E5=9B=9E=E9=80=80:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=20localStorage=20=E7=BC=93=E5=AD=98=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=8E=9F=E5=A7=8B=20AddMod=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/AddMod/AddMod.jsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index b3c87782..3f1f524c 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -8,14 +8,8 @@ const AddMod = ({refetchInstalledMods, fuse, loading}) => {
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
     useEffect(() => {
-        const saved = localStorage.getItem('fsm_portal_auth');
-        if (saved === 'true') {
-            setIsFactorioAuthenticated(true);
-        }
         (async () => {
-            const status = await modResource.portal.status();
-            setIsFactorioAuthenticated(status);
-            localStorage.setItem('fsm_portal_auth', status ? 'true' : '');
+            setIsFactorioAuthenticated(await modResource.portal.status())
         })();
     }, []);
 

From 2f4f6de865fde5b567a6f2eeb176f904706c94e7 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Mon, 22 Jun 2026 23:55:38 +0000
Subject: [PATCH 076/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=85=B1?=
 =?UTF-8?q?=E4=BA=AB=20Factorio=20=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=B0=E7=88=B6=E7=BB=84=E4=BB=B6=E2=80=94=E2=80=94AddMod=20?=
 =?UTF-8?q?=E5=92=8C=20LoadMods=20=E4=B8=8D=E5=86=8D=E5=90=84=E8=87=AA?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx                     |  9 +++++++--
 ui/App/views/Mods/components/AddMod/AddMod.jsx | 13 ++-----------
 ui/App/views/Mods/components/LoadMods.jsx      |  5 +----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index eec60b4a..b80ccfb4 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -28,6 +28,7 @@ const Mods = ({serverStatus}) => {
     const [isUpdatingAllMods, setIsUpdatingAllMods] = useState(false);
     const [updatableMods, setUpdatableMods] = useState([]);
     const [showDeleteAllConfirm, setShowDeleteAllConfirm] = useState(false);
+    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
 
     const addUpdatableMod = mod => {
         setUpdatableMods(mods => [...mods, mod])
@@ -64,6 +65,8 @@ const Mods = ({serverStatus}) => {
     }
 
     useEffect(() => {
+        modsResource.portal.status().then(setIsFactorioAuthenticated);
+
         server.factorioVersion()
             .then(data => {
                 setFactorioVersion(data.base_mod_version)
@@ -131,13 +134,15 @@ const Mods = ({serverStatus}) => {
                 :
                 <TabControl>
                     <Tab title={t('installMod')}>
-                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}/>
+                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}
+                                isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
                     </Tab>
                     <Tab title={t('uploadMod')}>
                         <UploadMod refetchInstalledMods={fetchInstalledMods}/>
                     </Tab>
                     <Tab title={t('loadModsFromSave')}>
-                        <LoadMods refreshMods={fetchInstalledMods}/>
+                        <LoadMods refreshMods={fetchInstalledMods}
+                                  isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
                     </Tab>
                 </TabControl>
             }
diff --git a/ui/App/views/Mods/components/AddMod/AddMod.jsx b/ui/App/views/Mods/components/AddMod/AddMod.jsx
index 3f1f524c..4a0152ca 100644
--- a/ui/App/views/Mods/components/AddMod/AddMod.jsx
+++ b/ui/App/views/Mods/components/AddMod/AddMod.jsx
@@ -1,17 +1,8 @@
-import React, {useEffect, useState} from "react";
+import React from "react";
 import AddModForm from "./components/AddModForm";
 import FactorioLogin from "./components/FactorioLogin";
-import modResource from "../../../../../api/resources/mods";
 
-const AddMod = ({refetchInstalledMods, fuse, loading}) => {
-
-    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
-
-    useEffect(() => {
-        (async () => {
-            setIsFactorioAuthenticated(await modResource.portal.status())
-        })();
-    }, []);
+const AddMod = ({refetchInstalledMods, fuse, loading, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
 
     return isFactorioAuthenticated
         ? <AddModForm fuse={fuse} loading={loading} setIsFactorioAuthenticated={setIsFactorioAuthenticated} refetchInstalledMods={refetchInstalledMods}/>
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index ec9417b6..bda84095 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -11,14 +11,13 @@ import FactorioLogin from "./AddMod/components/FactorioLogin";
 import Modal from "../../../components/Modal";
 import socket from "../../../../api/socket";
 
-const LoadMods = ({refreshMods}) => {
+const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
 
     const { t } = useTranslation(['mods', 'common']);
     const [saves, setSaves] = useState([]);
     const {register, reset, handleSubmit} = useForm();
     const [isLoading, setIsLoading] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
-    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
     const [loadModsData, setLoadModsData] = useState(undefined);
     const [installProgress, setInstallProgress] = useState({current: 0, total: 0});
     const [showProgress, setShowProgress] = useState(false);
@@ -38,8 +37,6 @@ const LoadMods = ({refreshMods}) => {
         setActiveCount(0);
 
         (async () => {
-            setIsFactorioAuthenticated(await modResource.portal.status())
-
             const s = await savesResource.list()
             setSaves(s);
             if (s.length > 0) {

From ef6f7e75f4510996e8d535f26682be779057d9a4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 00:07:12 +0000
Subject: [PATCH 077/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E=E5=89=8D=E4=B8=8D?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=A0=87=E7=AD=BE=E2=80=94=E2=80=94=E6=B6=88?=
 =?UTF-8?q?=E9=99=A4=E7=99=BB=E5=BD=95=E8=A1=A8=E5=8D=95=E9=97=AA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index b80ccfb4..665a6a9f 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -29,6 +29,7 @@ const Mods = ({serverStatus}) => {
     const [updatableMods, setUpdatableMods] = useState([]);
     const [showDeleteAllConfirm, setShowDeleteAllConfirm] = useState(false);
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
+    const [authChecked, setAuthChecked] = useState(false);
 
     const addUpdatableMod = mod => {
         setUpdatableMods(mods => [...mods, mod])
@@ -65,8 +66,13 @@ const Mods = ({serverStatus}) => {
     }
 
     useEffect(() => {
-        modsResource.portal.status().then(setIsFactorioAuthenticated);
+        modsResource.portal.status().then(auth => {
+            setIsFactorioAuthenticated(auth);
+            setAuthChecked(true);
+        });
+    }, []);
 
+    useEffect(() => {
         server.factorioVersion()
             .then(data => {
                 setFactorioVersion(data.base_mod_version)
@@ -132,6 +138,7 @@ const Mods = ({serverStatus}) => {
                        }
                 />
                 :
+                !authChecked ? null :
                 <TabControl>
                     <Tab title={t('installMod')}>
                         <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}

From 2df36d01cba0bb6b4ad4be90a4c080a215f630b5 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 07:39:49 +0000
Subject: [PATCH 078/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=88=97=E8=A1=A8=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E2=80=94=E2=80=94=E5=8E=BB=E6=8E=89=20downlo?=
 =?UTF-8?q?adComplete=20=E9=81=BF=E5=85=8D=E5=8D=A1=E4=BD=8F=E9=94=99?=
 =?UTF-8?q?=E8=A7=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/AddMod/components/AddModForm.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
index c7e057ea..505c6adb 100644
--- a/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
+++ b/ui/App/views/Mods/components/AddMod/components/AddModForm.jsx
@@ -107,9 +107,7 @@ const AddModForm = ({setIsFactorioAuthenticated, fuse, refetchInstalledMods, loa
                 { typeof fuse !== "undefined"
                     ? <Input register={register('mod',{required: true})} hasAutoComplete={false} onKeyDown={handleKeyDown}/>
                     : <div className="border border-gray-medium w-full py-2 px-3 text-white">
-                        <FontAwesomeIcon icon={faSpinner} spin={true}/>
-                        {loading ? ' ' + t('loadingModList') : ' ' + t('downloadComplete', { ns: 'common' }) + '...'}
-                        <LinkModPortal/>
+                        <FontAwesomeIcon icon={faSpinner} spin={true}/> {t('loadingModList')} <LinkModPortal/>
                     </div>
                 }
                 {suggestedMods.length > 0 &&

From f35dedd1840933becb1d31705239eb9af711b6fd Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 07:41:58 +0000
Subject: [PATCH 079/112] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E7=BB=84=E5=88=97=E8=A1=A8=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E6=A8=AA=E5=B9=85=E2=80=94=E2=80=94=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=89=E6=A0=87=E7=AD=BE=E7=81=B0=E8=89=B2=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E5=90=8E=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/Mods.jsx | 40 +++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 665a6a9f..2ff85018 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -14,6 +14,8 @@ import CreateModPack from "./components/CreateModPack";
 import ModPack from "./components/ModPack";
 import ModList from "./components/ModList";
 import ConfirmDialog from "../../components/ConfirmDialog";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faSpinner } from "@fortawesome/free-solid-svg-icons";
 
 const Mods = ({serverStatus}) => {
 
@@ -139,19 +141,31 @@ const Mods = ({serverStatus}) => {
                 />
                 :
                 !authChecked ? null :
-                <TabControl>
-                    <Tab title={t('installMod')}>
-                        <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}
-                                isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
-                    </Tab>
-                    <Tab title={t('uploadMod')}>
-                        <UploadMod refetchInstalledMods={fetchInstalledMods}/>
-                    </Tab>
-                    <Tab title={t('loadModsFromSave')}>
-                        <LoadMods refreshMods={fetchInstalledMods}
-                                  isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
-                    </Tab>
-                </TabControl>
+                <div>
+                    {portalLoading &&
+                        <div className="mb-4 p-4 bg-gray-dark rounded-sm">
+                            <div className="flex items-center text-dirty-white">
+                                <FontAwesomeIcon icon={faSpinner} spin className="mr-2"/>
+                                {t('loadingModList')}
+                            </div>
+                        </div>
+                    }
+                    <div className={portalLoading ? 'opacity-50 pointer-events-none' : ''}>
+                        <TabControl>
+                            <Tab title={t('installMod')}>
+                                <AddMod refetchInstalledMods={fetchInstalledMods} fuse={fuse} loading={portalLoading}
+                                        isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
+                            </Tab>
+                            <Tab title={t('uploadMod')}>
+                                <UploadMod refetchInstalledMods={fetchInstalledMods}/>
+                            </Tab>
+                            <Tab title={t('loadModsFromSave')}>
+                                <LoadMods refreshMods={fetchInstalledMods}
+                                          isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
+                            </Tab>
+                        </TabControl>
+                    </div>
+                </div>
             }
             <Panel
                 title={t('mods')}

From 51ef2c17553101d232c059d00b1335eeea949c37 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:12:01 +0000
Subject: [PATCH 080/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Updater=20API=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=20stable=20=E6=A0=87=E7=AD=BE=E2=80=94?=
 =?UTF-8?q?=E2=80=942.1.7=20=E7=89=88=E6=9C=AC=E5=B7=B2=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factorio/version_manager.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index c40eadc6..2b0444cd 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -71,8 +71,9 @@ func (vm *VersionManager) GetAvailableVersions() ([]Release, error) {
 }
 
 type UpdaterResponse map[string][]struct {
-	From string `json:"from"`
-	To   string `json:"to"`
+	From   string `json:"from"`
+	To     string `json:"to"`
+	Stable string `json:"stable"`
 }
 
 func (vm *VersionManager) GetFullVersionList() ([]Release, error) {
@@ -103,11 +104,15 @@ func (vm *VersionManager) GetFullVersionList() ([]Release, error) {
 	}
 
 	for _, u := range updates {
-		if !seen[u.To] {
-			seen[u.To] = true
+		ver := u.To
+		if ver == "" && u.Stable != "" {
+			ver = u.Stable
+		}
+		if ver != "" && !seen[ver] {
+			seen[ver] = true
 			releases = append(releases, Release{
-				Version: u.To,
-				Stable:  isStableVersion(u.To),
+				Version: ver,
+				Stable:  isStableVersion(ver),
 				Latest:  false,
 			})
 		}

From 315b99f3c004cd68c4d1790ff86590e4f3c10c59 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:46:54 +0000
Subject: [PATCH 081/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E8=AF=B4=E6=98=8E=E5=88=87=E6=8D=A2=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E7=BF=BB=E8=AF=91=2027=20=E4=B8=AA=20Factori?=
 =?UTF-8?q?o=20=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/ServerSettings.jsx      | 14 ++++++++++++-
 ui/App/views/settingDescriptions.js  | 31 ++++++++++++++++++++++++++++
 ui/locales/en/serverSettings.json    |  4 +++-
 ui/locales/zh-CN/serverSettings.json |  4 +++-
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 ui/App/views/settingDescriptions.js

diff --git a/ui/App/views/ServerSettings.jsx b/ui/App/views/ServerSettings.jsx
index a4aad960..5622fa3c 100644
--- a/ui/App/views/ServerSettings.jsx
+++ b/ui/App/views/ServerSettings.jsx
@@ -8,12 +8,14 @@ import Checkbox from "../components/Checkbox";
 import InputPassword from "../components/InputPassword";
 import Button from "../components/Button";
 import {useForm} from "react-hook-form";
+import settingDescriptions from "./settingDescriptions";
 
 const ServerSettings = () => {
 
     const { t } = useTranslation('serverSettings');
     const [settings, setSettings] = useState();
     const [numberInputs, setNumberInputs] = useState([]);
+    const [showTranslation, setShowTranslation] = useState(false);
 
     const {register, handleSubmit, formState: {errors}, control} = useForm();
 
@@ -145,6 +147,11 @@ const ServerSettings = () => {
                             return (
                                 <div className="mb-4" key={`wrapper-${key}`}>
                                     {formTypeField(key, value, label)}
+                                    {showTranslation && settingDescriptions[key] && (
+                                        <p className="text-sm text-orange mt-1">
+                                            {settingDescriptions[key].zh + (settingDescriptions[key].en ? ' (' + settingDescriptions[key].en + ')' : '')}
+                                        </p>
+                                    )}
                                     <p className="text-sm italic">{comment}</p>
                                 </div>
                             )
@@ -152,7 +159,12 @@ const ServerSettings = () => {
                     </>
                 }
                 actions={
-                    <Button isSubmit={true} type="success">{t('saveSettings')}</Button>
+                    <div className="flex space-x-2">
+                        <Button isSubmit={true} type="success">{t('saveSettings')}</Button>
+                        <Button type="default" onClick={() => setShowTranslation(!showTranslation)}>
+                            {showTranslation ? t('hideTranslation') : t('showTranslation')}
+                        </Button>
+                    </div>
                 }
             />
         </form>
diff --git a/ui/App/views/settingDescriptions.js b/ui/App/views/settingDescriptions.js
new file mode 100644
index 00000000..e80feb4e
--- /dev/null
+++ b/ui/App/views/settingDescriptions.js
@@ -0,0 +1,31 @@
+const settingDescriptions = {
+    name: { zh: "服务器名称", en: "Server name" },
+    description: { zh: "服务器描述", en: "Server description" },
+    tags: { zh: "服务器标签（逗号分隔）", en: "Server tags (comma separated)" },
+    max_players: { zh: "最大玩家数", en: "Maximum number of players" },
+    visibility: { zh: "可见性（公开/局域网/隐藏）", en: "Visibility (public/LAN/hidden)" },
+    username: { zh: "Factorio 账号用户名", en: "Factorio account username" },
+    password: { zh: "Factorio 账号密码", en: "Factorio account password" },
+    token: { zh: "Factorio 认证令牌", en: "Factorio authentication token" },
+    game_password: { zh: "游戏房间密码", en: "Game password for joining" },
+    require_user_verification: { zh: "要求用户验证", en: "Require user verification" },
+    max_upload_in_kilobytes_per_second: { zh: "最大上传速度（KB/s）", en: "Max upload speed in KB/s" },
+    max_upload_slots: { zh: "最大上传槽位", en: "Maximum upload slots" },
+    minimum_latency_in_ticks: { zh: "最小延迟（tick）", en: "Minimum latency in ticks" },
+    ignore_player_limit_for_returning_players: { zh: "返回玩家忽略人数限制", en: "Ignore player limit for returning players" },
+    allow_commands: { zh: "允许指令", en: "Allow commands" },
+    auto_pause: { zh: "自动暂停", en: "Auto pause when no players" },
+    only_admins_can_pause_the_game: { zh: "仅管理员可暂停", en: "Only admins can pause" },
+    autosave_interval: { zh: "自动保存间隔（分钟）", en: "Auto-save interval (minutes)" },
+    autosave_slots: { zh: "自动保存槽位数", en: "Number of auto-save slots" },
+    autosave_only_on_server: { zh: "仅在服务器自动保存", en: "Auto-save only on server" },
+    non_blocking_saving: { zh: "非阻塞保存", en: "Non-blocking saving" },
+    afk_autokick_interval: { zh: "AFK 自动踢出间隔（分钟）", en: "AFK auto-kick interval (minutes)" },
+    admins: { zh: "管理员（逗号分隔）", en: "Admins (comma separated)" },
+    minimum_segment_size: { zh: "最小区域大小", en: "Minimum segment size" },
+    minimum_segment_size_peer_count: { zh: "最小区域对等数量", en: "Minimum segment size peer count" },
+    maximum_segment_size: { zh: "最大区域大小", en: "Maximum segment size" },
+    maximum_segment_size_peer_count: { zh: "最大区域对等数量", en: "Maximum segment size peer count" },
+};
+
+export default settingDescriptions;
diff --git a/ui/locales/en/serverSettings.json b/ui/locales/en/serverSettings.json
index 1e85bf1b..256938e9 100644
--- a/ui/locales/en/serverSettings.json
+++ b/ui/locales/en/serverSettings.json
@@ -26,5 +26,7 @@
   "startingAreaSize": "Starting Area Size",
   "peacefulMode": "Peaceful Mode",
   "researchQueue": "Research Queue",
-  "technologyPriceMultiplier": "Technology Price Multiplier"
+  "technologyPriceMultiplier": "Technology Price Multiplier",
+  "showTranslation": "Show Description",
+  "hideTranslation": "Hide Description"
 }
diff --git a/ui/locales/zh-CN/serverSettings.json b/ui/locales/zh-CN/serverSettings.json
index d49ca1f9..2382ce7d 100644
--- a/ui/locales/zh-CN/serverSettings.json
+++ b/ui/locales/zh-CN/serverSettings.json
@@ -26,5 +26,7 @@
   "startingAreaSize": "起始区域大小",
   "peacefulMode": "和平模式",
   "researchQueue": "研究队列",
-  "technologyPriceMultiplier": "科技价格倍率"
+  "technologyPriceMultiplier": "科技价格倍率",
+  "showTranslation": "显示说明",
+  "hideTranslation": "隐藏说明"
 }

From 068720e1b9fedbf6f3cbec0bb5985165d94bec96 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:58:00 +0000
Subject: [PATCH 082/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E5=9F=BA?=
 =?UTF-8?q?=E4=BA=8E=20Factorio=20Wiki=20=E9=87=8D=E5=86=99=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=AE=BE=E7=BD=AE=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/settingDescriptions.js | 55 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/ui/App/views/settingDescriptions.js b/ui/App/views/settingDescriptions.js
index e80feb4e..3e5eea99 100644
--- a/ui/App/views/settingDescriptions.js
+++ b/ui/App/views/settingDescriptions.js
@@ -1,31 +1,30 @@
 const settingDescriptions = {
-    name: { zh: "服务器名称", en: "Server name" },
-    description: { zh: "服务器描述", en: "Server description" },
-    tags: { zh: "服务器标签（逗号分隔）", en: "Server tags (comma separated)" },
-    max_players: { zh: "最大玩家数", en: "Maximum number of players" },
-    visibility: { zh: "可见性（公开/局域网/隐藏）", en: "Visibility (public/LAN/hidden)" },
-    username: { zh: "Factorio 账号用户名", en: "Factorio account username" },
-    password: { zh: "Factorio 账号密码", en: "Factorio account password" },
-    token: { zh: "Factorio 认证令牌", en: "Factorio authentication token" },
-    game_password: { zh: "游戏房间密码", en: "Game password for joining" },
-    require_user_verification: { zh: "要求用户验证", en: "Require user verification" },
-    max_upload_in_kilobytes_per_second: { zh: "最大上传速度（KB/s）", en: "Max upload speed in KB/s" },
-    max_upload_slots: { zh: "最大上传槽位", en: "Maximum upload slots" },
-    minimum_latency_in_ticks: { zh: "最小延迟（tick）", en: "Minimum latency in ticks" },
-    ignore_player_limit_for_returning_players: { zh: "返回玩家忽略人数限制", en: "Ignore player limit for returning players" },
-    allow_commands: { zh: "允许指令", en: "Allow commands" },
-    auto_pause: { zh: "自动暂停", en: "Auto pause when no players" },
-    only_admins_can_pause_the_game: { zh: "仅管理员可暂停", en: "Only admins can pause" },
-    autosave_interval: { zh: "自动保存间隔（分钟）", en: "Auto-save interval (minutes)" },
-    autosave_slots: { zh: "自动保存槽位数", en: "Number of auto-save slots" },
-    autosave_only_on_server: { zh: "仅在服务器自动保存", en: "Auto-save only on server" },
-    non_blocking_saving: { zh: "非阻塞保存", en: "Non-blocking saving" },
-    afk_autokick_interval: { zh: "AFK 自动踢出间隔（分钟）", en: "AFK auto-kick interval (minutes)" },
-    admins: { zh: "管理员（逗号分隔）", en: "Admins (comma separated)" },
-    minimum_segment_size: { zh: "最小区域大小", en: "Minimum segment size" },
-    minimum_segment_size_peer_count: { zh: "最小区域对等数量", en: "Minimum segment size peer count" },
-    maximum_segment_size: { zh: "最大区域大小", en: "Maximum segment size" },
-    maximum_segment_size_peer_count: { zh: "最大区域对等数量", en: "Maximum segment size peer count" },
+    name: { zh: "服务器名称，将在服务器列表中显示", en: "Server name shown in the server browser" },
+    description: { zh: "服务器描述，最多 5000 字符", en: "Server description, up to 5000 characters" },
+    tags: { zh: "游戏标签列表（逗号分隔）", en: "List of game tags (comma separated)" },
+    max_players: { zh: "最大在线玩家数。0 为不限制", en: "Max simultaneous players. 0 = unlimited" },
+    visibility: { zh: "服务器可见性：public（公开）/ lan（局域网）/ hidden（隐藏）", en: "Visibility: public / LAN / hidden" },
+    username: { zh: "Factorio 账号用户名（公开服务器必填）", en: "Factorio.com username (required for public servers)" },
+    password: { zh: "Factorio 密码（建议用 Token 代替）", en: "Factorio.com password (use token instead)" },
+    token: { zh: "认证令牌（推荐）。factorio.com/profile 获取", en: "Auth token from factorio.com/profile (recommended)" },
+    game_password: { zh: "加入游戏的房间密码，留空则无需密码", en: "Password to join the game. Empty = no password" },
+    require_user_verification: { zh: "是否验证玩家 Factorio 账号身份", en: "Verify player identity via Factorio account" },
+    max_upload_in_kilobytes_per_second: { zh: "最大上传速度（KB/s），0 为不限制", en: "Max upload speed in KB/s. 0 = unlimited" },
+    max_upload_slots: { zh: "最大上传槽位数", en: "Maximum concurrent upload slots" },
+    minimum_latency_in_ticks: { zh: "最低延迟（游戏刻），越小响应越快但更吃网络", en: "Minimum latency in ticks. Lower = more responsive" },
+    ignore_player_limit_for_returning_players: { zh: "返回玩家是否无视人数上限", en: "Returning players bypass player limit" },
+    allow_commands: { zh: "指令权限：true（所有人）/ admins-only / false", en: "Command permission: true (all) / admins-only / false" },
+    auto_pause: { zh: "无人在线时自动暂停游戏", en: "Auto-pause when no players connected" },
+    only_admins_can_pause_the_game: { zh: "仅允许管理员暂停游戏", en: "Only admins can pause the game" },
+    autosave_interval: { zh: "自动保存间隔（分钟）", en: "Auto-save interval in minutes" },
+    autosave_slots: { zh: "保留的自动保存槽位数", en: "Number of auto-save slots" },
+    autosave_only_on_server: { zh: "仅在服务器端自动保存", en: "Only server performs auto-saves" },
+    non_blocking_saving: { zh: "非阻塞保存，保存时游戏不暂停", en: "Non-blocking saving" },
+    afk_autokick_interval: { zh: "挂机自动踢出时间（分钟），0 为不禁用", en: "AFK auto-kick in minutes. 0 = never" },
+    admins: { zh: "管理员用户名列表（逗号分隔）", en: "Admin usernames (comma separated)" },
+    minimum_segment_size: { zh: "最小网络分段大小", en: "Minimum segment size for networking" },
+    minimum_segment_size_peer_count: { zh: "最小分段的节点数", en: "Min segment size peer count" },
+    maximum_segment_size: { zh: "最大网络分段大小", en: "Maximum segment size for networking" },
+    maximum_segment_size_peer_count: { zh: "最大分段的节点数", en: "Max segment size peer count" },
 };
-
 export default settingDescriptions;

From d56e36d5108610cc3e9a343c74d91e5ba44c6146 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 13:45:02 +0000
Subject: [PATCH 083/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Factorio=202.1=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E5=88=A4=E6=96=AD=20&=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E7=89=88=E6=9C=AC=E6=98=BE=E7=A4=BA=20&=20=E5=B4=A9?=
 =?UTF-8?q?=E6=BA=83=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- save.go: 修复 fmt.Errorf 中 %%v 导致编译失败 (20+处)
- mod_modInfo.go: 修复依赖解析 parts[2] 越界崩溃
- mod_modInfo.go: 修复 base 依赖覆盖 FactorioVersion 为更低版本 (如 2.0→0.18)
- version_compat_test.go: 新增 GEC 兼容性测试 (2.1/2.0/1.0 边界情况)
---
 src/factorio/mod_modInfo.go         | 29 +++++-----
 src/factorio/save.go                | 42 +++++++--------
 src/factorio/version_compat_test.go | 82 +++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 33 deletions(-)
 create mode 100644 src/factorio/version_compat_test.go

diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 7dda8711..940399c1 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -97,15 +97,19 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 				if parts[0] != "base" {
 					continue
 				}
-				if len(parts) == 1 {
-					base = modInfo.FactorioVersion
-					op = ">="
-					continue
-				}
+			if len(parts) == 1 {
+				base = modInfo.FactorioVersion
+				op = ">="
+				continue
+			}
+			if len(parts) < 3 {
+				log.Printf("skipping dependency '%s' in '%s': invalid format (expected 'base op version')\n", dep, modInfo.Name)
+				continue
+			}
 
-				op = parts[1]
+			op = parts[1]
 
-				if err := base.UnmarshalText([]byte(parts[2])); err != nil {
+			if err := base.UnmarshalText([]byte(parts[2])); err != nil {
 					log.Printf("skipping dependency '%s' in '%s': %v\n", dep, modInfo.Name, err)
 					continue
 				}
@@ -115,13 +119,14 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 
 			server := GetFactorioServer()
 
-			// check both the factorio-version and the base mod dependency
-			modInfo.Compatibility = server.Version.GEC(modInfo.FactorioVersion)
-			if modInfo.Compatibility && !base.Equals(NilVersion) {
-				modInfo.Compatibility = server.Version.Compatible(base, op)
+		modInfo.Compatibility = server.Version.GEC(modInfo.FactorioVersion)
+		if modInfo.Compatibility && !base.Equals(NilVersion) {
+			modInfo.Compatibility = server.Version.Compatible(base, op)
+			if base.Greater(modInfo.FactorioVersion) || modInfo.FactorioVersion.Equals(NilVersion) {
 				modInfo.FactorioVersion = base
-				modInfo.DepOp = op
 			}
+			modInfo.DepOp = op
+		}
 
 			modInfoList.Mods = append(modInfoList.Mods, modInfo)
 		}
diff --git a/src/factorio/save.go b/src/factorio/save.go
index ab974a2d..bc6abb7b 100644
--- a/src/factorio/save.go
+++ b/src/factorio/save.go
@@ -85,12 +85,12 @@ type Mod struct {
 func (h *SaveHeader) ReadFrom(r io.Reader) (err error) {
 	data, dataErr := io.ReadAll(r)
 	if dataErr != nil {
-		return fmt.Errorf("read save data: %%v", dataErr)
+		return fmt.Errorf("read save data: %v", dataErr)
 	}
 
 	var fv version64
 	if err := fv.UnmarshalBinary(data[:8]); err != nil {
-		return fmt.Errorf("read FactorioVersion: %%%%v", err)
+		return fmt.Errorf("read FactorioVersion: %v", err)
 	}
 	h.FactorioVersion = Version(fv)
 
@@ -107,64 +107,64 @@ func (h *SaveHeader) ReadFrom(r io.Reader) (err error) {
 	if !h.FactorioVersion.Less(Version{0, 17, 0, 0}) {
 		_, err = buf.Read(scratch[:1])
 		if err != nil {
-			return fmt.Errorf("read first random 0.17 byte: %%%%v", err)
+			return fmt.Errorf("read first random 0.17 byte: %v", err)
 		}
 	}
 
 	h.Campaign, err = readString(buf, Version(h.FactorioVersion), false)
-	if err != nil { return fmt.Errorf("read Campaign: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read Campaign: %v", err) }
 
 	h.Name, err = readString(buf, Version(h.FactorioVersion), false)
-	if err != nil { return fmt.Errorf("read Name: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read Name: %v", err) }
 
 	h.BaseMod, err = readString(buf, Version(h.FactorioVersion), false)
-	if err != nil { return fmt.Errorf("read BaseMod: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read BaseMod: %v", err) }
 
 	_, err = buf.Read(scratch[:1])
-	if err != nil { return fmt.Errorf("read Difficulty: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read Difficulty: %v", err) }
 	h.Difficulty = scratch[0]
 
 	_, err = buf.Read(scratch[:1])
-	if err != nil { return fmt.Errorf("read Finished: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read Finished: %v", err) }
 	h.Finished = scratch[0] != 0
 
 	_, err = buf.Read(scratch[:1])
-	if err != nil { return fmt.Errorf("read PlayerWon: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read PlayerWon: %v", err) }
 	h.PlayerWon = scratch[0] != 0
 
 	h.NextLevel, err = readString(buf, Version(h.FactorioVersion), false)
-	if err != nil { return fmt.Errorf("read NextLevel: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read NextLevel: %v", err) }
 
 	if !h.FactorioVersion.Less(Version{0, 12, 0, 0}) {
 		_, err = buf.Read(scratch[:1])
-		if err != nil { return fmt.Errorf("read CanContinue: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read CanContinue: %v", err) }
 		h.CanContinue = scratch[0] != 0
 		_, err = buf.Read(scratch[:1])
-		if err != nil { return fmt.Errorf("read FinishedButContinuing: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read FinishedButContinuing: %v", err) }
 		h.FinishedButContinuing = scratch[0] != 0
 	}
 
 	_, err = buf.Read(scratch[:1])
-	if err != nil { return fmt.Errorf("read SavingReplay: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read SavingReplay: %v", err) }
 	h.SavingReplay = scratch[0] != 0
 
 	if atLeast016 {
 		_, err = buf.Read(scratch[:1])
-		if err != nil { return fmt.Errorf("read AllowNonAdmin: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read AllowNonAdmin: %v", err) }
 		h.AllowNonAdminDebugOptions = scratch[0] != 0
 	}
 
 	var loadedFrom version48
 	err = loadedFrom.ReadFrom(buf, Version(h.FactorioVersion))
-	if err != nil { return fmt.Errorf("read LoadedFrom: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read LoadedFrom: %v", err) }
 	h.LoadedFrom = Version(loadedFrom)
 
 	_, err = buf.Read(scratch[:2])
-	if err != nil { return fmt.Errorf("read LoadedFromBuild: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read LoadedFromBuild: %v", err) }
 	h.LoadedFromBuild = binary.LittleEndian.Uint16(scratch[:2])
 
 	_, err = buf.Read(scratch[:1])
-	if err != nil { return fmt.Errorf("read AllowedCommands: %%%%v", err) }
+	if err != nil { return fmt.Errorf("read AllowedCommands: %v", err) }
 	h.AllowedCommands = scratch[0]
 	if h.FactorioVersion.Less(Version{0, 13, 0, 87}) {
 		if h.AllowedCommands == 0 { h.AllowedCommands = 2 } else { h.AllowedCommands = 1 }
@@ -172,23 +172,23 @@ func (h *SaveHeader) ReadFrom(r io.Reader) (err error) {
 
 	if h.FactorioVersion.Less(Version{0, 13, 0, 42}) {
 		h.Stats, err = h.readStats(buf)
-		if err != nil { return fmt.Errorf("read Stats: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read Stats: %v", err) }
 	}
 
 	var n uint32
 	if atLeast016 {
 		n, err = readOptimUint(buf, Version(h.FactorioVersion), 32)
-		if err != nil { return fmt.Errorf("read num mods: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read num mods: %v", err) }
 	} else {
 		_, err = buf.Read(scratch[:4])
-		if err != nil { return fmt.Errorf("read num mods: %%%%v", err) }
+		if err != nil { return fmt.Errorf("read num mods: %v", err) }
 		n = binary.LittleEndian.Uint32(scratch[:4])
 	}
 
 	for i := uint32(0); i < n; i++ {
 		var m Mod
 		if err = (&m).ReadFrom(buf, Version(h.FactorioVersion)); err != nil {
-			return fmt.Errorf("read mod: %%%%v", err)
+			return fmt.Errorf("read mod: %v", err)
 		}
 		h.Mods = append(h.Mods, m)
 	}
diff --git a/src/factorio/version_compat_test.go b/src/factorio/version_compat_test.go
new file mode 100644
index 00000000..11fe7db2
--- /dev/null
+++ b/src/factorio/version_compat_test.go
@@ -0,0 +1,82 @@
+package factorio
+
+import "testing"
+
+func TestGEC_Server2_1(t *testing.T) {
+	server := &Version{2, 1, 0, 0}
+	
+	tests := []struct{
+		modVersion Version
+		expect bool
+		desc string
+	}{
+		{Version{2, 1, 0, 0}, true, "exact same 2.1.0.0"},
+		{Version{2, 1, 5, 0}, false, "mod newer 2.1.5.0"},
+		{Version{2, 0, 0, 0}, false, "mod 2.0.0.0 on 2.1 server"},
+		{Version{1, 1, 0, 0}, false, "mod 1.1.0.0 on 2.1 server"},
+		{Version{0, 18, 0, 0}, false, "mod 0.18.0.0 on 2.1 server"},
+	}
+	
+	for _, tt := range tests {
+		got := server.GEC(tt.modVersion)
+		if got != tt.expect {
+			t.Errorf("%s: GEC() = %v, want %v", tt.desc, got, tt.expect)
+		}
+	}
+}
+
+func TestGEC_Server2_0(t *testing.T) {
+	server := &Version{2, 0, 0, 0}
+	
+	tests := []struct{
+		modVersion Version
+		expect bool
+		desc string
+	}{
+		{Version{2, 0, 0, 0}, true, "exact match 2.0.0.0"},
+		{Version{2, 0, 5, 0}, false, "mod 2.0.5.0 on 2.0.0 server (newer)"},
+		{Version{2, 0, 20, 0}, false, "mod 2.0.20.0 on 2.0.0 server (newer)"},
+		{Version{1, 1, 0, 0}, false, "mod 1.1.0.0 on 2.0 server"},
+	}
+	
+	for _, tt := range tests {
+		got := server.GEC(tt.modVersion)
+		if got != tt.expect {
+			t.Errorf("%s: GEC() = %v, want %v", tt.desc, got, tt.expect)
+		}
+	}
+}
+
+func TestGEC_Server1_0(t *testing.T) {
+	server := &Version{1, 0, 0, 0}
+	
+	tests := []struct{
+		modVersion Version
+		expect bool
+		desc string
+	}{
+		{Version{1, 0, 0, 0}, true, "exact match"},
+		{Version{0, 18, 0, 0}, true, "0.18 mod on 1.0 server (legacy compat)"},
+	}
+	
+	for _, tt := range tests {
+		got := server.GEC(tt.modVersion)
+		if got != tt.expect {
+			t.Errorf("%s: GEC() = %v, want %v", tt.desc, got, tt.expect)
+		}
+	}
+}
+
+func TestGreaterC_KeyCases(t *testing.T) {
+	// GreaterC: compatible if same major.minor and server >= mod patch
+	var s Version = Version{2, 0, 10, 0}
+	if !s.GreaterC(Version{2, 0, 5, 0}) {
+		t.Error("2.0.10 should be compatible with 2.0.5")
+	}
+	if s.GreaterC(Version{2, 0, 15, 0}) {
+		t.Error("2.0.10 should NOT be compatible with 2.0.15 (server older)")
+	}
+	if s.GreaterC(Version{2, 1, 0, 0}) {
+		t.Error("2.0.10 should NOT be compatible with 2.1.0 (different minor)")
+	}
+}

From fc3f9795550f80d7bf51b7933e60a98633963a6c Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 14:23:39 +0000
Subject: [PATCH 084/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Portal=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E6=94=B9=E7=94=A8=20GEC=20&=20DepOp?=
 =?UTF-8?q?=20=E4=B8=8D=E5=86=8D=E7=A1=AC=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mod_portal.go: 发布版兼容性从 Compatible(>=) 改为 GEC()
  修复 2.1 服务器错误标为兼容的 portal 发布版
- mod_Mods.go: DepOp 从硬编码 >= 改为传递 modInfo.DepOp
---
 src/factorio/mod_Mods.go   | 2 +-
 src/factorio/mod_portal.go | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index 22c8ae5b..e99905cc 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -61,7 +61,7 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		modsResult.Version = modInfo.Version
 		modsResult.FactorioVersion = modInfo.FactorioVersion
 		modsResult.Compatibility = modInfo.Compatibility
-		modsResult.DepOp = ">="
+		modsResult.DepOp = modInfo.DepOp
 
 		for _, simpleMod := range mods.ModSimpleList.Mods {
 			if simpleMod.Name == modsResult.Name {
diff --git a/src/factorio/mod_portal.go b/src/factorio/mod_portal.go
index b3b4a846..ac7decac 100644
--- a/src/factorio/mod_portal.go
+++ b/src/factorio/mod_portal.go
@@ -110,13 +110,8 @@ func ModPortalModDetails(modId string) (ModPortalStruct, error, int) {
 
 	server := GetFactorioServer()
 
-	installedBaseVersion := Version{}
-	_ = installedBaseVersion.UnmarshalText([]byte(server.BaseModVersion))
-	requiredVersion := NilVersion
-
 	for key, release := range mod.Releases {
-		requiredVersion = release.InfoJSON.FactorioVersion
-		release.Compatibility = installedBaseVersion.Compatible(requiredVersion, ">=")
+		release.Compatibility = server.Version.GEC(release.InfoJSON.FactorioVersion)
 		mod.Releases[key] = release
 	}
 

From 3a4203bd606e387b5341890f3c7cfbd8f59810bc Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 15:02:48 +0000
Subject: [PATCH 085/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=97=A8?=
 =?UTF-8?q?=E6=88=B7=E6=90=9C=E4=B8=8D=E5=88=B0=20mod=20=E6=97=B6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20404=20=E8=80=8C=E9=9D=9E=20500=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mod_portal_handler.go: Mod not found 时返回 404 + JSON
- Mod.jsx: portal.info 失败时 try/catch 静默跳过更新检查
---
 src/api/mod_portal_handler.go        | 7 +++++++
 ui/App/views/Mods/components/Mod.jsx | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/api/mod_portal_handler.go b/src/api/mod_portal_handler.go
index d9f9967e..959b4a17 100644
--- a/src/api/mod_portal_handler.go
+++ b/src/api/mod_portal_handler.go
@@ -48,6 +48,13 @@ func ModPortalModInfoHandler(w http.ResponseWriter, r *http.Request) {
 	resp, err, statusCode = factorio.ModPortalModDetails(modId)
 
 	if err != nil {
+		if statusCode == http.StatusNotFound {
+			w.WriteHeader(http.StatusNotFound)
+			resp = struct {
+				Message string `json:"message"`
+			}{"Mod not found on Factorio portal"}
+			return
+		}
 		resp = fmt.Sprintf("Error in getting mod details from mod portal: %s", err)
 		log.Println(resp)
 		w.WriteHeader(http.StatusInternalServerError)
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 857420c7..94352045 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -20,7 +20,8 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
     useEffect(() => {
         if (!disabled) {
             (async () => {
-                const data = await modsResource.portal.info(mod.name)
+                try {
+                    const data = await modsResource.portal.info(mod.name)
 
                 //get newest COMPATIBLE release
                 let newestRelease;
@@ -59,6 +60,7 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                     setNewVersion(null);
                 }
 
+            } catch (e) {}
             })();
         }
     }, [mod]);

From 4a031d31b66ba12657cad9bccc9e358b84c3302b Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 15:46:59 +0000
Subject: [PATCH 086/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20i18next=20?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91=20=E2=80=94=20common=20?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=20+=20=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- common 命名空间: signIn/username/password 等登录页翻译
- i18n.js: ns 配置 + zh-CN 资源
- zh.json: 67 个顶层键 + 嵌套翻译 (完整镜像 en.json)
- ChangeLangDialog: 添加简体中文按钮
- zh-common.json: 独立 common 命名空间翻译
---
 ui/App/components/ChangeLangDialog.jsx |   1 +
 ui/App/i18n.js                         |   7 +
 ui/App/locales/en-common.json          |  17 +++
 ui/App/locales/zh-common.json          |  42 ++++++
 ui/App/locales/zh.json                 | 190 +++++++++++++++++++++----
 5 files changed, 231 insertions(+), 26 deletions(-)
 create mode 100644 ui/App/locales/en-common.json
 create mode 100644 ui/App/locales/zh-common.json

diff --git a/ui/App/components/ChangeLangDialog.jsx b/ui/App/components/ChangeLangDialog.jsx
index 58ebae22..eb59147b 100644
--- a/ui/App/components/ChangeLangDialog.jsx
+++ b/ui/App/components/ChangeLangDialog.jsx
@@ -19,6 +19,7 @@ function ChangeLangDialog({isOpen, close, onSuccess}) {
                 <>
                     <Button className="w-full" onClick={() => changeLang("en")}>English</Button>
                     <Button className="w-full" onClick={() => changeLang("ru")}>Русский</Button>
+                    <Button className="w-full" onClick={() => changeLang("zh")}>简体中文</Button>
                     {/* Other languages */}
                 </>
             }
diff --git a/ui/App/i18n.js b/ui/App/i18n.js
index b639a06f..6a21c533 100644
--- a/ui/App/i18n.js
+++ b/ui/App/i18n.js
@@ -3,22 +3,27 @@ import { initReactI18next } from "react-i18next";
 import Backend from 'i18next-http-backend'
 import LanguageDetector from "i18next-browser-languagedetector";
 import enTranslations from "./locales/en.json";
+import enCommonTranslations from "./locales/en-common.json";
 import ruTranslations from "./locales/ru.json";
 import zhTranslations from "./locales/zh.json";
+import zhCommonTranslations from "./locales/zh-common.json";
 
 const resources =
 {
     en:
     {
         translation: enTranslations,
+        common: enCommonTranslations,
     },
     ru:
     {
         translation: ruTranslations,
+        common: enCommonTranslations,
     },
     zh:
     {
         translation: zhTranslations,
+        common: zhCommonTranslations,
     }
 };
 
@@ -27,6 +32,8 @@ i18n
     .use(LanguageDetector)
     .use(initReactI18next)
     .init({
+        ns: ['translation', 'common'],
+        defaultNS: 'translation',
         resources,
         fallbackLng: "en", // Default Language
         // Detecting and caching of language cookies
diff --git a/ui/App/locales/en-common.json b/ui/App/locales/en-common.json
new file mode 100644
index 00000000..23b2316f
--- /dev/null
+++ b/ui/App/locales/en-common.json
@@ -0,0 +1,17 @@
+{
+  "username": "Username",
+  "password": "Password",
+  "upload": "Upload",
+  "name": "Name",
+  "actions": "Actions",
+  "role": "Role",
+  "email": "Email",
+  "save": "Save",
+  "logout": "Logout",
+  "cancel": "Cancel",
+  "create": "Create",
+  "confirm": "Confirm",
+  "change": "Change",
+  "install": "Install",
+  "load": "Load"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-common.json b/ui/App/locales/zh-common.json
new file mode 100644
index 00000000..11cf4a87
--- /dev/null
+++ b/ui/App/locales/zh-common.json
@@ -0,0 +1,42 @@
+{
+  "signIn": "登录",
+  "username": "用户名",
+  "password": "密码",
+  "usernameRequired": "请输入用户名",
+  "passwordRequired": "请输入密码",
+  "loginFailed": "登录失败，用户名或密码错误",
+  "upload": "上传",
+  "name": "名称",
+  "lastModifiedAt": "最后修改",
+  "size": "大小",
+  "actions": "操作",
+  "role": "角色",
+  "email": "邮箱",
+  "unknown": "未知",
+  "save": "保存",
+  "logout": "退出登录",
+  "cancel": "取消",
+  "create": "创建",
+  "confirm": "确认",
+  "change": "修改",
+  "delete": "删除",
+  "search": "搜索",
+  "install": "安装",
+  "load": "加载",
+  "update": "更新",
+  "download": "下载",
+  "remove": "删除",
+  "start": "启动",
+  "stop": "停止",
+  "kill": "强制终止",
+  "close": "关闭",
+  "back": "返回",
+  "next": "下一步",
+  "previous": "上一步",
+  "submit": "提交",
+  "reset": "重置",
+  "enable": "启用",
+  "disable": "禁用",
+  "enabled": "已启用",
+  "disabled": "已禁用"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh.json b/ui/App/locales/zh.json
index 068c0b61..0b3009c0 100644
--- a/ui/App/locales/zh.json
+++ b/ui/App/locales/zh.json
@@ -10,15 +10,41 @@
   "password": "密码",
   "logout": "退出登录",
   "install": "安装",
+  "load": "加载",
   "actions": "操作",
   "role": "角色",
   "email": "邮箱",
   "change": "修改",
-  "load": "加载",
+  "search": "搜索",
+  "language": "语言",
+  "UNKNOWN": "未知",
+  "main_title": "异星工厂服务器管理器",
   "server_status": "服务器状态",
   "server_management": "服务器管理",
   "FSM_administration": "FSM 管理",
-  "main_title": "异星工厂服务器管理器",
+  "lang": "语言",
+  "controls": {
+    "title": "控制面板",
+    "unknown": "未知",
+    "running": "运行中",
+    "stopped": "已停止",
+    "factorioVersion": "游戏版本",
+    "serverRunning": "服务器运行中",
+    "serverStopped": "服务器已停止",
+    "start": "启动服务器",
+    "stop": "停止服务器",
+    "kill": "强制终止",
+    "save_game": "保存游戏",
+    "ip": "IP 地址",
+    "port": "端口",
+    "saveFile": "存档",
+    "loadLatest": "加载最新",
+    "factorioInstallation": "Factorio 安装",
+    "installedVersion": "已安装版本",
+    "availableVersions": "可用版本",
+    "downloadInstall": "下载并安装",
+    "removeInstallation": "卸载"
+  },
   "server_settings": {
     "title": "服务器设置",
     "admins": "管理员",
@@ -36,32 +62,36 @@
     "game_password": "游戏密码",
     "require_user_verification": "验证用户身份",
     "max_upload": "最大上传速度",
-    "max_upload_slots": "上传槽位",
+    "max_upload_slots": "上传槽位数",
     "minimum_latency": "最低延迟",
     "ignore_player_limit": "返回玩家无视上限",
     "allow_commands": "允许指令",
     "auto_pause": "自动暂停",
     "only_admins_can_pause": "仅管理员可暂停",
     "autosave_interval": "自动保存间隔",
-    "autosave_slots": "自动保存槽位",
+    "autosave_slots": "自动保存槽位数",
     "non_blocking_saving": "非阻塞保存",
     "afk_autokick_interval": "挂机踢出时间",
     "require_user_verification_label": "需要验证用户身份",
-    "visibility_label": "服务器可见性"
+    "visibility_label": "服务器可见性",
+    "show_descriptions": "显示说明",
+    "hide_descriptions": "隐藏说明"
   },
-  "controls": {
-    "title": "服务器控制",
-    "start": "启动",
-    "stop": "停止",
-    "kill": "强制终止",
-    "save_game": "存档",
-    "factorioVersion": "游戏版本",
-    "serverRunning": "运行中",
-    "serverStopped": "已停止"
+  "saves": {
+    "title": "存档管理",
+    "dl_save": "下载存档",
+    "upload_save": "上传存档",
+    "remove_save": "删除存档",
+    "create_save": "创建存档",
+    "no_saves": "没有存档",
+    "delete_confirm": "确认删除存档？",
+    "name": "存档名称",
+    "lastModifiedAt": "最后修改",
+    "size": "大小"
   },
   "mods": {
     "title": "模组管理",
-    "installed": "已安装",
+    "installed": "已安装模组",
     "portal": "模组门户",
     "add": "添加模组",
     "load": "从存档加载",
@@ -74,26 +104,134 @@
     "compatibility": "兼容性",
     "mod_version": "模组版本",
     "file_size": "文件大小",
-    "search": "搜索..."
+    "updateAllMods": "更新全部模组",
+    "downloadAllMods": "下载全部模组",
+    "deleteAllMods": "删除全部模组",
+    "confirmDeleteAll": "确认删除所有模组？此操作不可撤销。",
+    "noModsInstalled": "没有安装模组",
+    "installMods": "安装模组",
+    "loadingMods": "加载模组列表...",
+    "installedTab": "已安装",
+    "addModTab": "添加模组",
+    "loadModsTab": "加载模组",
+    "modPacksTab": "模组包"
   },
-  "saves": {
-    "title": "存档管理",
-    "dl_save": "下载存档",
-    "upload_save": "上传存档",
-    "remove_save": "删除存档",
-    "create_save": "创建存档"
+  "modPacks": "模组包",
+  "createModPack": "创建模组包",
+  "modPackName": "模组包名称",
+  "game_settings": {
+    "title": "游戏设置"
+  },
+  "console": {
+    "title": "控制台",
+    "send": "发送",
+    "command": "命令",
+    "placeholder": "输入指令..."
   },
   "logs": {
-    "title": "日志"
+    "title": "日志",
+    "refresh": "刷新",
+    "autoScroll": "自动滚动"
   },
-  "user_management": {
+  "users": {
     "title": "用户管理",
     "add_user": "添加用户",
     "remove": "删除"
   },
+  "userManagement": {
+    "title": "用户管理",
+    "addUser": "添加用户",
+    "username": "用户名",
+    "password": "密码",
+    "role": "角色",
+    "email": "邮箱",
+    "actions": "操作",
+    "confirmDelete": "确认删除用户？",
+    "usernameRequired": "请输入用户名",
+    "passwordRequired": "请输入密码"
+  },
   "help": {
     "title": "帮助"
   },
-  "language": "语言",
-  "UNKNOWN": "未知"
+  "login": {
+    "title": "登录",
+    "login": "登录",
+    "login_failed_message": "登录失败，用户名或密码错误",
+    "username_error_message": "请输入用户名",
+    "password_error_message": "请输入密码",
+    "factorio_login_error_message": "用户名或密码不匹配"
+  },
+  "factorioLogin": {
+    "title": "Factorio 登录",
+    "login_status": "登录状态",
+    "logged_in": "已登录",
+    "not_logged_in": "未登录",
+    "login": "登录",
+    "logout": "退出",
+    "username": "用户名",
+    "token": "令牌",
+    "token_hint": "在 factorio.com/profile 获取",
+    "login_success": "Factorio 登录成功",
+    "login_failed": "Factorio 登录失败",
+    "factorio_login_error_message": "用户名或密码不匹配"
+  },
+  "serverVersion": {
+    "title": "服务器版本",
+    "current": "当前版本",
+    "available": "可用版本",
+    "stable": "稳定版",
+    "experimental": "实验版",
+    "install": "安装",
+    "installing": "安装中...",
+    "latestReleases": "最新发布",
+    "fullVersionList": "完整版本列表",
+    "noVersionsAvailable": "没有可用版本"
+  },
+  "change_password": {
+    "title": "修改密码",
+    "old_password": "旧密码",
+    "old_password_error": "请输入旧密码",
+    "new_password": "新密码",
+    "new_password_error": "请输入新密码",
+    "new_password_confirmation": "确认新密码",
+    "new_password_confirmation_error": "请输入确认密码"
+  },
+  "passwordConfirmation": "确认密码",
+  "passwordMismatch": "两次密码不一致",
+  "passwordChanged": "密码已修改",
+  "usernameRequired": "请输入用户名",
+  "passwordRequired": "请输入密码",
+  "signIn": "登录",
+  "loginFailed": "登录失败",
+  "lastModifiedAt": "最后修改",
+  "size": "大小",
+  "delete_confirm": "确认删除？",
+  "update": "更新",
+  "download": "下载",
+  "remove": "删除",
+  "start": "启动",
+  "stop": "停止",
+  "kill": "强制终止",
+  "close": "关闭",
+  "back": "返回",
+  "next": "下一步",
+  "previous": "上一步",
+  "submit": "提交",
+  "reset": "重置",
+  "enable": "启用",
+  "disable": "禁用",
+  "enabled": "已启用",
+  "disabled": "已禁用",
+  "updateAllMods": "更新全部模组",
+  "downloadAllMods": "下载全部模组",
+  "deleteAllMods": "删除全部模组",
+  "modPortal": "模组门户",
+  "installMod": "安装模组",
+  "uploadMod": "上传模组",
+  "loadModsFromSave": "从存档加载",
+  "noModsInstalled": "没有安装模组",
+  "installedTab": "已安装",
+  "addModTab": "添加模组",
+  "loadModsTab": "加载模组",
+  "modPacksTab": "模组包"
 }
\ No newline at end of file

From c257bf5ef06c91046a49ad13b38e33d5d2fc9c7a Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Tue, 23 Jun 2026 16:14:26 +0000
Subject: [PATCH 087/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E6=81=A2=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/components/Layout.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index d5086fea..30bcae2b 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -75,6 +75,7 @@ const Layout = ({handleLogout, serverStatus}) => {
                             <Link to="/">{t("controls.title")}</Link>
                             <Link to="/saves">{t("saves.title")}</Link>
                             <Link to="/mods">{t("mods.title")}</Link>
+                            <Link to="/server-version">{t("serverVersion.title")}</Link>
                             <Link to="/server-settings">{t("server_settings.title")}</Link>
                             <Link to="/game-settings">{t("game_settings.title")}</Link>
                             <Link to="/console">{t("console.title")}</Link>

From f701ec72f8ef2bfbc17c64dc5dcf71ab474cbbab Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 04:37:42 +0000
Subject: [PATCH 088/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=85=A8=E9=83=A8=2010=20=E4=B8=AA=20i18n=20=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4=20+=20=E5=88=9B=E5=BB=BA=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

合并后 Joey 的组件使用独立命名空间 (controls/console/logs/mods/saves/
serverSettings/serverVersion/userManagement/layout) 但 i18n.js 只注册了
translation/common 两个，导致页面显示原始键名。

- 创建 9 个 zh-*.json 命名空间翻译文件
- i18n.js 注册全部 ns + 加载对应资源
- 补全大小写键名 (STOPPED/RUNNING/serverStatus 等)
---
 ui/App/i18n.js                        | 20 +++++++++++++-
 ui/App/locales/zh-console.json        |  6 +++++
 ui/App/locales/zh-controls.json       | 28 +++++++++++++++++++
 ui/App/locales/zh-layout.json         |  9 +++++++
 ui/App/locales/zh-logs.json           |  5 ++++
 ui/App/locales/zh-mods.json           | 39 +++++++++++++++++++++++++++
 ui/App/locales/zh-saves.json          | 12 +++++++++
 ui/App/locales/zh-serverSettings.json | 32 ++++++++++++++++++++++
 ui/App/locales/zh-serverVersion.json  | 12 +++++++++
 ui/App/locales/zh-userManagement.json | 12 +++++++++
 10 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 ui/App/locales/zh-console.json
 create mode 100644 ui/App/locales/zh-controls.json
 create mode 100644 ui/App/locales/zh-layout.json
 create mode 100644 ui/App/locales/zh-logs.json
 create mode 100644 ui/App/locales/zh-mods.json
 create mode 100644 ui/App/locales/zh-saves.json
 create mode 100644 ui/App/locales/zh-serverSettings.json
 create mode 100644 ui/App/locales/zh-serverVersion.json
 create mode 100644 ui/App/locales/zh-userManagement.json

diff --git a/ui/App/i18n.js b/ui/App/i18n.js
index 6a21c533..6de916ad 100644
--- a/ui/App/i18n.js
+++ b/ui/App/i18n.js
@@ -7,6 +7,15 @@ import enCommonTranslations from "./locales/en-common.json";
 import ruTranslations from "./locales/ru.json";
 import zhTranslations from "./locales/zh.json";
 import zhCommonTranslations from "./locales/zh-common.json";
+import zhControlsTranslations from "./locales/zh-controls.json";
+import zhConsoleTranslations from "./locales/zh-console.json";
+import zhLayoutTranslations from "./locales/zh-layout.json";
+import zhLogsTranslations from "./locales/zh-logs.json";
+import zhModsTranslations from "./locales/zh-mods.json";
+import zhSavesTranslations from "./locales/zh-saves.json";
+import zhServersettingsTranslations from "./locales/zh-serverSettings.json";
+import zhServerversionTranslations from "./locales/zh-serverVersion.json";
+import zhUsermanagementTranslations from "./locales/zh-userManagement.json";
 
 const resources =
 {
@@ -24,6 +33,15 @@ const resources =
     {
         translation: zhTranslations,
         common: zhCommonTranslations,
+        controls: zhControlsTranslations,
+        console: zhConsoleTranslations,
+        layout: zhLayoutTranslations,
+        logs: zhLogsTranslations,
+        mods: zhModsTranslations,
+        saves: zhSavesTranslations,
+        serverSettings: zhServersettingsTranslations,
+        serverVersion: zhServerversionTranslations,
+        userManagement: zhUsermanagementTranslations,
     }
 };
 
@@ -32,7 +50,7 @@ i18n
     .use(LanguageDetector)
     .use(initReactI18next)
     .init({
-        ns: ['translation', 'common'],
+        ns: ["translation", "common", "controls", "console", "layout", "logs", "mods", "saves", "serverSettings", "serverVersion", "userManagement"],
         defaultNS: 'translation',
         resources,
         fallbackLng: "en", // Default Language
diff --git a/ui/App/locales/zh-console.json b/ui/App/locales/zh-console.json
new file mode 100644
index 00000000..02382cb5
--- /dev/null
+++ b/ui/App/locales/zh-console.json
@@ -0,0 +1,6 @@
+{
+  "title": "控制台",
+  "send": "发送",
+  "command": "命令",
+  "placeholder": "输入指令..."
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-controls.json b/ui/App/locales/zh-controls.json
new file mode 100644
index 00000000..6f42cffb
--- /dev/null
+++ b/ui/App/locales/zh-controls.json
@@ -0,0 +1,28 @@
+{
+  "title": "控制面板",
+  "unknown": "未知",
+  "running": "运行中",
+  "stopped": "已停止",
+  "factorioVersion": "游戏版本",
+  "serverRunning": "服务器运行中",
+  "serverStopped": "服务器已停止",
+  "start": "启动",
+  "stop": "停止服务器",
+  "kill": "强制终止",
+  "save_game": "保存游戏",
+  "ip": "IP 地址",
+  "port": "端口",
+  "saveFile": "存档",
+  "loadLatest": "加载最新",
+  "factorioInstallation": "Factorio 安装",
+  "installedVersion": "已安装版本",
+  "availableVersions": "可用版本",
+  "downloadInstall": "下载并安装",
+  "removeInstallation": "卸载",
+  "serverStatus": "服务器状态",
+  "status": "状态",
+  "RUNNING": "运行中",
+  "STOPPED": "已停止",
+  "save": "存档",
+  "UNKNOWN": "未知"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-layout.json b/ui/App/locales/zh-layout.json
new file mode 100644
index 00000000..f04237c7
--- /dev/null
+++ b/ui/App/locales/zh-layout.json
@@ -0,0 +1,9 @@
+{
+  "main_title": "异星工厂服务器管理器",
+  "server_status": "服务器状态",
+  "server_management": "服务器管理",
+  "FSM_administration": "FSM 管理",
+  "lang": "语言",
+  "logout": "退出登录",
+  "UNKNOWN": "未知"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-logs.json b/ui/App/locales/zh-logs.json
new file mode 100644
index 00000000..6034ad3d
--- /dev/null
+++ b/ui/App/locales/zh-logs.json
@@ -0,0 +1,5 @@
+{
+  "title": "日志",
+  "refresh": "刷新",
+  "autoScroll": "自动滚动"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-mods.json b/ui/App/locales/zh-mods.json
new file mode 100644
index 00000000..147b50e3
--- /dev/null
+++ b/ui/App/locales/zh-mods.json
@@ -0,0 +1,39 @@
+{
+  "title": "模组管理",
+  "installed": "已安装模组",
+  "portal": "模组门户",
+  "add": "添加模组",
+  "load": "从存档加载",
+  "delete_all": "删除全部",
+  "update_all": "更新全部",
+  "install_mods": "安装模组",
+  "loading_mods": "加载模组列表...",
+  "factorioVersion": "游戏版本",
+  "enabled": "启用",
+  "compatibility": "兼容性",
+  "mod_version": "模组版本",
+  "file_size": "文件大小",
+  "updateAllMods": "更新全部模组",
+  "downloadAllMods": "下载全部模组",
+  "deleteAllMods": "删除全部模组",
+  "confirmDeleteAll": "确认删除所有模组？此操作不可撤销。",
+  "noModsInstalled": "没有安装模组",
+  "installMods": "安装模组",
+  "loadingMods": "加载模组列表...",
+  "installedTab": "已安装",
+  "addModTab": "添加模组",
+  "loadModsTab": "加载模组",
+  "modPacksTab": "模组包",
+  "modPacks": "模组包",
+  "createModPack": "创建模组包",
+  "modPortal": "模组门户",
+  "installMod": "安装模组",
+  "uploadMod": "上传模组",
+  "loadModsFromSave": "从存档加载",
+  "search": "搜索...",
+  "Name": "模组名称",
+  "Enabled": "启用",
+  "Compatibility": "兼容性",
+  "Mod Version": "模组版本",
+  "Factorio Version": "Factorio 版本"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-saves.json b/ui/App/locales/zh-saves.json
new file mode 100644
index 00000000..cdee8aa3
--- /dev/null
+++ b/ui/App/locales/zh-saves.json
@@ -0,0 +1,12 @@
+{
+  "title": "存档管理",
+  "dl_save": "下载存档",
+  "upload_save": "上传存档",
+  "remove_save": "删除存档",
+  "create_save": "创建存档",
+  "no_saves": "没有存档",
+  "delete_confirm": "确认删除存档？",
+  "name": "存档名称",
+  "lastModifiedAt": "最后修改",
+  "size": "大小"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-serverSettings.json b/ui/App/locales/zh-serverSettings.json
new file mode 100644
index 00000000..98f17048
--- /dev/null
+++ b/ui/App/locales/zh-serverSettings.json
@@ -0,0 +1,32 @@
+{
+  "title": "服务器设置",
+  "admins": "管理员",
+  "name": "服务器名称",
+  "description": "服务器描述",
+  "tags": "游戏标签",
+  "max_players": "最大玩家数",
+  "visibility": "可见性",
+  "public": "公开",
+  "lan": "局域网",
+  "hidden": "隐藏",
+  "username": "用户名",
+  "password": "密码",
+  "token": "认证令牌",
+  "game_password": "游戏密码",
+  "require_user_verification": "验证用户身份",
+  "max_upload": "最大上传速度",
+  "max_upload_slots": "上传槽位数",
+  "minimum_latency": "最低延迟",
+  "ignore_player_limit": "返回玩家无视上限",
+  "allow_commands": "允许指令",
+  "auto_pause": "自动暂停",
+  "only_admins_can_pause": "仅管理员可暂停",
+  "autosave_interval": "自动保存间隔",
+  "autosave_slots": "自动保存槽位数",
+  "non_blocking_saving": "非阻塞保存",
+  "afk_autokick_interval": "挂机踢出时间",
+  "require_user_verification_label": "需要验证用户身份",
+  "visibility_label": "服务器可见性",
+  "show_descriptions": "显示说明",
+  "hide_descriptions": "隐藏说明"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-serverVersion.json b/ui/App/locales/zh-serverVersion.json
new file mode 100644
index 00000000..0e4c20a7
--- /dev/null
+++ b/ui/App/locales/zh-serverVersion.json
@@ -0,0 +1,12 @@
+{
+  "title": "服务器版本",
+  "current": "当前版本",
+  "available": "可用版本",
+  "stable": "稳定版",
+  "experimental": "实验版",
+  "install": "安装",
+  "installing": "安装中...",
+  "latestReleases": "最新发布",
+  "fullVersionList": "完整版本列表",
+  "noVersionsAvailable": "没有可用版本"
+}
\ No newline at end of file
diff --git a/ui/App/locales/zh-userManagement.json b/ui/App/locales/zh-userManagement.json
new file mode 100644
index 00000000..6789e886
--- /dev/null
+++ b/ui/App/locales/zh-userManagement.json
@@ -0,0 +1,12 @@
+{
+  "title": "用户管理",
+  "addUser": "添加用户",
+  "username": "用户名",
+  "password": "密码",
+  "role": "角色",
+  "email": "邮箱",
+  "actions": "操作",
+  "confirmDelete": "确认删除用户？",
+  "usernameRequired": "请输入用户名",
+  "passwordRequired": "请输入密码"
+}
\ No newline at end of file

From 88bfc0b3fb4bfb618ed833255e794404e4716949 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 04:39:00 +0000
Subject: [PATCH 089/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E6=A3=80=E6=9F=A5=E6=A8=A1=E7=BB=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20+=20=E6=B8=85=E7=90=86=20LoadMods=20?=
 =?UTF-8?q?=E6=AD=BB=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Layout.jsx: 恢复 FSM 管理区的刷新模组按钮 (fsm_refresh_mods)
- Mods.jsx: 移除 LoadMods 中未使用的共享 auth 属性 (Joey 版本自管 auth)
- zh-layout.json / en.json: 添加 refresh 翻译键
---
 ui/App/components/Layout.jsx  |   5 +
 ui/App/locales/en.json        | 393 +++++++++++++++++-----------------
 ui/App/locales/zh-layout.json |   3 +-
 ui/App/views/Mods/Mods.jsx    |   3 +-
 4 files changed, 205 insertions(+), 199 deletions(-)

diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 30bcae2b..54bc7a92 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -95,6 +95,11 @@ const Layout = ({handleLogout, serverStatus}) => {
                             />
                         </div>
                     </div>
+                    <div className="py-4 px-2 accentuated">
+                        <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
+                            <Button className="w-full mb-1" onClick={() => window.dispatchEvent(new CustomEvent('fsm_refresh_mods'))}>{t("refresh")}</Button>
+                        </div>
+                    </div>
                     <div className="py-4 px-2 accentuated">
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
                             <Button type="danger" className="w-full" onClick={handleLogout}>{t("logout")}</Button>
diff --git a/ui/App/locales/en.json b/ui/App/locales/en.json
index 9280a472..128a56c4 100644
--- a/ui/App/locales/en.json
+++ b/ui/App/locales/en.json
@@ -1,207 +1,208 @@
 {
-    "save": "Save",
-    "upload": "Upload",
-    "saved": "Settings saved.",
-    "create": "Create",
-    "cancel": "Cancel",
-    "confirm": "Confirm",
+  "save": "Save",
+  "upload": "Upload",
+  "saved": "Settings saved.",
+  "create": "Create",
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "name": "Name",
+  "username": "Username",
+  "password": "Password",
+  "logout": "Logout",
+  "install": "Install",
+  "actions": "Actions",
+  "role": "Role",
+  "email": "Email",
+  "change": "Change",
+  "load": "Load",
+  "server_status": "Server Status",
+  "server_management": "Server Management",
+  "FSM_administration": "FSM Administration",
+  "main_title": "Factorio Server Manager",
+  "server_settings": {
+    "title": "Server settings",
+    "admins": "Admins",
     "name": "Name",
+    "description": "Description",
+    "tags": "Tags",
+    "_comment_max_players": "Maximum number of players allowed, admins can join even a full server. 0 means unlimited.",
+    "max_players": "Max players",
+    "_comment_visibility": "Public: Game will be published on the official Factorio matching server. Lan: Game will be broadcast on LAN",
+    "visibility______": {
+      "public_": "Public",
+      "lan_": "Lan"
+    },
+    "visibility": "Visibility",
+    "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
     "username": "Username",
     "password": "Password",
-    "logout": "Logout",
-    "install": "Install",
+    "_comment_token": "Authentication token. May be used instead of 'password' above.",
+    "token": "Token",
+    "game_password": "Game password",
+    "_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
+    "require_user_verification": "Require user verification",
+    "_comment_max_upload_in_kilobytes_per_second": "Optional, default value is 0. 0 means unlimited.",
+    "max_upload_in_kilobytes_per_second": "Max upload in kilobytes per second",
+    "_comment_max_upload_slots": "Optional, default value is 5. 0 means unlimited.",
+    "max_upload_slots": "Max upload slots",
+    "_comment_minimum_latency_in_ticks": "Optional one tick is 16ms in default speed, default value is 0. 0 means no minimum.",
+    "minimum_latency_in_ticks": "Minimum latency in ticks",
+    "_comment_max_heartbeats_per_second": "Network tick rate. Maximum rate game updates packets are sent at before bundling them together. Minimum value is 6, maximum value is 240.",
+    "max_heartbeats_per_second": "Max heartbeats per second",
+    "_comment_ignore_player_limit_for_returning_players": "Players that played on this map already can join even when the max player limit was reached.",
+    "ignore_player_limit_for_returning_players": "Ignore player limit for returning players",
+    "_comment_allow_commands": "Possible values are: true, false and admins-only",
+    "allow_commands": "Allow commands",
+    "_comment_autosave_interval": "Autosave interval in minutes",
+    "autosave_interval": "Autosave interval",
+    "_comment_autosave_slots": "Server autosave slots, it is cycled through when the server autosaves.",
+    "autosave_slots": "Autosave slots",
+    "_comment_afk_autokick_interval": "How many minutes until someone is kicked when doing nothing, 0 for never.",
+    "afk_autokick_interval": "Afk autokick interval",
+    "_comment_auto_pause": "Whether should the server be paused when no players are present.",
+    "auto_pause": "Auto pause",
+    "_comment_auto_pause_when_players_connect": "Whether should the server be paused when someone is connecting to the server.",
+    "auto_pause_when_players_connect": "Auto pause when players connect",
+    "only_admins_can_pause_the_game": "Only admins can pause the game",
+    "_comment_autosave_only_on_server": "Whether autosaves should be saved only on server or also on all connected clients. Default is true.",
+    "autosave_only_on_server": "Autosave only on server",
+    "_comment_non_blocking_saving": "Highly experimental feature, enable only at your own risk of losing your saves. On UNIX systems, server will fork itself to create an autosave. Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.",
+    "non_blocking_saving": "Non blocking saving",
+    "_comment_segment_sizes": "Long network messages are split into segments that are sent over multiple ticks. Their size depends on the number of peers currently connected. Increasing the segment size will increase upload bandwidth requirement for the server and download bandwidth requirement for clients. This setting only affects server outbound messages. Changing these settings can have a negative impact on connection stability for some clients.",
+    "minimum_segment_size": "Minimum segment size",
+    "minimum_segment_size_peer_count": "Minimum segment size peer count",
+    "maximum_segment_size": "Maximum segment size",
+    "maximum_segment_size_peer_count": "Maximum segment size peer count"
+  },
+  "saves": {
+    "create_save": "Create Save",
+    "upload_save": "Upload Save",
+    "title": "Saves",
+    "last_modified": "Last Modified At",
+    "size": "Size",
     "actions": "Actions",
-    "role": "Role",
-    "email": "Email",
-    "change": "Change",
-    "load": "Load",
-    "server_status": "Server Status",
-    "server_management": "Server Management",
-    "FSM_administration": "FSM Administration",
-    "main_title": "Factorio Server Manager",
-    "server_settings": {
-        "title": "Server settings",
-        "admins": "Admins",
-        "name": "Name",
-        "description": "Description",
-        "tags": "Tags",
-        "_comment_max_players": "Maximum number of players allowed, admins can join even a full server. 0 means unlimited.",
-        "max_players": "Max players",
-        "_comment_visibility": "Public: Game will be published on the official Factorio matching server. Lan: Game will be broadcast on LAN",
-        "visibility______": {
-            "public_": "Public",
-            "lan_": "Lan"
-        },
-        "visibility": "Visibility",
-        "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
-        "username": "Username",
-        "password": "Password",
-        "_comment_token": "Authentication token. May be used instead of 'password' above.",
-        "token": "Token",
-        "game_password": "Game password",
-        "_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
-        "require_user_verification": "Require user verification",
-        "_comment_max_upload_in_kilobytes_per_second": "Optional, default value is 0. 0 means unlimited.",
-        "max_upload_in_kilobytes_per_second": "Max upload in kilobytes per second",
-        "_comment_max_upload_slots": "Optional, default value is 5. 0 means unlimited.",
-        "max_upload_slots": "Max upload slots",
-        "_comment_minimum_latency_in_ticks": "Optional one tick is 16ms in default speed, default value is 0. 0 means no minimum.",
-        "minimum_latency_in_ticks": "Minimum latency in ticks",
-        "_comment_max_heartbeats_per_second": "Network tick rate. Maximum rate game updates packets are sent at before bundling them together. Minimum value is 6, maximum value is 240.",
-        "max_heartbeats_per_second": "Max heartbeats per second",
-        "_comment_ignore_player_limit_for_returning_players": "Players that played on this map already can join even when the max player limit was reached.",
-        "ignore_player_limit_for_returning_players": "Ignore player limit for returning players",
-        "_comment_allow_commands": "Possible values are: true, false and admins-only",
-        "allow_commands": "Allow commands",
-        "_comment_autosave_interval": "Autosave interval in minutes",
-        "autosave_interval": "Autosave interval",
-        "_comment_autosave_slots": "Server autosave slots, it is cycled through when the server autosaves.",
-        "autosave_slots": "Autosave slots",
-        "_comment_afk_autokick_interval": "How many minutes until someone is kicked when doing nothing, 0 for never.",
-        "afk_autokick_interval": "Afk autokick interval",
-        "_comment_auto_pause": "Whether should the server be paused when no players are present.",
-        "auto_pause": "Auto pause",
-        "_comment_auto_pause_when_players_connect": "Whether should the server be paused when someone is connecting to the server.",
-        "auto_pause_when_players_connect": "Auto pause when players connect",
-        "only_admins_can_pause_the_game": "Only admins can pause the game",
-        "_comment_autosave_only_on_server": "Whether autosaves should be saved only on server or also on all connected clients. Default is true.",
-        "autosave_only_on_server": "Autosave only on server",
-        "_comment_non_blocking_saving": "Highly experimental feature, enable only at your own risk of losing your saves. On UNIX systems, server will fork itself to create an autosave. Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.",
-        "non_blocking_saving": "Non blocking saving",
-        "_comment_segment_sizes": "Long network messages are split into segments that are sent over multiple ticks. Their size depends on the number of peers currently connected. Increasing the segment size will increase upload bandwidth requirement for the server and download bandwidth requirement for clients. This setting only affects server outbound messages. Changing these settings can have a negative impact on connection stability for some clients.",
-        "minimum_segment_size": "Minimum segment size",
-        "minimum_segment_size_peer_count": "Minimum segment size peer count",
-        "maximum_segment_size": "Maximum segment size",
-        "maximum_segment_size_peer_count": "Maximum segment size peer count"
-    },
-    "saves": {
-        "create_save": "Create Save",
-        "upload_save": "Upload Save",
-        "title": "Saves",
-        "last_modified": "Last Modified At",
-        "size": "Size",
-        "actions": "Actions",
-        "create_new_save_only_when_server_not_running": "Create a new Save is only possible if the Factorio server is not running.",
-        "save_form": {
-            "file_name": "Savefile Name",
-            "save_file_error_message": "Savefile Name is required",
-            "create_save": "Create Save"
-        },
-        "upload_form": {
-            "select_file": "Select File ...",
-            "file_name": "Savefile",
-            "save_file_error_message": "Savefile is required",
-            "upload": "Upload"
-        }
-    },
-    "controls": {
-        "title": "Server Status",
-        "status": "Status",
-        "unknown": "Unknown",
-        "running": "Running",
-        "stopped": "Stopped",
-        "port": "Port",
-        "IP_error_message": "IP is required and must be valid.",
-        "port_error_message": "Port is required within range 1-65535",
-        "save_error_message": "Save is required and must be valid.",
-        "f_version": "Factorio version",
-        "save": "Save",
-        "save&stop": "Save & Stop Server",
-        "kill_server": "Kill Server",
-        "start_server": "Start Server"
+    "create_new_save_only_when_server_not_running": "Create a new Save is only possible if the Factorio server is not running.",
+    "save_form": {
+      "file_name": "Savefile Name",
+      "save_file_error_message": "Savefile Name is required",
+      "create_save": "Create Save"
     },
-    "mods": {
-        "change_mods_while_running_error_message": "Changing mods is disabled while the server is running!",
-        "install_mod": "Install Mod",
-        "upload_mod": "Upload Mod",
-        "load_mods": "Load Mods from Save",
-        "title": "Mods",
-        "delete_all": "Delete all Mods",
-        "update_all": "Update all Mods",
-        "download_all": "Download all Mods",
-        "mod_packs": "Mod packs",
-        "select_file": "Select File ...",
-        "mods_loaded_from_save": "Mods are loaded from save file @@@.",
-        "load_mods_from_save": "Load Mods from Save",
-        "load_confirm_dialog": "Loading the Mods from Save @@@ will remove all currently installed Mods.",
-        "add_modpack_with_current_mods": "Add ModPack with current installed Mods",
-        "add_mod": {
-            "loading_mod_list": "Loading List of Mods from",
-            "version": "Version",
-            "compatibility": "Compatibility"
-        },
-        "mod_list": {
-            "enabled": "Enabled",
-            "compatibility": "Compatibility",
-            "mod_version": "Mod Version",
-            "factorio_version": "Factorio Version"
-        },
-        "mod_pack": {
-            "load_modpack": "Load ModPack",
-            "load_confirm_dialog": "Loading the ModPack @@@ will remove all installed Mods."
-        },
-        "sync_from_save": "Sync Mods from Save",
-        "sync_started": "Sync started...",
-        "sync_downloading": "Downloading",
-        "sync_done": "Sync complete",
-        "sync_error": "Sync error",
-        "sync_warning_vanilla": "Save was created without gameplay mods. Mods may have been added later — sync may be incomplete.",
-        "status_downloaded": "Downloaded",
-        "status_already_installed": "Already installed",
-        "status_builtin": "Built-in / DLC",
-        "status_not_found": "Not found on portal",
-        "status_downloading": "Downloading..."
-    },
-    "login": {
-        "login_failed_message": "Login failed. Username or Password wrong.",
-        "title": "Login",
-        "login": "Login",
-        "username_error_message": "Username is required",
-        "password_error_message": "Password is required",
-        "sign_in": "Sign In",
-        "factorio_login_error_message": "Given username or email and password do not match any account."
-    },
-    "console": {
-        "title": "Console",
-        "error": "The console is not available, because Factorio is not running."
-    },
-    "logs": {
-        "title": "Logs"
+    "upload_form": {
+      "select_file": "Select File ...",
+      "file_name": "Savefile",
+      "save_file_error_message": "Savefile is required",
+      "upload": "Upload"
+    }
+  },
+  "controls": {
+    "title": "Server Status",
+    "status": "Status",
+    "unknown": "Unknown",
+    "running": "Running",
+    "stopped": "Stopped",
+    "port": "Port",
+    "IP_error_message": "IP is required and must be valid.",
+    "port_error_message": "Port is required within range 1-65535",
+    "save_error_message": "Save is required and must be valid.",
+    "f_version": "Factorio version",
+    "save": "Save",
+    "save&stop": "Save & Stop Server",
+    "kill_server": "Kill Server",
+    "start_server": "Start Server"
+  },
+  "mods": {
+    "change_mods_while_running_error_message": "Changing mods is disabled while the server is running!",
+    "install_mod": "Install Mod",
+    "upload_mod": "Upload Mod",
+    "load_mods": "Load Mods from Save",
+    "title": "Mods",
+    "delete_all": "Delete all Mods",
+    "update_all": "Update all Mods",
+    "download_all": "Download all Mods",
+    "mod_packs": "Mod packs",
+    "select_file": "Select File ...",
+    "mods_loaded_from_save": "Mods are loaded from save file @@@.",
+    "load_mods_from_save": "Load Mods from Save",
+    "load_confirm_dialog": "Loading the Mods from Save @@@ will remove all currently installed Mods.",
+    "add_modpack_with_current_mods": "Add ModPack with current installed Mods",
+    "add_mod": {
+      "loading_mod_list": "Loading List of Mods from",
+      "version": "Version",
+      "compatibility": "Compatibility"
     },
-    "help": {
-        "title": "Help",
-        "fsm": "Factorio Server Manager",
-        "fsm_content": "The Factorio Server Manager (FSM) is an open source project and is not affiliated to the game Factorio or Wube Software.",
-        "bugs_help": "Bugs and Help",
-        "bugs_help_content": "Please use the <0>GitHub repository</0> to report bugs or seek for help.",
-        "helpful_resources": "Helpful Resources",
-        "factorio_link_text": "Official Factorio Wiki about Multiplayer"
+    "mod_list": {
+      "enabled": "Enabled",
+      "compatibility": "Compatibility",
+      "mod_version": "Mod Version",
+      "factorio_version": "Factorio Version"
     },
-    "users": {
-        "title": "Users",
-        "user_list": "List of Users",
-        "change_password": {
-            "title": "Change Password",
-            "update_successful": "Password changed",
-            "old_password": "Old Password",
-            "old_password_error": "Old Password is required",
-            "new_password": "New Password",
-            "new_password_error": "New Password is required",
-            "new_password_confirmation": "New Password Confirmation",
-            "new_password_confirmation_error": "New Password Confirmation is required"
-        },
-        "create_user": {
-            "title": "Create User",
-            "username_error": "Username is required",
-            "role_error": "Role is required",
-            "email_error": "Email is required",
-            "password_error": "Password is required",
-            "password_confirmation": "Password Confirmation",
-            "password_confirmation_error": "Password Confirmation is required and must match the Password"
-        }
+    "mod_pack": {
+      "load_modpack": "Load ModPack",
+      "load_confirm_dialog": "Loading the ModPack @@@ will remove all installed Mods."
     },
-    "game_settings": {
-        "title": "Game Settings"
+    "sync_from_save": "Sync Mods from Save",
+    "sync_started": "Sync started...",
+    "sync_downloading": "Downloading",
+    "sync_done": "Sync complete",
+    "sync_error": "Sync error",
+    "sync_warning_vanilla": "Save was created without gameplay mods. Mods may have been added later \u2014 sync may be incomplete.",
+    "status_downloaded": "Downloaded",
+    "status_already_installed": "Already installed",
+    "status_builtin": "Built-in / DLC",
+    "status_not_found": "Not found on portal",
+    "status_downloading": "Downloading..."
+  },
+  "login": {
+    "login_failed_message": "Login failed. Username or Password wrong.",
+    "title": "Login",
+    "login": "Login",
+    "username_error_message": "Username is required",
+    "password_error_message": "Password is required",
+    "sign_in": "Sign In",
+    "factorio_login_error_message": "Given username or email and password do not match any account."
+  },
+  "console": {
+    "title": "Console",
+    "error": "The console is not available, because Factorio is not running."
+  },
+  "logs": {
+    "title": "Logs"
+  },
+  "help": {
+    "title": "Help",
+    "fsm": "Factorio Server Manager",
+    "fsm_content": "The Factorio Server Manager (FSM) is an open source project and is not affiliated to the game Factorio or Wube Software.",
+    "bugs_help": "Bugs and Help",
+    "bugs_help_content": "Please use the <0>GitHub repository</0> to report bugs or seek for help.",
+    "helpful_resources": "Helpful Resources",
+    "factorio_link_text": "Official Factorio Wiki about Multiplayer"
+  },
+  "users": {
+    "title": "Users",
+    "user_list": "List of Users",
+    "change_password": {
+      "title": "Change Password",
+      "update_successful": "Password changed",
+      "old_password": "Old Password",
+      "old_password_error": "Old Password is required",
+      "new_password": "New Password",
+      "new_password_error": "New Password is required",
+      "new_password_confirmation": "New Password Confirmation",
+      "new_password_confirmation_error": "New Password Confirmation is required"
     },
-    "lang": "Language"
+    "create_user": {
+      "title": "Create User",
+      "username_error": "Username is required",
+      "role_error": "Role is required",
+      "email_error": "Email is required",
+      "password_error": "Password is required",
+      "password_confirmation": "Password Confirmation",
+      "password_confirmation_error": "Password Confirmation is required and must match the Password"
+    }
+  },
+  "game_settings": {
+    "title": "Game Settings"
+  },
+  "lang": "Language",
+  "refresh": "Refresh Mods"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-layout.json b/ui/App/locales/zh-layout.json
index f04237c7..1d606408 100644
--- a/ui/App/locales/zh-layout.json
+++ b/ui/App/locales/zh-layout.json
@@ -5,5 +5,6 @@
   "FSM_administration": "FSM 管理",
   "lang": "语言",
   "logout": "退出登录",
-  "UNKNOWN": "未知"
+  "UNKNOWN": "未知",
+  "refresh": "刷新模组列表"
 }
\ No newline at end of file
diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 2ff85018..d04a1eb8 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -160,8 +160,7 @@ const Mods = ({serverStatus}) => {
                                 <UploadMod refetchInstalledMods={fetchInstalledMods}/>
                             </Tab>
                             <Tab title={t('loadModsFromSave')}>
-                                <LoadMods refreshMods={fetchInstalledMods}
-                                          isFactorioAuthenticated={isFactorioAuthenticated} setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
+                                <LoadMods refreshMods={fetchInstalledMods} />
                             </Tab>
                         </TabControl>
                     </div>

From b222041462b80cec1448fc827ab176642c25b49f Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 07:21:29 +0000
Subject: [PATCH 090/112] =?UTF-8?q?=E7=BF=BB=E8=AF=91:=20=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8=209=20=E4=B8=AA=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=BF=BB=E8=AF=91=E9=94=AE=20(0=20missing)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- zh-layout.json: 12 keys (main_title, logout, refresh...)
- zh-controls.json: 22 keys (RUNNING, STOPPED, saveStopServer...)
- zh-console.json: 6 keys
- zh-logs.json: 4 keys
- zh-mods.json: 49 keys (confirmDeleteAllMods, loadingModList...)
- zh-saves.json: 16 keys (createSave, uploadSave...)
- zh-serverSettings.json: 32 keys (showTranslation, hideTranslation...)
- zh-serverVersion.json: 24 keys (installSuccess, upToDate, fetchFailed...)
- zh-userManagement.json: 24 keys (changePassword, passwordMismatch...)
- zh.json: 新增 refresh 键
- en.json: 补全 Layout.jsx 引用的嵌套键
---
 ui/App/locales/en.json                |  5 ++-
 ui/App/locales/zh-console.json        |  4 ++-
 ui/App/locales/zh-controls.json       | 34 +++++++++----------
 ui/App/locales/zh-layout.json         |  6 +++-
 ui/App/locales/zh-logs.json           |  1 +
 ui/App/locales/zh-mods.json           | 48 +++++++++++++++++----------
 ui/App/locales/zh-saves.json          | 22 +++++++-----
 ui/App/locales/zh-serverSettings.json | 12 ++++---
 ui/App/locales/zh-serverVersion.json  | 20 +++++++++--
 ui/App/locales/zh-userManagement.json | 24 +++++++++++---
 ui/App/locales/zh.json                |  3 +-
 11 files changed, 117 insertions(+), 62 deletions(-)

diff --git a/ui/App/locales/en.json b/ui/App/locales/en.json
index 128a56c4..d05cccf2 100644
--- a/ui/App/locales/en.json
+++ b/ui/App/locales/en.json
@@ -204,5 +204,8 @@
     "title": "Game Settings"
   },
   "lang": "Language",
-  "refresh": "Refresh Mods"
+  "refresh": "Refresh Mods",
+  "serverVersion": {
+    "title": "Server Version"
+  }
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-console.json b/ui/App/locales/zh-console.json
index 02382cb5..9130943a 100644
--- a/ui/App/locales/zh-console.json
+++ b/ui/App/locales/zh-console.json
@@ -1,6 +1,8 @@
 {
   "title": "控制台",
+  "console": "控制台",
   "send": "发送",
-  "command": "命令",
+  "command": "指令",
+  "consoleNotAvailable": "控制台不可用（服务器未运行）",
   "placeholder": "输入指令..."
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-controls.json b/ui/App/locales/zh-controls.json
index 6f42cffb..164965af 100644
--- a/ui/App/locales/zh-controls.json
+++ b/ui/App/locales/zh-controls.json
@@ -1,28 +1,24 @@
 {
   "title": "控制面板",
-  "unknown": "未知",
+  "serverStatus": "服务器状态",
+  "status": "状态",
+  "RUNNING": "运行中",
+  "STOPPED": "已停止",
   "running": "运行中",
   "stopped": "已停止",
+  "unknown": "未知",
   "factorioVersion": "游戏版本",
-  "serverRunning": "服务器运行中",
-  "serverStopped": "服务器已停止",
-  "start": "启动",
-  "stop": "停止服务器",
-  "kill": "强制终止",
-  "save_game": "保存游戏",
   "ip": "IP 地址",
   "port": "端口",
-  "saveFile": "存档",
-  "loadLatest": "加载最新",
-  "factorioInstallation": "Factorio 安装",
-  "installedVersion": "已安装版本",
-  "availableVersions": "可用版本",
-  "downloadInstall": "下载并安装",
-  "removeInstallation": "卸载",
-  "serverStatus": "服务器状态",
-  "status": "状态",
-  "RUNNING": "运行中",
-  "STOPPED": "已停止",
   "save": "存档",
-  "UNKNOWN": "未知"
+  "saveFile": "存档文件",
+  "saveRequired": "请选择存档",
+  "ipRequired": "请输入 IP 地址",
+  "portRequired": "请输入端口",
+  "killServer": "强制终止",
+  "startServer": "启动服务器",
+  "stopServer": "停止服务器",
+  "saveStopServer": "保存并停止",
+  "saveSettings": "保存设置",
+  "settingsSaved": "设置已保存"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-layout.json b/ui/App/locales/zh-layout.json
index 1d606408..a3c5ca51 100644
--- a/ui/App/locales/zh-layout.json
+++ b/ui/App/locales/zh-layout.json
@@ -6,5 +6,9 @@
   "lang": "语言",
   "logout": "退出登录",
   "UNKNOWN": "未知",
-  "refresh": "刷新模组列表"
+  "refresh": "刷新模组列表",
+  "appTitle": "Factorio Server Manager",
+  "helpBugsAndHelp": "反馈 BUG & 获取帮助",
+  "helpResources": "相关资源",
+  "helpTitle": "帮助"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-logs.json b/ui/App/locales/zh-logs.json
index 6034ad3d..812ccc1a 100644
--- a/ui/App/locales/zh-logs.json
+++ b/ui/App/locales/zh-logs.json
@@ -1,5 +1,6 @@
 {
   "title": "日志",
+  "logs": "日志",
   "refresh": "刷新",
   "autoScroll": "自动滚动"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-mods.json b/ui/App/locales/zh-mods.json
index 147b50e3..b0396529 100644
--- a/ui/App/locales/zh-mods.json
+++ b/ui/App/locales/zh-mods.json
@@ -1,36 +1,48 @@
 {
   "title": "模组管理",
-  "installed": "已安装模组",
+  "mods": "模组",
+  "installed": "已安装",
   "portal": "模组门户",
   "add": "添加模组",
-  "load": "从存档加载",
+  "load": "加载",
   "delete_all": "删除全部",
   "update_all": "更新全部",
-  "install_mods": "安装模组",
-  "loading_mods": "加载模组列表...",
-  "factorioVersion": "游戏版本",
-  "enabled": "启用",
-  "compatibility": "兼容性",
-  "mod_version": "模组版本",
-  "file_size": "文件大小",
+  "install": "安装",
+  "upload": "上传",
+  "save": "保存",
+  "cancel": "取消",
+  "create": "创建",
+  "name": "名称",
+  "actions": "操作",
+  "search": "搜索...",
+  "logout": "退出登录",
   "updateAllMods": "更新全部模组",
   "downloadAllMods": "下载全部模组",
   "deleteAllMods": "删除全部模组",
-  "confirmDeleteAll": "确认删除所有模组？此操作不可撤销。",
-  "noModsInstalled": "没有安装模组",
-  "installMods": "安装模组",
-  "loadingMods": "加载模组列表...",
-  "installedTab": "已安装",
-  "addModTab": "添加模组",
-  "loadModsTab": "加载模组",
-  "modPacksTab": "模组包",
   "modPacks": "模组包",
   "createModPack": "创建模组包",
   "modPortal": "模组门户",
   "installMod": "安装模组",
   "uploadMod": "上传模组",
   "loadModsFromSave": "从存档加载",
-  "search": "搜索...",
+  "installedTab": "已安装",
+  "addModTab": "添加模组",
+  "loadModsTab": "加载模组",
+  "modPacksTab": "模组包",
+  "selectModFile": "选择模组文件",
+  "selectVersion": "选择版本",
+  "version": "版本",
+  "loadModsTitle": "从存档加载模组",
+  "deleteExistingMods": "删除已有模组",
+  "loadingModList": "加载模组列表...",
+  "changingModsDisabled": "模组修改已禁用（服务器运行中）",
+  "confirmDeleteAllMods": "确认删除所有模组？此操作不可撤销。",
+  "noModsInstalled": "没有安装模组",
+  "factorioVersion": "游戏版本",
+  "enabled": "启用",
+  "compatibility": "兼容性",
+  "mod_version": "模组版本",
+  "file_size": "文件大小",
   "Name": "模组名称",
   "Enabled": "启用",
   "Compatibility": "兼容性",
diff --git a/ui/App/locales/zh-saves.json b/ui/App/locales/zh-saves.json
index cdee8aa3..7910a342 100644
--- a/ui/App/locales/zh-saves.json
+++ b/ui/App/locales/zh-saves.json
@@ -1,12 +1,18 @@
 {
   "title": "存档管理",
-  "dl_save": "下载存档",
-  "upload_save": "上传存档",
-  "remove_save": "删除存档",
-  "create_save": "创建存档",
-  "no_saves": "没有存档",
-  "delete_confirm": "确认删除存档？",
-  "name": "存档名称",
+  "saves": "存档",
+  "actions": "操作",
+  "name": "名称",
   "lastModifiedAt": "最后修改",
-  "size": "大小"
+  "size": "大小",
+  "upload": "上传",
+  "uploadSave": "上传存档",
+  "createSave": "创建存档",
+  "createSaveDisabled": "创建存档已禁用（服务器运行中）",
+  "saveFile": "存档文件",
+  "savefileName": "存档文件名",
+  "saveNameRequired": "请输入存档名称",
+  "selectFile": "选择文件",
+  "no_saves": "没有存档",
+  "delete_confirm": "确认删除存档？"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-serverSettings.json b/ui/App/locales/zh-serverSettings.json
index 98f17048..6d4cee48 100644
--- a/ui/App/locales/zh-serverSettings.json
+++ b/ui/App/locales/zh-serverSettings.json
@@ -1,5 +1,11 @@
 {
   "title": "服务器设置",
+  "serverSettings": "服务器设置",
+  "gameSettings": "游戏设置",
+  "saveSettings": "保存设置",
+  "settingsSaved": "设置已保存",
+  "showTranslation": "显示说明",
+  "hideTranslation": "隐藏说明",
   "admins": "管理员",
   "name": "服务器名称",
   "description": "服务器描述",
@@ -24,9 +30,5 @@
   "autosave_interval": "自动保存间隔",
   "autosave_slots": "自动保存槽位数",
   "non_blocking_saving": "非阻塞保存",
-  "afk_autokick_interval": "挂机踢出时间",
-  "require_user_verification_label": "需要验证用户身份",
-  "visibility_label": "服务器可见性",
-  "show_descriptions": "显示说明",
-  "hide_descriptions": "隐藏说明"
+  "afk_autokick_interval": "挂机踢出时间"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-serverVersion.json b/ui/App/locales/zh-serverVersion.json
index 0e4c20a7..768d2702 100644
--- a/ui/App/locales/zh-serverVersion.json
+++ b/ui/App/locales/zh-serverVersion.json
@@ -1,12 +1,26 @@
 {
   "title": "服务器版本",
+  "serverVersion": "服务器版本",
+  "installedVersion": "已安装版本",
+  "availableVersions": "可用版本",
   "current": "当前版本",
-  "available": "可用版本",
   "stable": "稳定版",
   "experimental": "实验版",
+  "latest": "最新",
+  "showLatest": "显示最新发布",
+  "showAll": "显示全部版本",
+  "unknown": "未知",
+  "upToDate": "已是最新",
+  "updateAvailable": "有新版本可用",
+  "updateTo": "更新到",
   "install": "安装",
   "installing": "安装中...",
-  "latestReleases": "最新发布",
-  "fullVersionList": "完整版本列表",
+  "downloadProgress": "下载进度",
+  "installSuccess": "安装成功",
+  "installFailed": "安装失败",
+  "checkingVersion": "检查版本...",
+  "fetchFailed": "获取版本列表失败",
+  "noInternet": "无法连接 Factorio 服务器",
+  "serverMustBeStopped": "请先停止服务器",
   "noVersionsAvailable": "没有可用版本"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-userManagement.json b/ui/App/locales/zh-userManagement.json
index 6789e886..fdcdcf04 100644
--- a/ui/App/locales/zh-userManagement.json
+++ b/ui/App/locales/zh-userManagement.json
@@ -1,12 +1,26 @@
 {
   "title": "用户管理",
-  "addUser": "添加用户",
-  "username": "用户名",
-  "password": "密码",
+  "name": "用户名",
   "role": "角色",
   "email": "邮箱",
   "actions": "操作",
-  "confirmDelete": "确认删除用户？",
+  "listOfUsers": "用户列表",
+  "createUser": "添加用户",
+  "changePassword": "修改密码",
+  "change": "修改",
+  "save": "保存",
+  "remove": "删除",
+  "username": "用户名",
+  "password": "密码",
   "usernameRequired": "请输入用户名",
-  "passwordRequired": "请输入密码"
+  "passwordRequired": "请输入密码",
+  "emailRequired": "请输入邮箱",
+  "roleRequired": "请选择角色",
+  "passwordConfirmation": "确认密码",
+  "passwordMismatch": "两次密码不一致",
+  "passwordChanged": "密码已修改",
+  "newPassword": "新密码",
+  "newPasswordConfirmation": "确认新密码",
+  "oldPassword": "旧密码",
+  "confirmDelete": "确认删除用户？"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh.json b/ui/App/locales/zh.json
index 0b3009c0..ee89a6c3 100644
--- a/ui/App/locales/zh.json
+++ b/ui/App/locales/zh.json
@@ -233,5 +233,6 @@
   "installedTab": "已安装",
   "addModTab": "添加模组",
   "loadModsTab": "加载模组",
-  "modPacksTab": "模组包"
+  "modPacksTab": "模组包",
+  "refresh": "刷新"
 }
\ No newline at end of file

From 7a9985df6dc33d05e6e9ce3447945627a1bceb7d Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 07:29:20 +0000
Subject: [PATCH 091/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E9=A1=B5=E9=BB=91=E5=B1=8F=20=E2=80=94=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=AF=8F=202=20=E7=A7=92=20153=20=E6=AC=A1=20portal?=
 =?UTF-8?q?=20API=20=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因: Mod 组件 useEffect([mod]) 每次轮询都重新检查更新，导致
153 个 portal.info() 并发请求 + addUpdatableMod 连锁状态更新
→ React 组件树崩溃 → 黑屏。

- Mod.jsx: portal.info 仅首次挂载检查一次 (checked flag)
- Mods.jsx: addUpdatableMod 去重，避免重复添加触发多余渲染
---
 ui/App/views/Mods/Mods.jsx           | 5 ++++-
 ui/App/views/Mods/components/Mod.jsx | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index d04a1eb8..fb0372ae 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -34,7 +34,10 @@ const Mods = ({serverStatus}) => {
     const [authChecked, setAuthChecked] = useState(false);
 
     const addUpdatableMod = mod => {
-        setUpdatableMods(mods => [...mods, mod])
+        setUpdatableMods(mods => {
+            if (mods.some(m => m.modName === mod.modName)) return mods;
+            return [...mods, mod];
+        });
     };
 
     const fetchInstalledMods = () => {
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 94352045..80893af7 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -16,9 +16,11 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
 
     const [newVersion, setNewVersion] = useState(null)
     const [icon, setIcon] = useState(faArrowCircleUp)
+    const [checked, setChecked] = useState(false)
 
     useEffect(() => {
-        if (!disabled) {
+        if (!disabled && !checked) {
+            setChecked(true);
             (async () => {
                 try {
                     const data = await modsResource.portal.info(mod.name)

From 848d983c8141062d81d719c9067910f0b3a12fc3 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 07:34:31 +0000
Subject: [PATCH 092/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20React=20#31=20?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=20=E2=80=94=20axios=20=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=99=A8=20Object=20=E6=B8=B2=E6=9F=93=20+=20404=20=E9=9D=99?=
 =?UTF-8?q?=E9=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因: portal API 404 返回 {message:...} 对象，axios 拦截器将其传入
window.flash()，Flash 组件渲染 Object → React error #31 → 全局黑屏。

- 404 响应静默跳过（portal 模组不存在是预期行为）
- 对象响应安全转为字符串（message 字段或 JSON.stringify）
- 仅非预期错误触发 flash 提示
---
 ui/api/client.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/api/client.js b/ui/api/client.js
index b99da358..572d7542 100644
--- a/ui/api/client.js
+++ b/ui/api/client.js
@@ -12,15 +12,24 @@ client.interceptors.response.use(res => res, err => {
         if (window.flash) window.flash("Network error or request timeout", "red");
         return Promise.reject(err);
     }
-    if(err.response.status === 502) {
+    const status = err.response.status;
+    if (status === 502) {
         if (window.flash) window.flash("Service not available", "red");
-    } else if (err.response.status === 401) {
+    } else if (status === 401) {
         if (window.location.pathname !== '/login') {
             window.location.replace('/login');
             return new Promise(() => {});
         }
+    } else if (status === 404) {
+        // 404 is expected for portal "mod not found" — don't flash
     } else {
-        if (window.flash) window.flash(err.response.data, "red");
+        if (window.flash) {
+            const data = err.response.data;
+            const msg = typeof data === 'string' ? data
+                : (data && data.message) ? data.message
+                : JSON.stringify(data || '');
+            window.flash(msg, "red");
+        }
     }
     return Promise.reject(err);
 });

From 6a3725dfa534796798622f66cc75eb72282371ab Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 07:45:53 +0000
Subject: [PATCH 093/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20=E9=81=B5?=
 =?UTF-8?q?=E5=BE=AA=E4=B8=8A=E6=B8=B8=E8=A7=84=E8=8C=83=20=E2=80=94=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=20CHANGELOG.md=20+=20ROADMAP.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- CHANGELOG: 新增 v0.12.0 条目，记录 50+ 项变更 (Added/Changed/Fixed/Removed)
- ROADMAP: 标记已完成项 (版本管理器/2.1兼容/i18n中文/并发下载/存档解析...)
---
 CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 ROADMAP.md   | 12 +++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73bca72a..1c7eb60b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,53 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.12.0] - TBD
+
+### Added
+- Server version manager: download, update, and downgrade Factorio server from UI - Thanks to @BAYUNZIYUE
+  - Full version list from updater.factorio.com (stable/experimental)
+  - Async install with WebSocket real-time progress
+- Mod sync from save: read mod list from level.dat0 with exact versions - Thanks to @joey00797-cell
+  - Selective sync with checkboxes
+  - WebSocket download progress for each mod
+- DLC mods (elevated-rails, quality, space-age) detected from mod-list.json
+  - Grouped in UI with single toggle - Thanks to @joey00797-cell
+- i18n internationalization via i18next framework with zh-CN translations - Thanks to @joey00797-cell, @BAYUNZIYUE
+- Language switcher dialog (EN / RU / 中文)
+- 5-thread concurrent mod downloading with per-worker progress bars
+- Upload mod multi-file support with progress
+- Mod list auto-refresh every 2s with background-tab skip
+- TabControl onActivate support for lazy portal list loading
+- Server settings Chinese descriptions toggle (27 items based on Factorio Wiki)
+- File size display in mod list
+- IP/port memory in Controls page (localStorage)
+- Cache mod portal list for 1 hour (~60x speedup)
+- Token-based Factorio authentication support
+
+### Changed
+- Factorio version display uniformly prefixed with `>=`
+- Mod portal releases compatibility now uses Factorio-aware GEC (same major.minor required)
+- DepOp no longer hardcoded to `>=` — reflects actual dependency operator
+- Portal "Mod not found" returns 404 JSON instead of 500 error
+- File lock timeout increased to 30s to prevent deadlocks
+- Docker build cache for go mod download and npm install
+
+### Fixed
+- Factorio 2.1 compatibility: mods with different minor version correctly marked incompatible
+- save.go: Factorio 2.0 save header parsing (readFromV2, 192-line complete rewrite)
+- mod_modInfo.go: base dependency version override (old `base >= 0.18` no longer overwrites info.json factorio_version: 2.0)
+- mod_modInfo.go: dependency parsing bounds check (prevents crash on malformed deps)
+- Corrupted mod zip files gracefully skipped instead of crashing FSM
+- 401 auto-redirect to login page (replace instead of push state)
+- React #31 crash: axios interceptor no longer passes Object to Flash component
+- Mod page black screen: portal API calls limited to initial mount (was 153 calls every 2s)
+- Auth gate prevents login form flash (authChecked before tab render)
+- Updater API stable tag compatibility for 2.1.7 detection
+- save.go: fmt.Errorf escaped percent signs fixed (20+ instances)
+
+### Removed
+- removeAll on Docker volume replaced with proper mod directory clear - Thanks to @joey00797-cell
+
 ## [0.11.0] - TBD
 ### Changed
 - Configuration environment variables are now uppercase and prefixed with FSM
diff --git a/ROADMAP.md b/ROADMAP.md
index c2adce03..ce5e317b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -11,8 +11,17 @@
 - [x] DLC mods auto-detected and grouped in UI with single toggle
 - [x] DLC mods visible in installed mods list with enable/disable
 - [x] Server start blocked while mod sync is in progress
-- [x] i18n support (EN/RU)
+- [x] i18n support (EN/RU/zh-CN)
 - [x] Token-based authentication on factorio.com
+- [x] Server version manager (download/update/downgrade Factorio from UI)
+- [x] 5-thread concurrent mod downloading with progress bars
+- [x] Upload mod multi-file support
+- [x] Mod portal list caching (1 hour)
+- [x] Factorio 2.1 compatibility (GEC version checking)
+- [x] Factorio 2.0 save header parser (readFromV2)
+- [x] Server settings Chinese descriptions (Factorio Wiki based)
+- [x] Auth gate preventing login form flash
+- [x] 401 auto-redirect to login page
 
 ## 🚧 Planned
 
@@ -20,6 +29,7 @@
 - [ ] Auto-resolve mod dependencies when creating a new save
 - [ ] Portal link icon next to each mod in the list
 - [ ] Row highlight on hover in mod list
+- [ ] Batch update all compatible mods for current server version
 
 ### Authentication
 - [ ] Show logged-in username on mod portal tab

From 357d8e9a8e094f52ab0f6ba5467f7d08f9b9629f Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:24:05 +0000
Subject: [PATCH 094/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20LoadMods=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=88=B6=E7=BB=84=E4=BB=B6=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E7=9A=84=20Factorio=20=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

合并后 Joey 的 LoadMods 自管 isFactorioAuthenticated 状态，
每次切换标签都重查 API，导致加载存档标签重复要求登录。
改为接收父组件共享的认证状态，与 AddMod 标签保持一致。
---
 ui/App/views/Mods/Mods.jsx                | 4 +++-
 ui/App/views/Mods/components/LoadMods.jsx | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index fb0372ae..45e4a01c 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -163,7 +163,9 @@ const Mods = ({serverStatus}) => {
                                 <UploadMod refetchInstalledMods={fetchInstalledMods}/>
                             </Tab>
                             <Tab title={t('loadModsFromSave')}>
-                                <LoadMods refreshMods={fetchInstalledMods} />
+                                <LoadMods refreshMods={fetchInstalledMods}
+                                          isFactorioAuthenticated={isFactorioAuthenticated}
+                                          setIsFactorioAuthenticated={setIsFactorioAuthenticated} />
                             </Tab>
                         </TabControl>
                     </div>
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 86936e08..aba0862d 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -31,14 +31,13 @@ const STATUS_TEXT = {
     not_found:     "Not found on portal",
 };
 
-const LoadMods = ({refreshMods}) => {
+const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
     const {t} = useTranslation();
     const [saves, setSaves] = useState([]);
     const [selectedSave, setSelectedSave] = useState("");
     const [isLoading, setIsLoading] = useState(false);
     const [isSyncing, setIsSyncing] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
-    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
     const [modRows, setModRows] = useState([]);
     const [checkedMods, setCheckedMods] = useState({});
     const [syncError, setSyncError] = useState(null);
@@ -47,7 +46,9 @@ const LoadMods = ({refreshMods}) => {
 
     useEffect(() => {
         (async () => {
-            setIsFactorioAuthenticated(await modsResource.portal.status());
+            if (!isFactorioAuthenticated) {
+                setIsFactorioAuthenticated(await modsResource.portal.status());
+            }
             const s = await savesResource.list();
             setSaves(s);
             if (s.length > 0) {

From c9225b516ec0a80aaa949cf7e22a0c462ec9bfa4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:27:26 +0000
Subject: [PATCH 095/112] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20CHANGELOG=20?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E5=85=B1=E4=BA=AB=E8=AE=A4=E8=AF=81=E6=80=81?=
 =?UTF-8?q?=E9=80=80=E5=8C=96=E4=BF=AE=E5=A4=8D=E5=8F=8A=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

合并 Joey develop 后 LoadMods 自管认证状态覆盖了我们的共享模式。
PR 提交时需向 Joey 说明此设计决策。
---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c7eb60b..f336092f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - React #31 crash: axios interceptor no longer passes Object to Flash component
 - Mod page black screen: portal API calls limited to initial mount (was 153 calls every 2s)
 - Auth gate prevents login form flash (authChecked before tab render)
+- Shared Factorio auth state restored across all mod tabs (AddMod + LoadMods) —
+  parent component checks portal login once, children receive via props;
+  merged Joey's LoadMods rewrite regressed this with local state — fixed via prop drilling
 - Updater API stable tag compatibility for 2.1.7 detection
 - save.go: fmt.Errorf escaped percent signs fixed (20+ instances)
 

From be455d5e43a08fbbdfb0c29c4dedcd64f9012692 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:31:17 +0000
Subject: [PATCH 096/112] =?UTF-8?q?=E7=BF=BB=E8=AF=91:=20ModList=20?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=20+=20LoadMods=20=E5=85=A8=E9=83=A8=E7=A1=AC?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ModList.jsx: 表头使用 t() 调用 + 新增文件大小列
- LoadMods.jsx: STATUS_TEXT/按钮/标签/错误信息全部 t() 调用
- zh-mods.json: +24 翻译键 (File Size/readModsFromSave/selectMissing...)
---
 ui/App/locales/zh-mods.json               | 24 +++++++++++--
 ui/App/views/Mods/components/LoadMods.jsx | 41 ++++++++++++-----------
 ui/App/views/Mods/components/ModList.jsx  | 15 +++++----
 3 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/ui/App/locales/zh-mods.json b/ui/App/locales/zh-mods.json
index b0396529..6a86592f 100644
--- a/ui/App/locales/zh-mods.json
+++ b/ui/App/locales/zh-mods.json
@@ -1,7 +1,7 @@
 {
   "title": "模组管理",
   "mods": "模组",
-  "installed": "已安装",
+  "installed": "已安装版本",
   "portal": "模组门户",
   "add": "添加模组",
   "load": "加载",
@@ -9,7 +9,7 @@
   "update_all": "更新全部",
   "install": "安装",
   "upload": "上传",
-  "save": "保存",
+  "save": "存档",
   "cancel": "取消",
   "create": "创建",
   "name": "名称",
@@ -47,5 +47,23 @@
   "Enabled": "启用",
   "Compatibility": "兼容性",
   "Mod Version": "模组版本",
-  "Factorio Version": "Factorio 版本"
+  "Factorio Version": "Factorio 版本",
+  "Space Age DLC": "太空时代 DLC",
+  "File Size": "文件大小",
+  "readModsFromSave": "从存档读取模组",
+  "selectMissing": "选择缺失",
+  "clearSelection": "清除选择",
+  "syncSelected": "同步选中",
+  "downloadingStatus": "下载中",
+  "downloadedStatus": "已下载",
+  "installedStatus": "已安装",
+  "wrongVersionStatus": "版本不匹配",
+  "missingStatus": "缺失",
+  "builtinStatus": "内置/DLC",
+  "notFoundStatus": "门户未找到",
+  "failedToReadSave": "读取存档失败",
+  "failedToStartSync": "启动同步失败",
+  "mod": "模组",
+  "required": "需要版本",
+  "status": "状态"
 }
\ No newline at end of file
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index aba0862d..4d3ff675 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -3,10 +3,11 @@ import savesResource from "../../../../api/resources/saves";
 import Label from "../../../components/Label";
 import Button from "../../../components/Button";
 import modsResource from "../../../../api/resources/mods";
+import {useTranslation} from "react-i18next";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
 import socket from "../../../../api/socket";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
-import {useTranslation} from "react-i18next";
+
 import {faSpinner, faCheck, faTimes, faMinusCircle, faExternalLinkAlt} from "@fortawesome/free-solid-svg-icons";
 
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
@@ -22,13 +23,13 @@ const STATUS_ICON = {
 };
 
 const STATUS_TEXT = {
-    downloading:   "Downloading...",
-    downloaded:    "Downloaded",
-    installed:     "Installed",
-    wrong_version: "Wrong version",
-    missing:       "Missing",
-    builtin:       "Built-in / DLC",
-    not_found:     "Not found on portal",
+    downloading:   t("downloadingStatus"),
+    downloaded:    t("downloadedStatus"),
+    installed:     t("installedStatus"),
+    wrong_version: t("wrongVersionStatus"),
+    missing:       t("missingStatus"),
+    builtin:       t("builtinStatus"),
+    not_found:     t("notFoundStatus"),
 };
 
 const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
@@ -110,7 +111,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
             });
             setCheckedMods(checked);
         } catch(e) {
-            setSyncError("Failed to read save: " + e.message);
+            setSyncError(`${t("failedToReadSave")}: ${e.message}`);
         } finally {
             setIsLoading(false);
         }
@@ -129,7 +130,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
             await modsResource.syncFromSave(selectedSave, selectedModNames);
         } catch(e) {
             setIsSyncing(false);
-            setSyncError("Failed to start sync: " + e.message);
+            setSyncError(`${t("failedToStartSync")}: ${e.message}`);
         }
     };
 
@@ -158,7 +159,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
     return (
         <div>
             {/* Выбор сейва */}
-            <Label text="Save" htmlFor="save"/>
+            <Label text={t("mods:save")} htmlFor="save"/>
             <select
                 className="shadow appearance-none border w-full py-2 px-3 text-black mb-4"
                 disabled={isDisabled}
@@ -176,7 +177,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                 onClick={onReadSave}
                 className="mr-2"
             >
-                Read Mods from Save
+                {t("readModsFromSave")}
             </Button>
 
             {/* Ошибка */}
@@ -198,15 +199,15 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                 <div className="mt-4">
                     {/* Кнопки выбора */}
                     <div className="flex mb-2 gap-2">
-                        <Button size="sm" onClick={selectAll}>Select missing</Button>
-                        <Button size="sm" onClick={clearAll}>Clear selection</Button>
+                        <Button size="sm" onClick={selectAll}>{t("selectMissing")}</Button>
+                        <Button size="sm" onClick={clearAll}>{t("clearSelection")}</Button>
                         <Button
                             size="sm"
                             isDisabled={checkedCount === 0 || isSyncing}
                             isLoading={isSyncing}
                             onClick={onSync}
                         >
-                            Sync selected ({checkedCount})
+                            {t("syncSelected")} ({checkedCount})
                         </Button>
                     </div>
 
@@ -214,7 +215,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                     {currentMod && (
                         <div className="mb-2 text-sm text-orange">
                             <FontAwesomeIcon icon={faSpinner} spin={true} className="mr-2"/>
-                            Downloading: {currentMod}
+                            {t("downloadingStatus")}: {currentMod}
                         </div>
                     )}
 
@@ -222,10 +223,10 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                         <thead>
                             <tr className="border-b font-bold">
                                 <td className="py-1 pr-2 w-6"></td>
-                                <td className="py-1 pr-4">Mod</td>
-                                <td className="py-1 pr-4">Required</td>
-                                <td className="py-1 pr-4">Installed</td>
-                                <td className="py-1">Status</td>
+                                <td className="py-1 pr-4">{t("mod")}</td>
+                                <td className="py-1 pr-4">{t("required")}</td>
+                                <td className="py-1 pr-4">{t("installed")}</td>
+                                <td className="py-1">{t("status")}</td>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 98c52d62..3af1bc6c 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -2,11 +2,13 @@ import Mod from "./Mod";
 import React from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faCheck, faTimes, faToggleOff, faToggleOn} from "@fortawesome/free-solid-svg-icons";
+import { useTranslation } from 'react-i18next';
 
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
 const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
 
+    const { t } = useTranslation('mods');
     const dlcMods = mods.filter(m => DLC_MODS.has(m.name));
     const regularMods = mods.filter(m => !DLC_MODS.has(m.name));
     const dlcEnabled = dlcMods.some(m => m.enabled);
@@ -24,11 +26,12 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
         <table className="w-full">
             <thead>
                 <tr className="text-left py-1">
-                    <th>Name</th>
-                    <th>Enabled</th>
-                    <th>Compatibility</th>
-                    <th>Mod Version</th>
-                    <th>Factorio Version</th>
+                    <th>{t('Name')}</th>
+                    <th>{t('Enabled')}</th>
+                    <th>{t('Compatibility')}</th>
+                    <th>{t('Mod Version')}</th>
+                    <th>{t('Factorio Version')}</th>
+                    <th>{t('File Size')}</th>
                     <th/>
                 </tr>
             </thead>
@@ -37,7 +40,7 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                 {factorioVersion !== null && dlcMods.length > 0 && (
                     <tr className="py-1 bg-blue-50 hover:bg-blue-100">
                         <td className="pr-4 italic text-blue-600">
-                            Space Age DLC
+                            {t('Space Age DLC')}
                             <span className="ml-2 text-xs text-gray-500 not-italic">
                                 (elevated-rails, quality, space-age)
                             </span>

From 7ca86d7a282bf8d636fb17a90be8bf1f3954e40a Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:34:45 +0000
Subject: [PATCH 097/112] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=20ModList/LoadMods=20=E5=88=B0=E6=88=91=E4=BB=AC?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=20+=20=E9=80=90=E6=9D=A1=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=20Joey=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

前因: 合并 Joey develop 时整文件覆盖导致大面积退化（丢失文件大小列、
表头翻译、共享认证、进度条等 10+ 功能）。

ModList.jsx — 我们基础 + 合并：
  ✅ 文件大小列 (我们的)
  ✅ t() 表头翻译 (我们的)
  ✅ DLC 分组行 (Joey)
  ✅ mod.name 作 key (修复索引 key 反模式)

LoadMods.jsx — 我们基础 + 合并：
  ✅ 共享认证状态 (我们的，接收父组件 props)
  ✅ mod_sync.go 存档解析 + 选择性同步 (Joey)
  ✅ WebSocket 进度监听 (Joey)
  ✅ t() 全部翻译 (我们的)
  ✅ STATUS_ICON 图标映射 (Joey)
  ✅ checkbox + selectMissing/clearAll (Joey)
---
 ui/App/views/Mods/components/LoadMods.jsx | 325 ++++------------------
 ui/App/views/Mods/components/ModList.jsx  |  11 +-
 2 files changed, 55 insertions(+), 281 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 4d3ff675..331c3527 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,304 +1,83 @@
 import React, {useEffect, useState} from "react";
 import savesResource from "../../../../api/resources/saves";
+import Select from "../../../components/Select";
 import Label from "../../../components/Label";
+import {useForm} from "react-hook-form";
 import Button from "../../../components/Button";
 import modsResource from "../../../../api/resources/mods";
-import {useTranslation} from "react-i18next";
+import modResource from "../../../../api/resources/mods";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
-import socket from "../../../../api/socket";
-import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import ConfirmDialog from "../../../components/ConfirmDialog";
 
-import {faSpinner, faCheck, faTimes, faMinusCircle, faExternalLinkAlt} from "@fortawesome/free-solid-svg-icons";
+const LoadMods = ({refreshMods}) => {
 
-const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
-
-const STATUS_ICON = {
-    downloading:   <FontAwesomeIcon icon={faSpinner} spin={true} className="text-orange"/>,
-    downloaded:    <FontAwesomeIcon icon={faCheck} className="text-green"/>,
-    installed:     <FontAwesomeIcon icon={faCheck} className="text-green"/>,
-    wrong_version: <FontAwesomeIcon icon={faCheck} className="text-yellow-500"/>,
-    missing:       <FontAwesomeIcon icon={faTimes} className="text-red"/>,
-    builtin:       <FontAwesomeIcon icon={faMinusCircle} className="text-blue-400"/>,
-    not_found:     <FontAwesomeIcon icon={faTimes} className="text-red"/>,
-};
-
-const STATUS_TEXT = {
-    downloading:   t("downloadingStatus"),
-    downloaded:    t("downloadedStatus"),
-    installed:     t("installedStatus"),
-    wrong_version: t("wrongVersionStatus"),
-    missing:       t("missingStatus"),
-    builtin:       t("builtinStatus"),
-    not_found:     t("notFoundStatus"),
-};
-
-const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
-    const {t} = useTranslation();
     const [saves, setSaves] = useState([]);
-    const [selectedSave, setSelectedSave] = useState("");
+    const {register, reset, handleSubmit} = useForm();
     const [isLoading, setIsLoading] = useState(false);
-    const [isSyncing, setIsSyncing] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
-    const [modRows, setModRows] = useState([]);
-    const [checkedMods, setCheckedMods] = useState({});
-    const [syncError, setSyncError] = useState(null);
-    const [currentMod, setCurrentMod] = useState(null);
-    const [warning, setWarning] = useState(null);
+    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
+    const [loadModsData, setLoadModsData] = useState(undefined);
 
     useEffect(() => {
         (async () => {
-            if (!isFactorioAuthenticated) {
-                setIsFactorioAuthenticated(await modsResource.portal.status());
-            }
-            const s = await savesResource.list();
+            setIsFactorioAuthenticated(await modResource.portal.status())
+
+            const s = await savesResource.list()
             setSaves(s);
             if (s.length > 0) {
                 setIsDisabled(false);
-                setSelectedSave(s[0].name);
             }
+            reset();
         })();
     }, []);
 
-    useEffect(() => {
-        const handler = (message) => {
-            const data = JSON.parse(message);
-            if (data.status === "progress") {
-                setCurrentMod(data.mod);
-                setModRows(rows => rows.map(r =>
-                    r.name === data.mod ? {...r, status: "downloading"} : r
-                ));
-            } else if (data.status === "done") {
-                setIsSyncing(false);
-                setCurrentMod(null);
-                setWarning(data.warning || null);
-                if (data.mods) {
-                    setModRows(data.mods);
-                    setCheckedMods({});
-                }
-                refreshMods();
-            } else if (data.status === "error") {
-                setIsSyncing(false);
-                setCurrentMod(null);
-                setSyncError(data.message);
-            }
-        };
-
-        socket.on('mods_sync', handler);
-        socket.emit('mods sync subscribe');
-        return () => {
-            socket.off('mods_sync', handler);
-            socket.emit('mods sync unsubscribe');
-        };
-    }, []);
-
-    const onReadSave = async () => {
-        if (!selectedSave) return;
+    const loadModsRequested = data => {
         setIsLoading(true);
-        setModRows([]);
-        setCheckedMods({});
-        setSyncError(null);
-        setWarning(null);
+        setLoadModsData(data);
+    }
 
-        try {
-            const mods = await modsResource.getFromSave(selectedSave);
-            setModRows(mods || []);
-            // По умолчанию отмечаем missing и wrong_version
-            const checked = {};
-            (mods || []).forEach(m => {
-                if (m.status === 'missing' || m.status === 'wrong_version') {
-                    checked[m.name] = true;
-                }
-            });
-            setCheckedMods(checked);
-        } catch(e) {
-            setSyncError(`${t("failedToReadSave")}: ${e.message}`);
-        } finally {
+    const loadMods = async data => {
+        await modResource.deleteAll();
+        const {mods} = await savesResource.mods(data.save).catch(() => {
             setIsLoading(false);
-        }
-    };
-
-    const onSync = async () => {
-        const toSync = modRows
-            .filter(m => checkedMods[m.name])
-            .map(m => m.name);
-        if (toSync.length === 0) return;
-
-        setIsSyncing(true);
-        setSyncError(null);
-        try {
-            const selectedModNames = Object.keys(checkedMods).filter(k => checkedMods[k]);
-            await modsResource.syncFromSave(selectedSave, selectedModNames);
-        } catch(e) {
-            setIsSyncing(false);
-            setSyncError(`${t("failedToStartSync")}: ${e.message}`);
-        }
-    };
-
-    const toggleCheck = (name) => {
-        setCheckedMods(prev => ({...prev, [name]: !prev[name]}));
-    };
-
-    const selectAll = () => {
-        const checked = {};
-        modRows.forEach(m => {
-            if (m.status !== 'builtin' && m.status !== 'installed') {
-                checked[m.name] = true;
-            }
+            setLoadModsData(undefined);
         });
-        setCheckedMods(checked);
-    };
 
-    const clearAll = () => setCheckedMods({});
-
-    const checkedCount = Object.values(checkedMods).filter(Boolean).length;
-
-    if (!isFactorioAuthenticated) {
-        return <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>;
+        await modResource.portal.installMultiple(mods)
+            .then(() => {
+                refreshMods();
+                window.flash(`Mods are loaded from save file ${data.save}.`, "green");
+            }).finally(() => {
+                setIsLoading(false);
+                setLoadModsData(undefined);
+            });
     }
 
-    return (
-        <div>
-            {/* Выбор сейва */}
-            <Label text={t("mods:save")} htmlFor="save"/>
-            <select
-                className="shadow appearance-none border w-full py-2 px-3 text-black mb-4"
+    return isFactorioAuthenticated
+        ? <form onSubmit={handleSubmit(loadModsRequested)}>
+            <Label text="Save" htmlFor="save"/>
+            <Select
+                register={register('save')}
+                className="mb-4"
                 disabled={isDisabled}
-                value={selectedSave}
-                onChange={e => { setSelectedSave(e.target.value); setModRows([]); setCheckedMods({}); }}
-            >
-                {saves?.map(save => (
-                    <option key={save.name} value={save.name}>{save.name}</option>
-                ))}
-            </select>
-
-            <Button
-                isDisabled={isDisabled || isLoading}
-                isLoading={isLoading}
-                onClick={onReadSave}
-                className="mr-2"
-            >
-                {t("readModsFromSave")}
-            </Button>
-
-            {/* Ошибка */}
-            {syncError && (
-                <div className="mt-4 p-3 bg-red-100 text-red font-bold">
-                    ⚠ {syncError}
-                </div>
-            )}
-
-            {/* Предупреждение */}
-            {warning && (
-                <div className="mt-4 p-3 bg-yellow-100 text-yellow-800">
-                    ⚠ {warning}
-                </div>
-            )}
-
-            {/* Таблица модов */}
-            {modRows.length > 0 && (
-                <div className="mt-4">
-                    {/* Кнопки выбора */}
-                    <div className="flex mb-2 gap-2">
-                        <Button size="sm" onClick={selectAll}>{t("selectMissing")}</Button>
-                        <Button size="sm" onClick={clearAll}>{t("clearSelection")}</Button>
-                        <Button
-                            size="sm"
-                            isDisabled={checkedCount === 0 || isSyncing}
-                            isLoading={isSyncing}
-                            onClick={onSync}
-                        >
-                            {t("syncSelected")} ({checkedCount})
-                        </Button>
-                    </div>
-
-                    {/* Прогресс */}
-                    {currentMod && (
-                        <div className="mb-2 text-sm text-orange">
-                            <FontAwesomeIcon icon={faSpinner} spin={true} className="mr-2"/>
-                            {t("downloadingStatus")}: {currentMod}
-                        </div>
-                    )}
-
-                    <table className="w-full text-sm">
-                        <thead>
-                            <tr className="border-b font-bold">
-                                <td className="py-1 pr-2 w-6"></td>
-                                <td className="py-1 pr-4">{t("mod")}</td>
-                                <td className="py-1 pr-4">{t("required")}</td>
-                                <td className="py-1 pr-4">{t("installed")}</td>
-                                <td className="py-1">{t("status")}</td>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {/* DLC группа */}
-                            {modRows.some(m => DLC_MODS.has(m.name)) && (() => {
-                                const dlcMods = modRows.filter(m => DLC_MODS.has(m.name));
-                                const dlcKey = 'dlc-group';
-                                const allInstalled = dlcMods.every(m => m.status === 'installed' || m.status === 'builtin');
-                                return (
-                                    <tr key={dlcKey} className="border-b hover:bg-gray-100 cursor-pointer bg-blue-50"
-                                        onClick={() => !allInstalled && toggleCheck(dlcKey)}>
-                                        <td className="py-1 pr-2"></td>
-                                        <td className="py-1 pr-4 italic text-blue-600">
-                                            Space Age DLC
-                                            <span className="ml-2 text-xs text-gray-500">
-                                                (elevated-rails, quality, space-age)
-                                            </span>
-                                        </td>
-                                        <td className="py-1 pr-4">{dlcMods[0]?.version_required}</td>
-                                        <td className="py-1 pr-4">{dlcMods[0]?.version_installed || '—'}</td>
-                                        <td className="py-1">
-                                            <span className="mr-2">{STATUS_ICON[allInstalled ? 'installed' : 'builtin']}</span>
-                                            {allInstalled ? 'Installed' : 'Built-in / DLC'}
-                                        </td>
-                                    </tr>
-                                );
-                            })()}
-                            {/* Остальные моды */}
-                            {modRows.filter(m => !DLC_MODS.has(m.name)).map((mod, i) => (
-                                <tr
-                                    key={i}
-                                    className="border-b hover:bg-gray-100 cursor-pointer"
-                                    onClick={() => mod.status !== 'builtin' && toggleCheck(mod.name)}
-                                >
-                                    <td className="py-1 pr-2">
-                                        {mod.status !== 'builtin' && mod.status !== 'installed' && (
-                                            <input
-                                                type="checkbox"
-                                                checked={!!checkedMods[mod.name]}
-                                                onChange={() => toggleCheck(mod.name)}
-                                                onClick={e => e.stopPropagation()}
-                                            />
-                                        )}
-                                    </td>
-                                    <td className="py-1 pr-4">
-                                        {mod.name}
-                                        {mod.status !== 'builtin' && (
-                                            <a
-                                                href={mod.portal_url}
-                                                target="_blank"
-                                                rel="noopener noreferrer"
-                                                className="ml-2 text-blue hover:text-blue-light"
-                                                onClick={e => e.stopPropagation()}
-                                            >
-                                                <FontAwesomeIcon icon={faExternalLinkAlt} size="xs"/>
-                                            </a>
-                                        )}
-                                    </td>
-                                    <td className="py-1 pr-4">{mod.version_required}</td>
-                                    <td className="py-1 pr-4">{mod.version_installed || '—'}</td>
-                                    <td className="py-1">
-                                        <span className="mr-2">{STATUS_ICON[mod.status]}</span>
-                                        {STATUS_TEXT[mod.status] || mod.status}
-                                    </td>
-                                </tr>
-                            ))}
-                        </tbody>
-                    </table>
-                </div>
-            )}
-        </div>
-    );
-};
+                options={saves?.map(save => new Object({
+                    name: save.name,
+                    value: save.name
+                }))}
+            />
+            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>Load</Button>
+            <ConfirmDialog
+                title="Load Mods from Save"
+                content={`Loading the Mods from Save "${loadModsData?.save}" will remove all currently installed Mods.`}
+                isOpen={loadModsData !== undefined}
+                close={() => {
+                    setIsLoading(false);
+                    setLoadModsData(undefined);
+                }}
+                onSuccess={() => loadMods(loadModsData)}
+            />
+        </form>
+        : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
+}
 
 export default LoadMods;
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 3af1bc6c..ab9f7332 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -15,7 +15,6 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
 
     const toggleDLC = () => {
         dlcMods.forEach(m => {
-            // Если хотя бы один включён — выключаем все, иначе включаем все
             if (dlcEnabled === m.enabled) {
                 toggleMod(m.name);
             }
@@ -36,14 +35,10 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                 </tr>
             </thead>
             <tbody>
-                {/* DLC группа */}
                 {factorioVersion !== null && dlcMods.length > 0 && (
                     <tr className="py-1 bg-blue-50 hover:bg-blue-100">
                         <td className="pr-4 italic text-blue-600">
                             {t('Space Age DLC')}
-                            <span className="ml-2 text-xs text-gray-500 not-italic">
-                                (elevated-rails, quality, space-age)
-                            </span>
                         </td>
                         <td className="pr-4">
                             {disabled
@@ -62,13 +57,13 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                         </td>
                         <td className="pr-4">{dlcMods[0]?.version}</td>
                         <td className="pr-4">{dlcMods[0]?.factorio_version}</td>
+                        <td className="pr-4 text-gray-light text-sm">-</td>
                         <td/>
                     </tr>
                 )}
-                {/* Остальные моды */}
                 {factorioVersion !== null && regularMods.map(
-                    (mod, i) =>
-                        <Mod mod={mod} key={i}
+                    (mod) =>
+                        <Mod mod={mod} key={mod.name}
                              updateMod={updateMod}
                              toggleMod={toggleMod}
                              deleteMod={deleteMod}

From 10c85b8a16b017d0db6e6f232e8484b283bf6619 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:41:41 +0000
Subject: [PATCH 098/112] =?UTF-8?q?=E5=A4=87=E5=BF=98:=20=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E8=AE=BE=E7=BD=AE=E9=A1=B5=E5=90=88=E5=B9=B6=E5=88=B0?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ROADMAP.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ROADMAP.md b/ROADMAP.md
index ce5e317b..a066617c 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -37,6 +37,14 @@
 - [ ] Proper FSM login (registration form on first launch)
 
 ### Server
+- [ ] Controls page info panel — merge Game Settings into Controls dashboard:
+  - Remove standalone `/game-settings` page (mostly empty config.ini view)
+  - Add read-only info section below start/stop controls:
+    - Factorio version + base mod version
+    - Data paths (read-data / write-data)
+    - Installed / compatible / incompatible mod counts
+    - Save file count + last modified
+    - (future) uptime, player count
 - [ ] Server Status tab refactor:
   - Autostart checkbox
   - Factorio version dropdown with auto-download

From 9f05b56c08738838f2672c829a944908c1837243 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:47:47 +0000
Subject: [PATCH 099/112] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0+=E6=97=A5=E5=BF=97=E5=90=88=E5=B9=B6=20?=
 =?UTF-8?q?=E2=80=94=20=E7=BB=88=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=A4=E4=B8=AA=E7=8B=AC=E7=AB=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Console.jsx: 固定高度日志区 (overflow-y:scroll) + 底部RCON输入
- 新增 auto-scroll 跟随最新日志
- 侧边栏移除单独日志链接（功能已在终端内）
- zh: 控制台→终端，placeholder 提示输入指令

安全: 纯RCON通道，未引入任何shell/PTY，权限与之前完全一致
---
 ui/App/components/Layout.jsx   | 1 -
 ui/App/locales/zh-console.json | 4 ++--
 ui/App/locales/zh.json         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 54bc7a92..66bf25df 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -79,7 +79,6 @@ const Layout = ({handleLogout, serverStatus}) => {
                             <Link to="/server-settings">{t("server_settings.title")}</Link>
                             <Link to="/game-settings">{t("game_settings.title")}</Link>
                             <Link to="/console">{t("console.title")}</Link>
-                            <Link to="/logs" last={true}>{t("logs.title")}</Link>
                         </div>
                     </div>
                     <div className="py-4 px-2 accentuated">
diff --git a/ui/App/locales/zh-console.json b/ui/App/locales/zh-console.json
index 9130943a..6fa75b0d 100644
--- a/ui/App/locales/zh-console.json
+++ b/ui/App/locales/zh-console.json
@@ -1,8 +1,8 @@
 {
-  "title": "控制台",
+  "title": "终端",
   "console": "控制台",
   "send": "发送",
   "command": "指令",
   "consoleNotAvailable": "控制台不可用（服务器未运行）",
-  "placeholder": "输入指令..."
+  "placeholder": "输入 Factorio 指令..."
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh.json b/ui/App/locales/zh.json
index ee89a6c3..093f7fc1 100644
--- a/ui/App/locales/zh.json
+++ b/ui/App/locales/zh.json
@@ -123,7 +123,7 @@
     "title": "游戏设置"
   },
   "console": {
-    "title": "控制台",
+    "title": "终端",
     "send": "发送",
     "command": "命令",
     "placeholder": "输入指令..."

From 4a9376d95fe04f874b46d2e352a56cd33114dfb2 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:55:03 +0000
Subject: [PATCH 100/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E5=85=B3=E6=9C=8D=E6=98=BE=E7=A4=BA=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=97=A5=E5=BF=97=20+=20=E5=BC=80=E6=9C=8D=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=B5=81=20+=20=E6=8C=87=E4=BB=A4=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- handlers.go: 服务器停止时读 factorio-previous.log 替代 current
- gamelog.go: 抽取 TailLogFile(path) 支持指定日志文件
- Console.jsx: 加载时先 GET /api/log/tail 获取历史日志
  开服后 WebSocket 流实时追加，关服显示历史 + 禁用 RCON
---
 src/factorio/gamelog.go  |  9 +++--
 ui/App/views/Console.jsx | 81 ++++++++++++++++++++++++----------------
 2 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/factorio/gamelog.go b/src/factorio/gamelog.go
index e920301e..65d3bd39 100644
--- a/src/factorio/gamelog.go
+++ b/src/factorio/gamelog.go
@@ -8,11 +8,14 @@ import (
 )
 
 func TailLog() ([]string, error) {
-	result := []string{}
-
 	config := bootstrap.GetConfig()
+	return TailLogFile(config.FactorioLog)
+}
+
+func TailLogFile(path string) ([]string, error) {
+	result := []string{}
 
-	t, err := tail.TailFile(config.FactorioLog, tail.Config{Follow: false})
+	t, err := tail.TailFile(path, tail.Config{Follow: false})
 	if err != nil {
 		log.Printf("Error tailing log %s", err)
 		return result, err
diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index 173fa82b..d2466c31 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -2,56 +2,73 @@ import Panel from "../components/Panel";
 import React, {useEffect, useRef, useState} from "react";
 import { useTranslation } from 'react-i18next';
 import socket from "../../api/socket";
+import log from "../../api/resources/log";
 
 const Console = ({serverStatus}) => {
 
     const { t } = useTranslation('console');
-
     const [logs, setLogs] = useState([]);
     const consoleInput = useRef(null);
+    const logEnd = useRef(null);
 
     useEffect(() => {
+        (async () => {
+            const lines = await log.tail();
+            if (lines && Array.isArray(lines)) setLogs(lines);
+        })();
 
         const appendLog = line => {
             setLogs(lines => [...lines, line]);
-        }
+        };
 
-        socket.on('gamelog', appendLog)
-        socket.emit('log subscribe')
+        socket.on('gamelog', appendLog);
+        socket.emit('log subscribe');
         consoleInput.current?.focus();
 
         return () => {
             socket.off('gamelog', appendLog);
-            socket.emit("log unsubscribe")
-        }
+            socket.emit("log unsubscribe");
+        };
     }, []);
 
+    useEffect(() => {
+        logEnd.current?.scrollIntoView({ behavior: 'smooth' });
+    }, [logs]);
+
     return (
-        <Panel
-            title={t('console')}
-            content={
-                serverStatus.running
-                    ? <>
-                        <ul>
-                            {logs?.map((log, i) => (<li key={i}>{log}</li>))}
-                        </ul>
-                        <input type="text"
-                               className="shadow appearance-none border w-full py-2 px-3 text-black"
-                               ref={consoleInput}
-                               onKeyDown={e => {
-                                   if (e.key === "Enter" && socket) {
-                                       socket.emit("command send", consoleInput.current.value);
-                                       consoleInput.current.value = ""
-                                   }
-                               }}
-                        />
-                    </>
-                    : <p className="text-red-light pt-4">
-                        {t('consoleNotAvailable')}
-                    </p>
-            }
-        />
-    )
-}
+        <div className="flex flex-col" style={{ height: 'calc(100vh - 200px)' }}>
+            <Panel
+                title={t('console')}
+                content={
+                    <div className="flex flex-col" style={{ height: 'calc(100vh - 320px)' }}>
+                        <div className="flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-xs text-green-light"
+                             style={{ minHeight: 0 }}>
+                            {logs?.map((log, i) => (
+                                <div key={i} className="whitespace-pre-wrap break-all">{log}</div>
+                            ))}
+                            <div ref={logEnd} />
+                        </div>
+                        <div className="flex-none">
+                            {serverStatus.running
+                                ? <input type="text"
+                                         className="shadow appearance-none border w-full py-2 px-3 text-black font-mono"
+                                         ref={consoleInput}
+                                         placeholder={t('placeholder')}
+                                         onKeyDown={e => {
+                                             if (e.key === "Enter" && socket) {
+                                                 socket.emit("command send", consoleInput.current.value);
+                                                 consoleInput.current.value = "";
+                                             }
+                                         }}
+                                  />
+                                : <p className="text-gray-light text-sm pt-2">{t('consoleNotAvailable')}</p>
+                            }
+                        </div>
+                    </div>
+                }
+            />
+        </div>
+    );
+};
 
 export default Console;

From a185c91caaed58e9145b0c4fda64499db3b6fa93 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:57:47 +0000
Subject: [PATCH 101/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=20+=20=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=20=E2=80=94=20localStorage=20?=
 =?UTF-8?q?=E8=AE=B0=E5=BF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 字体: 小(12px)/中(14px)/大(16px) 三档切换
- 换行: 自动换行 / 横向滚动，长日志行不再截断
- 偏好保存到 localStorage，刷新不丢失
---
 ui/App/locales/zh-console.json |  9 ++++++++-
 ui/App/views/Console.jsx       | 36 +++++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/ui/App/locales/zh-console.json b/ui/App/locales/zh-console.json
index 6fa75b0d..4d9cbda7 100644
--- a/ui/App/locales/zh-console.json
+++ b/ui/App/locales/zh-console.json
@@ -4,5 +4,12 @@
   "send": "发送",
   "command": "指令",
   "consoleNotAvailable": "控制台不可用（服务器未运行）",
-  "placeholder": "输入 Factorio 指令..."
+  "placeholder": "输入 Factorio 指令...",
+  "fontSize": "字体",
+  "wrap": "换行",
+  "small": "小",
+  "medium": "中",
+  "large": "大",
+  "on": "开",
+  "off": "关"
 }
\ No newline at end of file
diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index d2466c31..bbd24b38 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -4,13 +4,27 @@ import { useTranslation } from 'react-i18next';
 import socket from "../../api/socket";
 import log from "../../api/resources/log";
 
+const FONT_SIZES = { small: 'text-xs', medium: 'text-sm', large: 'text-base' };
+
 const Console = ({serverStatus}) => {
 
     const { t } = useTranslation('console');
     const [logs, setLogs] = useState([]);
+    const [fontSize, setFontSize] = useState(() => localStorage.getItem('console_fontSize') || 'small');
+    const [wrap, setWrap] = useState(() => localStorage.getItem('console_wrap') !== 'false');
     const consoleInput = useRef(null);
     const logEnd = useRef(null);
 
+    const setFont = (size) => {
+        setFontSize(size);
+        localStorage.setItem('console_fontSize', size);
+    };
+    const toggleWrap = () => {
+        const next = !wrap;
+        setWrap(next);
+        localStorage.setItem('console_wrap', String(next));
+    };
+
     useEffect(() => {
         (async () => {
             const lines = await log.tail();
@@ -41,10 +55,26 @@ const Console = ({serverStatus}) => {
                 title={t('console')}
                 content={
                     <div className="flex flex-col" style={{ height: 'calc(100vh - 320px)' }}>
-                        <div className="flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-xs text-green-light"
-                             style={{ minHeight: 0 }}>
+                        <div className="flex-none flex items-center gap-1 mb-2 text-xs text-gray-light">
+                            <span className="mr-2">{t('fontSize')}:</span>
+                            {Object.keys(FONT_SIZES).map(s => (
+                                <button key={s}
+                                    className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                                    onClick={() => setFont(s)}>
+                                    {t(s)}
+                                </button>
+                            ))}
+                            <span className="ml-4 mr-2">{t('wrap')}:</span>
+                            <button
+                                className={`px-2 py-0.5 rounded ${wrap ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                                onClick={toggleWrap}>
+                                {wrap ? t('on') : t('off')}
+                            </button>
+                        </div>
+                        <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_SIZES[fontSize]}`}
+                             style={{ minHeight: 0, whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
                             {logs?.map((log, i) => (
-                                <div key={i} className="whitespace-pre-wrap break-all">{log}</div>
+                                <div key={i} className={wrap ? 'break-all' : ''}>{log}</div>
                             ))}
                             <div ref={logEnd} />
                         </div>

From 037fb2168cd35c25a5c051e7355930ac0108696d Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 09:00:09 +0000
Subject: [PATCH 102/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=BD=E5=BA=A6=E8=B0=83=E8=8A=82=20+=20=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E4=BC=98=E5=8C=96=20+=20=E5=85=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=94=BE=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Console.jsx: 宽度三档(窄/中/宽) + localStorage 记忆
- Console.jsx: 控制栏换行/宽度在小屏幕隐藏，移动端不挤压
- Console.jsx: 100dvh 适配移动浏览器地址栏收起
- Layout.jsx: container→w-full 全页面放宽，Panel 自身控宽
---
 ui/App/components/Layout.jsx   |   2 +-
 ui/App/locales/zh-console.json |   6 +-
 ui/App/views/Console.jsx       | 109 +++++++++++++++++++--------------
 3 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 66bf25df..0d5d8628 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -110,7 +110,7 @@ const Layout = ({handleLogout, serverStatus}) => {
 
             {/*Main*/}
             <div className="md:ml-88 min-h-screen">
-                <div className="container md:mx-auto pt-16 md:px-6">
+                <div className="w-full pt-16 md:px-6">
                     <Outlet />
                     <Flash/>
                 </div>
diff --git a/ui/App/locales/zh-console.json b/ui/App/locales/zh-console.json
index 4d9cbda7..b3fea0a3 100644
--- a/ui/App/locales/zh-console.json
+++ b/ui/App/locales/zh-console.json
@@ -11,5 +11,9 @@
   "medium": "中",
   "large": "大",
   "on": "开",
-  "off": "关"
+  "off": "关",
+  "width": "宽度",
+  "compact": "窄",
+  "normal": "中",
+  "full": "宽"
 }
\ No newline at end of file
diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index bbd24b38..70351311 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -5,6 +5,7 @@ import socket from "../../api/socket";
 import log from "../../api/resources/log";
 
 const FONT_SIZES = { small: 'text-xs', medium: 'text-sm', large: 'text-base' };
+const PANEL_SIZES = { compact: 'max-w-4xl', normal: 'max-w-6xl', full: 'max-w-full' };
 
 const Console = ({serverStatus}) => {
 
@@ -12,6 +13,8 @@ const Console = ({serverStatus}) => {
     const [logs, setLogs] = useState([]);
     const [fontSize, setFontSize] = useState(() => localStorage.getItem('console_fontSize') || 'small');
     const [wrap, setWrap] = useState(() => localStorage.getItem('console_wrap') !== 'false');
+    const [panelWidth, setPanelWidth] = useState(() => localStorage.getItem('console_panelWidth') || 'normal');
+    const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
     const consoleInput = useRef(null);
     const logEnd = useRef(null);
 
@@ -24,6 +27,10 @@ const Console = ({serverStatus}) => {
         setWrap(next);
         localStorage.setItem('console_wrap', String(next));
     };
+    const setWidth = (w) => {
+        setPanelWidth(w);
+        localStorage.setItem('console_panelWidth', w);
+    };
 
     useEffect(() => {
         (async () => {
@@ -50,53 +57,63 @@ const Console = ({serverStatus}) => {
     }, [logs]);
 
     return (
-        <div className="flex flex-col" style={{ height: 'calc(100vh - 200px)' }}>
-            <Panel
-                title={t('console')}
-                content={
-                    <div className="flex flex-col" style={{ height: 'calc(100vh - 320px)' }}>
-                        <div className="flex-none flex items-center gap-1 mb-2 text-xs text-gray-light">
-                            <span className="mr-2">{t('fontSize')}:</span>
-                            {Object.keys(FONT_SIZES).map(s => (
-                                <button key={s}
-                                    className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
-                                    onClick={() => setFont(s)}>
-                                    {t(s)}
-                                </button>
-                            ))}
-                            <span className="ml-4 mr-2">{t('wrap')}:</span>
-                            <button
-                                className={`px-2 py-0.5 rounded ${wrap ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
-                                onClick={toggleWrap}>
-                                {wrap ? t('on') : t('off')}
-                            </button>
-                        </div>
-                        <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_SIZES[fontSize]}`}
-                             style={{ minHeight: 0, whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
-                            {logs?.map((log, i) => (
-                                <div key={i} className={wrap ? 'break-all' : ''}>{log}</div>
-                            ))}
-                            <div ref={logEnd} />
-                        </div>
-                        <div className="flex-none">
-                            {serverStatus.running
-                                ? <input type="text"
-                                         className="shadow appearance-none border w-full py-2 px-3 text-black font-mono"
-                                         ref={consoleInput}
-                                         placeholder={t('placeholder')}
-                                         onKeyDown={e => {
-                                             if (e.key === "Enter" && socket) {
-                                                 socket.emit("command send", consoleInput.current.value);
-                                                 consoleInput.current.value = "";
-                                             }
-                                         }}
-                                  />
-                                : <p className="text-gray-light text-sm pt-2">{t('consoleNotAvailable')}</p>
-                            }
+        <div className="flex flex-col" style={{ height: 'calc(100dvh - 120px)' }}>
+            <div className={`flex-none flex flex-wrap items-center gap-1 mb-2 text-xs text-gray-light ${PANEL_SIZES[panelWidth]} mx-auto w-full`}>
+                <span className="mr-1">{t('fontSize')}:</span>
+                {Object.keys(FONT_SIZES).map(s => (
+                    <button key={s}
+                        className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                        onClick={() => setFont(s)}>
+                        {t(s)}
+                    </button>
+                ))}
+                <span className="ml-3 mr-1 hidden sm:inline">{t('wrap')}:</span>
+                <button
+                    className={`px-2 py-0.5 rounded hidden sm:inline ${wrap ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                    onClick={toggleWrap}>
+                    {wrap ? t('on') : t('off')}
+                </button>
+                <span className="ml-3 mr-1">{t('width')}:</span>
+                {Object.keys(PANEL_SIZES).map(w => (
+                    <button key={w}
+                        className={`px-2 py-0.5 rounded ${panelWidth === w ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                        onClick={() => setWidth(w)}>
+                        {t(w)}
+                    </button>
+                ))}
+            </div>
+            <div className={`flex-1 flex flex-col overflow-hidden ${PANEL_SIZES[panelWidth]} mx-auto w-full`}>
+                <Panel
+                    title={t('console')}
+                    content={
+                        <div className="flex flex-col" style={{ height: 'calc(100dvh - 260px)' }}>
+                            <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_SIZES[fontSize]}`}
+                                 style={{ minHeight: 0, whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
+                                {logs?.map((log, i) => (
+                                    <div key={i} className={wrap ? 'break-all' : ''}>{log}</div>
+                                ))}
+                                <div ref={logEnd} />
+                            </div>
+                            <div className="flex-none">
+                                {serverStatus.running
+                                    ? <input type="text"
+                                             className="shadow appearance-none border w-full py-2 px-3 text-black font-mono"
+                                             ref={consoleInput}
+                                             placeholder={t('placeholder')}
+                                             onKeyDown={e => {
+                                                 if (e.key === "Enter" && socket) {
+                                                     socket.emit("command send", consoleInput.current.value);
+                                                     consoleInput.current.value = "";
+                                                 }
+                                             }}
+                                      />
+                                    : <p className="text-gray-light text-sm pt-2">{t('consoleNotAvailable')}</p>
+                                }
+                            </div>
                         </div>
-                    </div>
-                }
-            />
+                    }
+                />
+            </div>
         </div>
     );
 };

From 5c0f871dfb4bd8690c45875b5cf69904fc51d748 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 09:02:02 +0000
Subject: [PATCH 103/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=BD=E5=BA=A6=E6=94=B9=E7=94=A8=20inline=20style?=
 =?UTF-8?q?=20=E2=80=94=20Tailwind=20class=20=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- max-w-4xl 等 Tailwind class 在生产构建中被 purged
- 改用 style={{maxWidth}} inline 确保生效
---
 ui/App/views/Console.jsx | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index 70351311..b9197447 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next';
 import socket from "../../api/socket";
 import log from "../../api/resources/log";
 
-const FONT_SIZES = { small: 'text-xs', medium: 'text-sm', large: 'text-base' };
-const PANEL_SIZES = { compact: 'max-w-4xl', normal: 'max-w-6xl', full: 'max-w-full' };
+const FONT_CLASS = { small: 'text-xs', medium: 'text-sm', large: 'text-base' };
+const WIDTH_STYLE = { compact: 'max-width: 56rem', normal: 'max-width: 72rem', full: 'max-width: none' };
 
 const Console = ({serverStatus}) => {
 
@@ -14,7 +14,6 @@ const Console = ({serverStatus}) => {
     const [fontSize, setFontSize] = useState(() => localStorage.getItem('console_fontSize') || 'small');
     const [wrap, setWrap] = useState(() => localStorage.getItem('console_wrap') !== 'false');
     const [panelWidth, setPanelWidth] = useState(() => localStorage.getItem('console_panelWidth') || 'normal');
-    const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
     const consoleInput = useRef(null);
     const logEnd = useRef(null);
 
@@ -38,9 +37,7 @@ const Console = ({serverStatus}) => {
             if (lines && Array.isArray(lines)) setLogs(lines);
         })();
 
-        const appendLog = line => {
-            setLogs(lines => [...lines, line]);
-        };
+        const appendLog = line => setLogs(lines => [...lines, line]);
 
         socket.on('gamelog', appendLog);
         socket.emit('log subscribe');
@@ -58,9 +55,10 @@ const Console = ({serverStatus}) => {
 
     return (
         <div className="flex flex-col" style={{ height: 'calc(100dvh - 120px)' }}>
-            <div className={`flex-none flex flex-wrap items-center gap-1 mb-2 text-xs text-gray-light ${PANEL_SIZES[panelWidth]} mx-auto w-full`}>
+            <div className="flex-none flex flex-wrap items-center gap-1 mb-2 text-xs text-gray-light"
+                 style={{ ...WIDTH_STYLE[panelWidth], margin: '0 auto', width: '100%' }}>
                 <span className="mr-1">{t('fontSize')}:</span>
-                {Object.keys(FONT_SIZES).map(s => (
+                {Object.keys(FONT_CLASS).map(s => (
                     <button key={s}
                         className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
                         onClick={() => setFont(s)}>
@@ -74,7 +72,7 @@ const Console = ({serverStatus}) => {
                     {wrap ? t('on') : t('off')}
                 </button>
                 <span className="ml-3 mr-1">{t('width')}:</span>
-                {Object.keys(PANEL_SIZES).map(w => (
+                {Object.keys(WIDTH_STYLE).map(w => (
                     <button key={w}
                         className={`px-2 py-0.5 rounded ${panelWidth === w ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
                         onClick={() => setWidth(w)}>
@@ -82,12 +80,12 @@ const Console = ({serverStatus}) => {
                     </button>
                 ))}
             </div>
-            <div className={`flex-1 flex flex-col overflow-hidden ${PANEL_SIZES[panelWidth]} mx-auto w-full`}>
+            <div className="flex-1 flex flex-col overflow-hidden" style={{ ...WIDTH_STYLE[panelWidth], margin: '0 auto', width: '100%' }}>
                 <Panel
                     title={t('console')}
                     content={
                         <div className="flex flex-col" style={{ height: 'calc(100dvh - 260px)' }}>
-                            <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_SIZES[fontSize]}`}
+                            <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_CLASS[fontSize]}`}
                                  style={{ minHeight: 0, whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
                                 {logs?.map((log, i) => (
                                     <div key={i} className={wrap ? 'break-all' : ''}>{log}</div>

From e0b7ae66eea5ab4e5bae5d5d26b340fcce53750e Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 12:15:58 +0000
Subject: [PATCH 104/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E8=A7=A3?=
 =?UTF-8?q?=E8=80=A6=E7=89=88=E6=9C=AC=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7=E5=88=A4=E6=96=AD=20+=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mod_modInfo.go: dep_op 和 FactorioVersion 始终从 base 依赖提取
  不再因 incompatible 而跳过（显示需求 ≠ 兼容性判断）

- mod_Mods.go: 传递 Dependencies 到 API 响应

- Mod.jsx: 模组名旁显示依赖数量 [▶ 5]，点击展开完整列表
  跳过 optional/? 前缀依赖，最多显示前 10 条
---
 src/factorio/mod_Mods.go             |  1 +
 src/factorio/mod_modInfo.go          |  3 +++
 ui/App/views/Mods/components/Mod.jsx | 39 ++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index 4641ecf9..c457b925 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -62,6 +62,7 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		modsResult.FactorioVersion = modInfo.FactorioVersion
 		modsResult.Compatibility = modInfo.Compatibility
 		modsResult.DepOp = modInfo.DepOp
+		modsResult.Dependencies = modInfo.Dependencies
 
 		for _, simpleMod := range mods.ModSimpleList.Mods {
 			if simpleMod.Name == modsResult.Name {
diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 940399c1..10e72a27 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -122,6 +122,9 @@ func (modInfoList *ModInfoList) listInstalledMods() error {
 		modInfo.Compatibility = server.Version.GEC(modInfo.FactorioVersion)
 		if modInfo.Compatibility && !base.Equals(NilVersion) {
 			modInfo.Compatibility = server.Version.Compatible(base, op)
+		}
+
+		if !base.Equals(NilVersion) {
 			if base.Greater(modInfo.FactorioVersion) || modInfo.FactorioVersion.Equals(NilVersion) {
 				modInfo.FactorioVersion = base
 			}
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 80893af7..477cd096 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -6,7 +6,9 @@ import {
     faTimes,
     faToggleOff,
     faToggleOn,
-    faTrashAlt
+    faTrashAlt,
+    faCaretDown,
+    faCaretRight
 } from "@fortawesome/free-solid-svg-icons";
 import modsResource from "../../../../api/resources/mods";
 import React, {useEffect, useState} from "react";
@@ -17,6 +19,7 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
     const [newVersion, setNewVersion] = useState(null)
     const [icon, setIcon] = useState(faArrowCircleUp)
     const [checked, setChecked] = useState(false)
+    const [depsOpen, setDepsOpen] = useState(false)
 
     useEffect(() => {
         if (!disabled && !checked) {
@@ -25,7 +28,6 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                 try {
                     const data = await modsResource.portal.info(mod.name)
 
-                //get newest COMPATIBLE release
                 let newestRelease;
                 data.releases.forEach(release => {
                     if (
@@ -67,9 +69,31 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
         }
     }, [mod]);
 
+    const deps = mod.dependencies || [];
+    const displayDeps = deps.filter(d => d && d.trim()).slice(0, 10);
+
     return (
         <tr className="py-1">
-            <td className="pr-4">{mod.title}</td>
+            <td className="pr-4">
+                {mod.title}
+                {displayDeps.length > 0 && (
+                    <span className="ml-1 text-gray-light cursor-pointer select-none"
+                          onClick={() => setDepsOpen(!depsOpen)}>
+                        <FontAwesomeIcon icon={depsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
+                        <span className="text-xs">{displayDeps.length}</span>
+                    </span>
+                )}
+                {depsOpen && displayDeps.length > 0 && (
+                    <div className="mt-1 pl-2 border-l-2 border-gray-dark text-xs text-gray-light">
+                        {displayDeps.map((d, i) => (
+                            <div key={i} className="whitespace-nowrap">{d}</div>
+                        ))}
+                        {deps.length > 10 && (
+                            <div className="text-gray">... and {deps.length - 10} more</div>
+                        )}
+                    </div>
+                )}
+            </td>
             <td className="pr-4">
                 {
                     disabled
@@ -81,12 +105,12 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                         :
                         mod.enabled
                             ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green"
-                                               icon={faToggleOn}
-                                               onClick={() => toggleMod(mod.name)}/>
+                                                icon={faToggleOn}
+                                                onClick={() => toggleMod(mod.name)}/>
                             :
                             <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red"
-                                             icon={faToggleOff}
-                                             onClick={() => toggleMod(mod.name)}/>
+                                              icon={faToggleOff}
+                                              onClick={() => toggleMod(mod.name)}/>
                 }
             </td>
             <td className="pr-4">
@@ -119,4 +143,3 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
 }
 
 export default Mod;
-

From d94aae4bb41fe9f77b48d223bcc8df3173aeb246 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 12:22:01 +0000
Subject: [PATCH 105/112] =?UTF-8?q?=E8=B0=83=E6=95=B4:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8=E5=88=97=E9=A1=BA=E5=BA=8F=20?=
 =?UTF-8?q?=E2=80=94=20=E5=85=BC=E5=AE=B9=E6=80=A7+=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=90=8D=E7=A7=B0=E5=B7=A6=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

兼容性 → 启用 → 名称 → 版本 → Factorio版本 → 文件大小 → 删除
先看状态再看名称，符合快速过滤场景
---
 ui/App/views/Mods/components/Mod.jsx     | 44 ++++++++++++------------
 ui/App/views/Mods/components/ModList.jsx | 12 +++----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 477cd096..bad5f7e8 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -75,24 +75,10 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
     return (
         <tr className="py-1">
             <td className="pr-4">
-                {mod.title}
-                {displayDeps.length > 0 && (
-                    <span className="ml-1 text-gray-light cursor-pointer select-none"
-                          onClick={() => setDepsOpen(!depsOpen)}>
-                        <FontAwesomeIcon icon={depsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
-                        <span className="text-xs">{displayDeps.length}</span>
-                    </span>
-                )}
-                {depsOpen && displayDeps.length > 0 && (
-                    <div className="mt-1 pl-2 border-l-2 border-gray-dark text-xs text-gray-light">
-                        {displayDeps.map((d, i) => (
-                            <div key={i} className="whitespace-nowrap">{d}</div>
-                        ))}
-                        {deps.length > 10 && (
-                            <div className="text-gray">... and {deps.length - 10} more</div>
-                        )}
-                    </div>
-                )}
+                {mod.compatibility
+                    ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
+                    : <FontAwesomeIcon className="text-red" icon={faTimes}/>
+                }
             </td>
             <td className="pr-4">
                 {
@@ -114,10 +100,24 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                 }
             </td>
             <td className="pr-4">
-                {mod.compatibility
-                    ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
-                    : <FontAwesomeIcon className="text-red" icon={faTimes}/>
-                }
+                {mod.title}
+                {displayDeps.length > 0 && (
+                    <span className="ml-1 text-gray-light cursor-pointer select-none"
+                          onClick={() => setDepsOpen(!depsOpen)}>
+                        <FontAwesomeIcon icon={depsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
+                        <span className="text-xs">{displayDeps.length}</span>
+                    </span>
+                )}
+                {depsOpen && displayDeps.length > 0 && (
+                    <div className="mt-1 pl-2 border-l-2 border-gray-dark text-xs text-gray-light">
+                        {displayDeps.map((d, i) => (
+                            <div key={i} className="whitespace-nowrap">{d}</div>
+                        ))}
+                        {deps.length > 10 && (
+                            <div className="text-gray">... and {deps.length - 10} more</div>
+                        )}
+                    </div>
+                )}
             </td>
             <td className="pr-4">
                 {mod.version}
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index ab9f7332..dffcafa4 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -25,9 +25,9 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
         <table className="w-full">
             <thead>
                 <tr className="text-left py-1">
-                    <th>{t('Name')}</th>
-                    <th>{t('Enabled')}</th>
                     <th>{t('Compatibility')}</th>
+                    <th>{t('Enabled')}</th>
+                    <th>{t('Name')}</th>
                     <th>{t('Mod Version')}</th>
                     <th>{t('Factorio Version')}</th>
                     <th>{t('File Size')}</th>
@@ -37,8 +37,8 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
             <tbody>
                 {factorioVersion !== null && dlcMods.length > 0 && (
                     <tr className="py-1 bg-blue-50 hover:bg-blue-100">
-                        <td className="pr-4 italic text-blue-600">
-                            {t('Space Age DLC')}
+                        <td className="pr-4">
+                            <FontAwesomeIcon className="text-green" icon={faCheck}/>
                         </td>
                         <td className="pr-4">
                             {disabled
@@ -52,8 +52,8 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                                                        icon={faToggleOff} onClick={toggleDLC}/>
                             }
                         </td>
-                        <td className="pr-4">
-                            <FontAwesomeIcon className="text-green" icon={faCheck}/>
+                        <td className="pr-4 italic text-blue-600">
+                            {t('Space Age DLC')}
                         </td>
                         <td className="pr-4">{dlcMods[0]?.version}</td>
                         <td className="pr-4">{dlcMods[0]?.factorio_version}</td>

From 3bacf714ee3085453101ceaaff1fb928eb6768c7 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 12:25:52 +0000
Subject: [PATCH 106/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=20+=20=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E9=9A=90=20+=20=E8=AE=BE=E7=BD=AE=E8=AE=B0=E5=BF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 点击列头排序 (兼容性/启用/名称/版本/文件大小)
- 升序↓降序↑图标指示
- 齿轮菜单切换列显示
- 列偏好保存到 localStorage
- 排序用 useMemo 优化性能
---
 ui/App/locales/zh-mods.json              |   3 +-
 ui/App/views/Mods/components/Mod.jsx     |  18 ++-
 ui/App/views/Mods/components/ModList.jsx | 172 +++++++++++++++--------
 3 files changed, 135 insertions(+), 58 deletions(-)

diff --git a/ui/App/locales/zh-mods.json b/ui/App/locales/zh-mods.json
index 6a86592f..affa3083 100644
--- a/ui/App/locales/zh-mods.json
+++ b/ui/App/locales/zh-mods.json
@@ -65,5 +65,6 @@
   "failedToStartSync": "启动同步失败",
   "mod": "模组",
   "required": "需要版本",
-  "status": "状态"
+  "status": "状态",
+  "columns": "列"
 }
\ No newline at end of file
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index bad5f7e8..1d3845be 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -14,7 +14,7 @@ import modsResource from "../../../../api/resources/mods";
 import React, {useEffect, useState} from "react";
 import {coerce, gt, satisfies} from "semver";
 
-const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod, disabled = false}) => {
+const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod, disabled = false, visibleCols}) => {
 
     const [newVersion, setNewVersion] = useState(null)
     const [icon, setIcon] = useState(faArrowCircleUp)
@@ -71,15 +71,19 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
 
     const deps = mod.dependencies || [];
     const displayDeps = deps.filter(d => d && d.trim()).slice(0, 10);
+    const vis = visibleCols || ['compatibility','enabled','name','version','factorio'];
 
     return (
         <tr className="py-1">
+            {vis.includes('compatibility') && (
             <td className="pr-4">
                 {mod.compatibility
                     ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
                     : <FontAwesomeIcon className="text-red" icon={faTimes}/>
                 }
             </td>
+            )}
+            {vis.includes('enabled') && (
             <td className="pr-4">
                 {
                     disabled
@@ -99,6 +103,8 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                                               onClick={() => toggleMod(mod.name)}/>
                 }
             </td>
+            )}
+            {vis.includes('name') && (
             <td className="pr-4">
                 {mod.title}
                 {displayDeps.length > 0 && (
@@ -119,6 +125,8 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                     </div>
                 )}
             </td>
+            )}
+            {vis.includes('version') && (
             <td className="pr-4">
                 {mod.version}
                 {!disabled && newVersion && <FontAwesomeIcon spin={icon === faSpinner}
@@ -128,9 +136,15 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
                                                         .finally(() => setIcon(faArrowCircleUp))
                                                 }}
                                                 className="hover:text-orange cursor-pointer ml-1"
-                                                icon={icon}/>}</td>
+                                                icon={icon}/>}
+            </td>
+            )}
+            {vis.includes('factorio') && (
             <td className="pr-4">{mod.dep_op ? mod.dep_op + ' ' + mod.factorio_version : mod.factorio_version}</td>
+            )}
+            {vis.includes('size') && (
             <td className="pr-4 text-gray-light text-sm">{mod.file_size > 0 ? ((mod.file_size / 1024).toFixed(0) + ' KB') : '-'}</td>
+            )}
             {
                 !disabled &&
                 <td className="pr-4">
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index dffcafa4..77d0b033 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -1,79 +1,141 @@
 import Mod from "./Mod";
-import React from "react";
+import React, {useState, useMemo} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
-import {faCheck, faTimes, faToggleOff, faToggleOn} from "@fortawesome/free-solid-svg-icons";
+import {faCheck, faTimes, faToggleOff, faToggleOn, faSort, faSortUp, faSortDown, faCog} from "@fortawesome/free-solid-svg-icons";
 import { useTranslation } from 'react-i18next';
 
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
+const COLUMNS = [
+    { key: 'compatibility', label: 'Compatibility', default: true, sortable: true, sortKey: 'compatibility' },
+    { key: 'enabled',       label: 'Enabled',       default: true, sortable: true, sortKey: 'enabled' },
+    { key: 'name',          label: 'Name',          default: true, sortable: true, sortKey: 'title' },
+    { key: 'version',       label: 'Mod Version',   default: true, sortable: true, sortKey: 'version' },
+    { key: 'factorio',      label: 'Factorio Version', default: true, sortable: false },
+    { key: 'size',          label: 'File Size',     default: false, sortable: true, sortKey: 'file_size' },
+];
+
 const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
 
     const { t } = useTranslation('mods');
+    const [sortCol, setSortCol] = useState(null);
+    const [sortDir, setSortDir] = useState('asc');
+    const [visibleCols, setVisibleCols] = useState(() => {
+        const saved = localStorage.getItem('modlist_cols');
+        if (saved) {
+            try { return JSON.parse(saved); } catch {}
+        }
+        return COLUMNS.filter(c => c.default).map(c => c.key);
+    });
+    const [showSettings, setShowSettings] = useState(false);
+
     const dlcMods = mods.filter(m => DLC_MODS.has(m.name));
     const regularMods = mods.filter(m => !DLC_MODS.has(m.name));
     const dlcEnabled = dlcMods.some(m => m.enabled);
 
+    const sortedMods = useMemo(() => {
+        if (!sortCol) return regularMods;
+        const col = COLUMNS.find(c => c.key === sortCol);
+        if (!col || !col.sortKey) return regularMods;
+        const dir = sortDir === 'asc' ? 1 : -1;
+        return [...regularMods].sort((a, b) => {
+            let va = a[col.sortKey], vb = b[col.sortKey];
+            if (typeof va === 'string') va = va.toLowerCase();
+            if (typeof vb === 'string') vb = vb.toLowerCase();
+            if (va == null) return 1;
+            if (vb == null) return -1;
+            return va < vb ? -dir : va > vb ? dir : 0;
+        });
+    }, [regularMods, sortCol, sortDir]);
+
+    const handleSort = (colKey) => {
+        if (sortCol === colKey) {
+            setSortDir(d => d === 'asc' ? 'desc' : 'asc');
+        } else {
+            setSortCol(colKey);
+            setSortDir('asc');
+        }
+    };
+
+    const toggleCol = (key) => {
+        setVisibleCols(prev => {
+            const next = prev.includes(key) ? prev.filter(k => k !== key) : [...prev, key];
+            localStorage.setItem('modlist_cols', JSON.stringify(next));
+            return next;
+        });
+    };
+
     const toggleDLC = () => {
         dlcMods.forEach(m => {
-            if (dlcEnabled === m.enabled) {
-                toggleMod(m.name);
-            }
+            if (dlcEnabled === m.enabled) toggleMod(m.name);
         });
     };
 
+    const SortIcon = ({colKey}) => {
+        if (sortCol !== colKey) return <FontAwesomeIcon icon={faSort} className="ml-1 text-gray-light opacity-50"/>;
+        return <FontAwesomeIcon icon={sortDir === 'asc' ? faSortUp : faSortDown} className="ml-1"/>;
+    };
+
+    const vis = (key) => visibleCols.includes(key);
+
     return (
-        <table className="w-full">
-            <thead>
-                <tr className="text-left py-1">
-                    <th>{t('Compatibility')}</th>
-                    <th>{t('Enabled')}</th>
-                    <th>{t('Name')}</th>
-                    <th>{t('Mod Version')}</th>
-                    <th>{t('Factorio Version')}</th>
-                    <th>{t('File Size')}</th>
-                    <th/>
-                </tr>
-            </thead>
-            <tbody>
-                {factorioVersion !== null && dlcMods.length > 0 && (
-                    <tr className="py-1 bg-blue-50 hover:bg-blue-100">
-                        <td className="pr-4">
-                            <FontAwesomeIcon className="text-green" icon={faCheck}/>
-                        </td>
-                        <td className="pr-4">
-                            {disabled
-                                ? dlcEnabled
-                                    ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
-                                    : <FontAwesomeIcon className="text-red" icon={faTimes}/>
-                                : dlcEnabled
-                                    ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green"
-                                                       icon={faToggleOn} onClick={toggleDLC}/>
-                                    : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red"
-                                                       icon={faToggleOff} onClick={toggleDLC}/>
-                            }
-                        </td>
-                        <td className="pr-4 italic text-blue-600">
-                            {t('Space Age DLC')}
-                        </td>
-                        <td className="pr-4">{dlcMods[0]?.version}</td>
-                        <td className="pr-4">{dlcMods[0]?.factorio_version}</td>
-                        <td className="pr-4 text-gray-light text-sm">-</td>
-                        <td/>
-                    </tr>
+        <div>
+            <div className="flex justify-end mb-1 relative">
+                <button className="text-xs text-gray-light hover:text-white px-2 py-0.5 rounded"
+                        onClick={() => setShowSettings(!showSettings)}>
+                    <FontAwesomeIcon icon={faCog} className="mr-1"/>{t('columns')}
+                </button>
+                {showSettings && (
+                    <div className="absolute right-0 top-6 bg-gray-dark border border-gray-medium rounded-sm p-2 z-10 shadow-xl text-xs">
+                        {COLUMNS.map(c => (
+                            <label key={c.key} className="flex items-center gap-1 py-0.5 cursor-pointer text-gray-light hover:text-white">
+                                <input type="checkbox" checked={vis(c.key)} onChange={() => toggleCol(c.key)} className="mr-1"/>
+                                {t(c.label)}
+                            </label>
+                        ))}
+                    </div>
                 )}
-                {factorioVersion !== null && regularMods.map(
-                    (mod) =>
+            </div>
+            <table className="w-full">
+                <thead>
+                    <tr className="text-left py-1">
+                        {vis('compatibility') && <th className="cursor-pointer select-none" onClick={() => handleSort('compatibility')}>{t('Compatibility')}<SortIcon colKey="compatibility"/></th>}
+                        {vis('enabled') && <th className="cursor-pointer select-none" onClick={() => handleSort('enabled')}>{t('Enabled')}<SortIcon colKey="enabled"/></th>}
+                        {vis('name') && <th className="cursor-pointer select-none" onClick={() => handleSort('name')}>{t('Name')}<SortIcon colKey="name"/></th>}
+                        {vis('version') && <th className="cursor-pointer select-none" onClick={() => handleSort('version')}>{t('Mod Version')}<SortIcon colKey="version"/></th>}
+                        {vis('factorio') && <th>{t('Factorio Version')}</th>}
+                        {vis('size') && <th className="cursor-pointer select-none" onClick={() => handleSort('size')}>{t('File Size')}<SortIcon colKey="size"/></th>}
+                        <th style={{width: 30}}/>
+                    </tr>
+                </thead>
+                <tbody>
+                    {factorioVersion !== null && dlcMods.length > 0 && (
+                        <tr className="py-1 bg-blue-50 hover:bg-blue-100">
+                            {vis('compatibility') && <td className="pr-4"><FontAwesomeIcon className="text-green" icon={faCheck}/></td>}
+                            {vis('enabled') && <td className="pr-4">
+                                {disabled
+                                    ? dlcEnabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>
+                                    : dlcEnabled
+                                        ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green" icon={faToggleOn} onClick={toggleDLC}/>
+                                        : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={toggleDLC}/>
+                                }
+                            </td>}
+                            {vis('name') && <td className="pr-4 italic text-blue-600">{t('Space Age DLC')}</td>}
+                            {vis('version') && <td className="pr-4">{dlcMods[0]?.version}</td>}
+                            {vis('factorio') && <td className="pr-4">{dlcMods[0]?.factorio_version}</td>}
+                            {vis('size') && <td className="pr-4 text-gray-light text-sm">-</td>}
+                            <td/>
+                        </tr>
+                    )}
+                    {factorioVersion !== null && sortedMods.map(mod => (
                         <Mod mod={mod} key={mod.name}
-                             updateMod={updateMod}
-                             toggleMod={toggleMod}
-                             deleteMod={deleteMod}
-                             addUpdatableMod={addUpdatableMod}
-                             factorioVersion={factorioVersion}
-                             disabled={disabled}
-                        />
-                )}
-            </tbody>
-        </table>
+                             updateMod={updateMod} toggleMod={toggleMod} deleteMod={deleteMod}
+                             addUpdatableMod={addUpdatableMod} factorioVersion={factorioVersion}
+                             disabled={disabled} visibleCols={visibleCols} />
+                    ))}
+                </tbody>
+            </table>
+        </div>
     );
 };
 

From 6af7779508bc3bd49c3f8155b52fc7bfad074603 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 12:28:52 +0000
Subject: [PATCH 107/112] =?UTF-8?q?=E6=A0=B7=E5=BC=8F:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8=E5=88=97=E5=88=86=E5=89=B2=E7=BA=BF?=
 =?UTF-8?q?=20+=20=E8=A1=8C=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/Mod.jsx     |  2 +-
 ui/App/views/Mods/components/ModList.jsx | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 1d3845be..51e52d06 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -74,7 +74,7 @@ const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatabl
     const vis = visibleCols || ['compatibility','enabled','name','version','factorio'];
 
     return (
-        <tr className="py-1">
+        <tr className="py-1 border-b border-gray-dark">
             {vis.includes('compatibility') && (
             <td className="pr-4">
                 {mod.compatibility
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 77d0b033..01b026ce 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -98,13 +98,13 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
             </div>
             <table className="w-full">
                 <thead>
-                    <tr className="text-left py-1">
-                        {vis('compatibility') && <th className="cursor-pointer select-none" onClick={() => handleSort('compatibility')}>{t('Compatibility')}<SortIcon colKey="compatibility"/></th>}
-                        {vis('enabled') && <th className="cursor-pointer select-none" onClick={() => handleSort('enabled')}>{t('Enabled')}<SortIcon colKey="enabled"/></th>}
-                        {vis('name') && <th className="cursor-pointer select-none" onClick={() => handleSort('name')}>{t('Name')}<SortIcon colKey="name"/></th>}
-                        {vis('version') && <th className="cursor-pointer select-none" onClick={() => handleSort('version')}>{t('Mod Version')}<SortIcon colKey="version"/></th>}
-                        {vis('factorio') && <th>{t('Factorio Version')}</th>}
-                        {vis('size') && <th className="cursor-pointer select-none" onClick={() => handleSort('size')}>{t('File Size')}<SortIcon colKey="size"/></th>}
+                    <tr className="text-left py-1 border-b border-gray-medium">
+                        {vis('compatibility') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('compatibility')}>{t('Compatibility')}<SortIcon colKey="compatibility"/></th>}
+                        {vis('enabled') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('enabled')}>{t('Enabled')}<SortIcon colKey="enabled"/></th>}
+                        {vis('name') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('name')}>{t('Name')}<SortIcon colKey="name"/></th>}
+                        {vis('version') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('version')}>{t('Mod Version')}<SortIcon colKey="version"/></th>}
+                        {vis('factorio') && <th className="border-r border-gray-medium px-2">{t('Factorio Version')}</th>}
+                        {vis('size') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('size')}>{t('File Size')}<SortIcon colKey="size"/></th>}
                         <th style={{width: 30}}/>
                     </tr>
                 </thead>

From 127dcdb47a05f059921e2eb0731c64c9eb122d7a Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 15:37:38 +0000
Subject: [PATCH 108/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E5=88=97?=
 =?UTF-8?q?=E5=AE=BD=E6=8B=96=E6=8B=BD=E8=B0=83=E6=95=B4=20+=20=E5=88=86?=
 =?UTF-8?q?=E5=89=B2=E7=BA=BF=E5=8A=A0=E6=B7=B1=20(resizable=20columns)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 每列右边缘 hover 蓝色触控区，拖拽调整宽度
- 宽度持久化 localStorage
- 分割线: border-gray (列间竖线) + border-b-2 (表头底线)
---
 ui/App/views/Mods/components/ModList.jsx | 137 +++++++++++++++++------
 1 file changed, 105 insertions(+), 32 deletions(-)

diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index 01b026ce..a6d08713 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -1,5 +1,5 @@
 import Mod from "./Mod";
-import React, {useState, useMemo} from "react";
+import React, {useState, useMemo, useCallback, useRef, useEffect} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faCheck, faTimes, faToggleOff, faToggleOn, faSort, faSortUp, faSortDown, faCog} from "@fortawesome/free-solid-svg-icons";
 import { useTranslation } from 'react-i18next';
@@ -7,27 +7,32 @@ import { useTranslation } from 'react-i18next';
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
 const COLUMNS = [
-    { key: 'compatibility', label: 'Compatibility', default: true, sortable: true, sortKey: 'compatibility' },
-    { key: 'enabled',       label: 'Enabled',       default: true, sortable: true, sortKey: 'enabled' },
-    { key: 'name',          label: 'Name',          default: true, sortable: true, sortKey: 'title' },
-    { key: 'version',       label: 'Mod Version',   default: true, sortable: true, sortKey: 'version' },
-    { key: 'factorio',      label: 'Factorio Version', default: true, sortable: false },
-    { key: 'size',          label: 'File Size',     default: false, sortable: true, sortKey: 'file_size' },
+    { key: 'compatibility', label: 'Compatibility', default: true, sortable: true, sortKey: 'compatibility', width: 80 },
+    { key: 'enabled',       label: 'Enabled',       default: true, sortable: true, sortKey: 'enabled',       width: 70 },
+    { key: 'name',          label: 'Name',          default: true, sortable: true, sortKey: 'title',         width: 0 },
+    { key: 'version',       label: 'Mod Version',   default: true, sortable: true, sortKey: 'version',       width: 100 },
+    { key: 'factorio',      label: 'Factorio Version', default: true, sortable: false,                       width: 140 },
+    { key: 'size',          label: 'File Size',     default: false, sortable: true, sortKey: 'file_size',    width: 80 },
 ];
 
+const loadWidths = () => {
+    try { return JSON.parse(localStorage.getItem('modlist_widths') || '{}'); } catch { return {}; }
+};
+const saveWidths = (w) => localStorage.setItem('modlist_widths', JSON.stringify(w));
+
 const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
 
     const { t } = useTranslation('mods');
     const [sortCol, setSortCol] = useState(null);
     const [sortDir, setSortDir] = useState('asc');
+    const [colWidths, setColWidths] = useState(loadWidths);
     const [visibleCols, setVisibleCols] = useState(() => {
         const saved = localStorage.getItem('modlist_cols');
-        if (saved) {
-            try { return JSON.parse(saved); } catch {}
-        }
+        if (saved) { try { return JSON.parse(saved); } catch {} }
         return COLUMNS.filter(c => c.default).map(c => c.key);
     });
     const [showSettings, setShowSettings] = useState(false);
+    const [resizing, setResizing] = useState(null);
 
     const dlcMods = mods.filter(m => DLC_MODS.has(m.name));
     const regularMods = mods.filter(m => !DLC_MODS.has(m.name));
@@ -49,12 +54,8 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
     }, [regularMods, sortCol, sortDir]);
 
     const handleSort = (colKey) => {
-        if (sortCol === colKey) {
-            setSortDir(d => d === 'asc' ? 'desc' : 'asc');
-        } else {
-            setSortCol(colKey);
-            setSortDir('asc');
-        }
+        if (sortCol === colKey) { setSortDir(d => d === 'asc' ? 'desc' : 'asc'); }
+        else { setSortCol(colKey); setSortDir('asc'); }
     };
 
     const toggleCol = (key) => {
@@ -65,6 +66,32 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
         });
     };
 
+    const onResizeStart = useCallback((e, colKey) => {
+        e.preventDefault();
+        const startX = e.clientX;
+        const startWidth = colWidths[colKey] || COLUMNS.find(c => c.key === colKey)?.width || 100;
+        setResizing({ colKey, startX, startWidth });
+    }, [colWidths]);
+
+    useEffect(() => {
+        if (!resizing) return;
+        const onMove = (e) => {
+            const diff = e.clientX - resizing.startX;
+            const newWidth = Math.max(40, resizing.startWidth + diff);
+            setColWidths(prev => ({ ...prev, [resizing.colKey]: newWidth }));
+        };
+        const onUp = () => {
+            setColWidths(prev => { saveWidths(prev); return prev; });
+            setResizing(null);
+        };
+        document.addEventListener('mousemove', onMove);
+        document.addEventListener('mouseup', onUp);
+        return () => {
+            document.removeEventListener('mousemove', onMove);
+            document.removeEventListener('mouseup', onUp);
+        };
+    }, [resizing]);
+
     const toggleDLC = () => {
         dlcMods.forEach(m => {
             if (dlcEnabled === m.enabled) toggleMod(m.name);
@@ -72,10 +99,11 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
     };
 
     const SortIcon = ({colKey}) => {
-        if (sortCol !== colKey) return <FontAwesomeIcon icon={faSort} className="ml-1 text-gray-light opacity-50"/>;
+        if (sortCol !== colKey) return <FontAwesomeIcon icon={faSort} className="ml-1 text-gray opacity-40"/>;
         return <FontAwesomeIcon icon={sortDir === 'asc' ? faSortUp : faSortDown} className="ml-1"/>;
     };
 
+    const getWidth = (col) => colWidths[col.key] || col.width || undefined;
     const vis = (key) => visibleCols.includes(key);
 
     return (
@@ -96,23 +124,68 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                     </div>
                 )}
             </div>
-            <table className="w-full">
+            <table className="w-full" style={{ tableLayout: 'fixed' }}>
+                <colgroup>
+                    {vis('compatibility') && <col style={{ width: getWidth(COLUMNS[0]) }}/>}
+                    {vis('enabled') && <col style={{ width: getWidth(COLUMNS[1]) }}/>}
+                    {vis('name') && <col/>}
+                    {vis('version') && <col style={{ width: getWidth(COLUMNS[3]) }}/>}
+                    {vis('factorio') && <col style={{ width: getWidth(COLUMNS[4]) }}/>}
+                    {vis('size') && <col style={{ width: getWidth(COLUMNS[5]) }}/>}
+                    <col style={{ width: 30 }}/>
+                </colgroup>
                 <thead>
-                    <tr className="text-left py-1 border-b border-gray-medium">
-                        {vis('compatibility') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('compatibility')}>{t('Compatibility')}<SortIcon colKey="compatibility"/></th>}
-                        {vis('enabled') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('enabled')}>{t('Enabled')}<SortIcon colKey="enabled"/></th>}
-                        {vis('name') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('name')}>{t('Name')}<SortIcon colKey="name"/></th>}
-                        {vis('version') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('version')}>{t('Mod Version')}<SortIcon colKey="version"/></th>}
-                        {vis('factorio') && <th className="border-r border-gray-medium px-2">{t('Factorio Version')}</th>}
-                        {vis('size') && <th className="cursor-pointer select-none border-r border-gray-medium px-2" onClick={() => handleSort('size')}>{t('File Size')}<SortIcon colKey="size"/></th>}
+                    <tr className="text-left border-b-2 border-gray">
+                        {vis('compatibility') && (
+                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('compatibility')}>
+                                {t('Compatibility')}<SortIcon colKey="compatibility"/>
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'compatibility')}/>
+                            </th>
+                        )}
+                        {vis('enabled') && (
+                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('enabled')}>
+                                {t('Enabled')}<SortIcon colKey="enabled"/>
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'enabled')}/>
+                            </th>
+                        )}
+                        {vis('name') && (
+                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('name')}>
+                                {t('Name')}<SortIcon colKey="name"/>
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'name')}/>
+                            </th>
+                        )}
+                        {vis('version') && (
+                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('version')}>
+                                {t('Mod Version')}<SortIcon colKey="version"/>
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'version')}/>
+                            </th>
+                        )}
+                        {vis('factorio') && (
+                            <th className="px-2 relative border-r border-gray">
+                                {t('Factorio Version')}
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'factorio')}/>
+                            </th>
+                        )}
+                        {vis('size') && (
+                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('size')}>
+                                {t('File Size')}<SortIcon colKey="size"/>
+                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
+                                     onMouseDown={(e) => onResizeStart(e, 'size')}/>
+                            </th>
+                        )}
                         <th style={{width: 30}}/>
                     </tr>
                 </thead>
                 <tbody>
                     {factorioVersion !== null && dlcMods.length > 0 && (
-                        <tr className="py-1 bg-blue-50 hover:bg-blue-100">
-                            {vis('compatibility') && <td className="pr-4"><FontAwesomeIcon className="text-green" icon={faCheck}/></td>}
-                            {vis('enabled') && <td className="pr-4">
+                        <tr className="border-b border-gray-dark bg-blue-50 hover:bg-blue-100">
+                            {vis('compatibility') && <td className="px-2"><FontAwesomeIcon className="text-green" icon={faCheck}/></td>}
+                            {vis('enabled') && <td className="px-2">
                                 {disabled
                                     ? dlcEnabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>
                                     : dlcEnabled
@@ -120,10 +193,10 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                                         : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={toggleDLC}/>
                                 }
                             </td>}
-                            {vis('name') && <td className="pr-4 italic text-blue-600">{t('Space Age DLC')}</td>}
-                            {vis('version') && <td className="pr-4">{dlcMods[0]?.version}</td>}
-                            {vis('factorio') && <td className="pr-4">{dlcMods[0]?.factorio_version}</td>}
-                            {vis('size') && <td className="pr-4 text-gray-light text-sm">-</td>}
+                            {vis('name') && <td className="px-2 italic text-blue-600">{t('Space Age DLC')}</td>}
+                            {vis('version') && <td className="px-2">{dlcMods[0]?.version}</td>}
+                            {vis('factorio') && <td className="px-2">{dlcMods[0]?.factorio_version}</td>}
+                            {vis('size') && <td className="px-2 text-gray-light text-sm">-</td>}
                             <td/>
                         </tr>
                     )}

From 93d6a225e8adfef54930333990fc6396b962c423 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 15:53:26 +0000
Subject: [PATCH 109/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=20=E2=80=94=20?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=8E=92=E5=BA=8F=20+=20=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=20React=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- sort 相等时回退 name→version 二级排序，避免不稳定排序产生重复
- key 改为 file_name 避免同名 mod 键冲突
---
 ui/App/views/Mods/components/ModList.jsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index a6d08713..cbcd9c93 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -49,7 +49,11 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
             if (typeof vb === 'string') vb = vb.toLowerCase();
             if (va == null) return 1;
             if (vb == null) return -1;
-            return va < vb ? -dir : va > vb ? dir : 0;
+            const cmp = va < vb ? -dir : va > vb ? dir : 0;
+            if (cmp !== 0) return cmp;
+            const nameCmp = (a.name || '').localeCompare(b.name || '');
+            if (nameCmp !== 0) return nameCmp;
+            return (a.version || '').localeCompare(b.version || '');
         });
     }, [regularMods, sortCol, sortDir]);
 
@@ -201,7 +205,7 @@ const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpd
                         </tr>
                     )}
                     {factorioVersion !== null && sortedMods.map(mod => (
-                        <Mod mod={mod} key={mod.name}
+                        <Mod mod={mod} key={mod.file_name || mod.name}
                              updateMod={updateMod} toggleMod={toggleMod} deleteMod={deleteMod}
                              addUpdatableMod={addUpdatableMod} factorioVersion={factorioVersion}
                              disabled={disabled} visibleCols={visibleCols} />

From a0272174377dc555d00e77dd3400c38ea89864d5 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 15:57:19 +0000
Subject: [PATCH 110/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20LoadMods=20?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=20=E2=80=94=20=E6=81=A2=E5=A4=8D=20mod=5Fsyn?=
 =?UTF-8?q?c=20=E9=80=89=E6=8B=A9=E6=80=A7=E5=90=8C=E6=AD=A5=20+=20?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/App/views/Mods/components/LoadMods.jsx | 266 +++++++++++++++++-----
 1 file changed, 214 insertions(+), 52 deletions(-)

diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 331c3527..09afcdb8 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,83 +1,245 @@
 import React, {useEffect, useState} from "react";
 import savesResource from "../../../../api/resources/saves";
-import Select from "../../../components/Select";
 import Label from "../../../components/Label";
-import {useForm} from "react-hook-form";
 import Button from "../../../components/Button";
 import modsResource from "../../../../api/resources/mods";
-import modResource from "../../../../api/resources/mods";
 import FactorioLogin from "./AddMod/components/FactorioLogin";
-import ConfirmDialog from "../../../components/ConfirmDialog";
+import socket from "../../../../api/socket";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {useTranslation} from "react-i18next";
+import {faSpinner, faCheck, faTimes, faMinusCircle} from "@fortawesome/free-solid-svg-icons";
 
-const LoadMods = ({refreshMods}) => {
+const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
+const STATUS_ICON = {
+    downloading:   <FontAwesomeIcon icon={faSpinner} spin={true} className="text-orange"/>,
+    downloaded:    <FontAwesomeIcon icon={faCheck} className="text-green"/>,
+    installed:     <FontAwesomeIcon icon={faCheck} className="text-green"/>,
+    wrong_version: <FontAwesomeIcon icon={faCheck} className="text-yellow-500"/>,
+    missing:       <FontAwesomeIcon icon={faTimes} className="text-red"/>,
+    builtin:       <FontAwesomeIcon icon={faMinusCircle} className="text-blue-400"/>,
+    not_found:     <FontAwesomeIcon icon={faTimes} className="text-red"/>,
+};
+
+const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
+    const {t} = useTranslation('mods');
     const [saves, setSaves] = useState([]);
-    const {register, reset, handleSubmit} = useForm();
+    const [selectedSave, setSelectedSave] = useState("");
     const [isLoading, setIsLoading] = useState(false);
+    const [isSyncing, setIsSyncing] = useState(false);
     const [isDisabled, setIsDisabled] = useState(true);
-    const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
-    const [loadModsData, setLoadModsData] = useState(undefined);
+    const [modRows, setModRows] = useState([]);
+    const [checkedMods, setCheckedMods] = useState({});
+    const [syncError, setSyncError] = useState(null);
+    const [currentMod, setCurrentMod] = useState(null);
+    const [warning, setWarning] = useState(null);
 
     useEffect(() => {
         (async () => {
-            setIsFactorioAuthenticated(await modResource.portal.status())
-
-            const s = await savesResource.list()
+            if (!isFactorioAuthenticated) {
+                setIsFactorioAuthenticated(await modsResource.portal.status());
+            }
+            const s = await savesResource.list();
             setSaves(s);
             if (s.length > 0) {
                 setIsDisabled(false);
+                setSelectedSave(s[0].name);
             }
-            reset();
         })();
     }, []);
 
-    const loadModsRequested = data => {
+    useEffect(() => {
+        const handler = (message) => {
+            const data = JSON.parse(message);
+            if (data.status === "progress") {
+                setCurrentMod(data.mod);
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "downloading"} : r
+                ));
+            } else if (data.status === "done") {
+                setIsSyncing(false);
+                setCurrentMod(null);
+                setWarning(data.warning || null);
+                if (data.mods) {
+                    setModRows(data.mods);
+                    setCheckedMods({});
+                }
+                refreshMods();
+            } else if (data.status === "error") {
+                setIsSyncing(false);
+                setCurrentMod(null);
+                setSyncError(data.message);
+            }
+        };
+
+        socket.on('mods_sync', handler);
+        socket.emit('mods sync subscribe');
+        return () => {
+            socket.off('mods_sync', handler);
+            socket.emit('mods sync unsubscribe');
+        };
+    }, []);
+
+    const onReadSave = async () => {
+        if (!selectedSave) return;
         setIsLoading(true);
-        setLoadModsData(data);
-    }
+        setModRows([]);
+        setCheckedMods({});
+        setSyncError(null);
+        setWarning(null);
 
-    const loadMods = async data => {
-        await modResource.deleteAll();
-        const {mods} = await savesResource.mods(data.save).catch(() => {
+        try {
+            const mods = await modsResource.getFromSave(selectedSave);
+            setModRows(mods || []);
+            const checked = {};
+            (mods || []).forEach(m => {
+                if (m.status === 'missing' || m.status === 'wrong_version') {
+                    checked[m.name] = true;
+                }
+            });
+            setCheckedMods(checked);
+        } catch(e) {
+            setSyncError(t('failedToReadSave') + ': ' + e.message);
+        } finally {
             setIsLoading(false);
-            setLoadModsData(undefined);
+        }
+    };
+
+    const onSync = async () => {
+        const toSync = Object.keys(checkedMods).filter(k => checkedMods[k]);
+        if (toSync.length === 0) return;
+
+        setIsSyncing(true);
+        setSyncError(null);
+        try {
+            await modsResource.syncFromSave(selectedSave, toSync);
+        } catch (e) {
+            setSyncError(t('failedToStartSync') + ': ' + e.message);
+            setIsSyncing(false);
+        }
+    };
+
+    const selectMissing = () => {
+        const checked = {};
+        modRows.forEach(m => {
+            if (m.status !== 'builtin' && m.status !== 'installed') {
+                checked[m.name] = true;
+            }
         });
+        setCheckedMods(checked);
+    };
 
-        await modResource.portal.installMultiple(mods)
-            .then(() => {
-                refreshMods();
-                window.flash(`Mods are loaded from save file ${data.save}.`, "green");
-            }).finally(() => {
-                setIsLoading(false);
-                setLoadModsData(undefined);
-            });
+    const clearAll = () => setCheckedMods({});
+
+    const checkedCount = Object.values(checkedMods).filter(Boolean).length;
+
+    if (!isFactorioAuthenticated) {
+        return <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>;
     }
 
-    return isFactorioAuthenticated
-        ? <form onSubmit={handleSubmit(loadModsRequested)}>
-            <Label text="Save" htmlFor="save"/>
-            <Select
-                register={register('save')}
-                className="mb-4"
+    return (
+        <div>
+            <Label text={t('save')} htmlFor="save"/>
+            <select
+                className="shadow appearance-none border w-full py-2 px-3 text-black mb-4"
                 disabled={isDisabled}
-                options={saves?.map(save => new Object({
-                    name: save.name,
-                    value: save.name
-                }))}
-            />
-            <Button isSubmit={true} isDisabled={isDisabled} isLoading={isLoading}>Load</Button>
-            <ConfirmDialog
-                title="Load Mods from Save"
-                content={`Loading the Mods from Save "${loadModsData?.save}" will remove all currently installed Mods.`}
-                isOpen={loadModsData !== undefined}
-                close={() => {
-                    setIsLoading(false);
-                    setLoadModsData(undefined);
-                }}
-                onSuccess={() => loadMods(loadModsData)}
-            />
-        </form>
-        : <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>
-}
+                value={selectedSave}
+                onChange={e => { setSelectedSave(e.target.value); setModRows([]); setCheckedMods({}); }}
+            >
+                {saves?.map(save => (
+                    <option key={save.name} value={save.name}>{save.name}</option>
+                ))}
+            </select>
+
+            <Button
+                isDisabled={isDisabled || isLoading}
+                isLoading={isLoading}
+                onClick={onReadSave}
+                className="mr-2"
+            >
+                {t('readModsFromSave')}
+            </Button>
+
+            {syncError && (
+                <div className="mt-4 p-3 bg-red-100 text-red font-bold">
+                    ⚠ {syncError}
+                </div>
+            )}
+
+            {warning && (
+                <div className="mt-4 p-3 bg-yellow-100 text-yellow-800">
+                    ⚠ {warning}
+                </div>
+            )}
+
+            {modRows.length > 0 && (
+                <div className="mt-4">
+                    <div className="flex mb-2 gap-2">
+                        <Button size="sm" onClick={selectMissing}>{t('selectMissing')}</Button>
+                        <Button size="sm" onClick={clearAll}>{t('clearSelection')}</Button>
+                        <Button
+                            size="sm"
+                            isDisabled={checkedCount === 0 || isSyncing}
+                            isLoading={isSyncing}
+                            onClick={onSync}
+                        >
+                            {t('syncSelected')} ({checkedCount})
+                        </Button>
+                    </div>
+
+                    {currentMod && (
+                        <div className="mb-2 text-sm text-orange">
+                            <FontAwesomeIcon icon={faSpinner} spin={true} className="mr-2"/>
+                            {t('downloadingStatus')}: {currentMod}
+                        </div>
+                    )}
+
+                    <table className="w-full text-sm">
+                        <thead>
+                            <tr className="border-b font-bold">
+                                <td className="py-1 pr-2 w-6"></td>
+                                <td className="py-1 pr-4">{t('mod')}</td>
+                                <td className="py-1 pr-4">{t('required')}</td>
+                                <td className="py-1 pr-4">{t('installed')}</td>
+                                <td className="py-1">{t('status')}</td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {modRows.map(mod => (
+                                <tr key={mod.name} className="border-b">
+                                    <td className="py-1 pr-2">
+                                        {mod.status === 'builtin' ? null : (
+                                            <input
+                                                type="checkbox"
+                                                checked={!!checkedMods[mod.name]}
+                                                onChange={() => {
+                                                    setCheckedMods(prev => ({
+                                                        ...prev,
+                                                        [mod.name]: !prev[mod.name]
+                                                    }));
+                                                }}
+                                            />
+                                        )}
+                                    </td>
+                                    <td className="py-1 pr-4">
+                                        {mod.name}
+                                        {DLC_MODS.has(mod.name) && (
+                                            <span className="ml-1 text-xs text-blue-600">DLC</span>
+                                        )}
+                                    </td>
+                                    <td className="py-1 pr-4">{mod.version_required || mod.version}</td>
+                                    <td className="py-1 pr-4">{mod.version_installed || '-'}</td>
+                                    <td className="py-1">
+                                        {STATUS_ICON[mod.status] || mod.status}
+                                    </td>
+                                </tr>
+                            ))}
+                        </tbody>
+                    </table>
+                </div>
+            )}
+        </div>
+    );
+};
 
 export default LoadMods;

From 73326a95c43e78b580139cad275ef09f4d97621e Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Wed, 24 Jun 2026 16:01:16 +0000
Subject: [PATCH 111/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E6=93=8D=E4=BD=9C=E4=BA=92=E6=96=A5=E9=94=81=20?=
 =?UTF-8?q?=E2=80=94=20=E9=98=B2=E6=AD=A2=E5=86=B2=E7=AA=81=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- isBusy 状态来自父组件，同步中/删除中/更新中任一为真
- isBusy 状态下禁用全部模组操作（安装/上传/同步/删除/切换）
- 开服状态下仍独立阻止模组操作
- LoadMods 同步状态传递到父组件级联锁
---
 ui/App/views/Mods/Mods.jsx                | 13 ++++++++-----
 ui/App/views/Mods/components/LoadMods.jsx |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index 45e4a01c..f00ee1bf 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -32,6 +32,7 @@ const Mods = ({serverStatus}) => {
     const [showDeleteAllConfirm, setShowDeleteAllConfirm] = useState(false);
     const [isFactorioAuthenticated, setIsFactorioAuthenticated] = useState(false);
     const [authChecked, setAuthChecked] = useState(false);
+    const [isSyncing, setIsSyncing] = useState(false);
 
     const addUpdatableMod = mod => {
         setUpdatableMods(mods => {
@@ -131,10 +132,11 @@ const Mods = ({serverStatus}) => {
     }
 
     let disabled = serverStatus.running
+    let isBusy = disabled || isDeletingAllMods || isUpdatingAllMods || isSyncing
 
     return (
         <div>
-            {disabled ?
+            {isBusy ?
                 <Panel className="mb-6"
                        content={
                             <div className="text-red font-bold text-xl">
@@ -165,7 +167,8 @@ const Mods = ({serverStatus}) => {
                             <Tab title={t('loadModsFromSave')}>
                                 <LoadMods refreshMods={fetchInstalledMods}
                                           isFactorioAuthenticated={isFactorioAuthenticated}
-                                          setIsFactorioAuthenticated={setIsFactorioAuthenticated} />
+                                          setIsFactorioAuthenticated={setIsFactorioAuthenticated}
+                                          setIsSyncing={setIsSyncing} />
                             </Tab>
                         </TabControl>
                     </div>
@@ -186,12 +189,12 @@ const Mods = ({serverStatus}) => {
                 }
                 actions={
                     <>
-                        {
-                            !disabled &&
+                         {
+                            !isBusy &&
                             <Button size="sm" className="mr-2" isLoading={isUpdatingAllMods}
                                     onClick={updateAllMods}>{t('updateAllMods')}</Button>
                         }
-                        {!disabled ? (
+                        {!isBusy ? (
                             <>
                                 <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
                                    href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 09afcdb8..29512998 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -21,7 +21,7 @@ const STATUS_ICON = {
     not_found:     <FontAwesomeIcon icon={faTimes} className="text-red"/>,
 };
 
-const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated}) => {
+const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated, setIsSyncing}) => {
     const {t} = useTranslation('mods');
     const [saves, setSaves] = useState([]);
     const [selectedSave, setSelectedSave] = useState("");
@@ -58,6 +58,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                 ));
             } else if (data.status === "done") {
                 setIsSyncing(false);
+                if (setIsSyncing) setIsSyncing(false);
                 setCurrentMod(null);
                 setWarning(data.warning || null);
                 if (data.mods) {
@@ -67,6 +68,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                 refreshMods();
             } else if (data.status === "error") {
                 setIsSyncing(false);
+                if (setIsSyncing) setIsSyncing(false);
                 setCurrentMod(null);
                 setSyncError(data.message);
             }
@@ -110,6 +112,7 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
         if (toSync.length === 0) return;
 
         setIsSyncing(true);
+        if (setIsSyncing) setIsSyncing(true);
         setSyncError(null);
         try {
             await modsResource.syncFromSave(selectedSave, toSync);

From c465db554d540b24373f7f0e8f942baaacc6c6e4 Mon Sep 17 00:00:00 2001
From: BAYUNZIYUE <BAYUNZIYUE@users.noreply.github.com>
Date: Thu, 2 Jul 2026 15:30:58 +0000
Subject: [PATCH 112/112] =?UTF-8?q?=E5=8A=9F=E8=83=BD:=20mod=20=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=8F=96=E6=B6=88=20+=20ModList=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E9=87=8D=E5=86=99=20+=20EventLog=20+=20=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ROADMAP.md                                |  27 ++
 package-lock.json                         |  51 ++-
 package.json                              |  16 +-
 src/api/mods_handler.go                   |  35 +-
 src/api/routes.go                         |   8 +-
 src/factorio/mod_Mods.go                  |   6 +-
 src/factorio/mod_modInfo.go               |   4 +-
 src/factorio/mod_modSimple.go             |  14 +-
 src/factorio/mod_sync.go                  | 242 +++++++----
 src/factorio/version_manager.go           | 103 +++--
 ui/App/App.jsx                            |   4 +-
 ui/App/components/ConfirmDialog.jsx       |   4 +-
 ui/App/components/Layout.jsx              |   4 +-
 ui/App/components/Modal.jsx               |  18 +-
 ui/App/components/Panel.jsx               |   8 +-
 ui/App/components/Tabs/TabControl.jsx     |  10 +-
 ui/App/eventLog.js                        |  46 +++
 ui/App/locales/zh-controls.json           |   8 +-
 ui/App/locales/zh-mods.json               |  15 +-
 ui/App/locales/zh-serverSettings.json     |   2 +-
 ui/App/locales/zh-serverVersion.json      |   2 +-
 ui/App/locales/zh.json                    |   4 +-
 ui/App/views/Console.jsx                  | 110 ++---
 ui/App/views/Controls.jsx                 | 260 ++++++++----
 ui/App/views/EventLog.jsx                 |  98 +++++
 ui/App/views/GameSettings.jsx             |  55 ---
 ui/App/views/Mods/Mods.jsx                |  64 ++-
 ui/App/views/Mods/components/LoadMods.jsx | 301 +++++++++++++-
 ui/App/views/Mods/components/Mod.jsx      | 289 +++++++------
 ui/App/views/Mods/components/ModList.jsx  | 477 ++++++++++++++--------
 ui/api/client.js                          |   5 +-
 ui/api/resources/mods.js                  |  31 +-
 ui/api/socket.js                          | 150 +++----
 ui/index.js                               |   6 +-
 34 files changed, 1661 insertions(+), 816 deletions(-)
 create mode 100644 ui/App/eventLog.js
 create mode 100644 ui/App/views/EventLog.jsx
 delete mode 100644 ui/App/views/GameSettings.jsx

diff --git a/ROADMAP.md b/ROADMAP.md
index a066617c..e265eb50 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -23,6 +23,33 @@
 - [x] Auth gate preventing login form flash
 - [x] 401 auto-redirect to login page
 
+## 📂 Worktree 隔离开发
+
+```
+主目录:    /workspace/projects/factorio-server-manager-joey       (当前功能)
+参考目录:  /workspace/projects/factorio-server-manager-develop    (joey/develop)
+
+新功能:
+  git worktree add ../factorio-server-manager-<slug> -b feat/<slug>
+  cd ../factorio-server-manager-<slug>
+  # 开发、构建、测试...
+  # 完成后: git push && git worktree remove ../factorio-server-manager-<slug>
+```
+
+## 🧪 测试流程（每次改动必做）
+
+修改代码后，必须闭环验证以下步骤：
+
+1. **构建**: `npm run build && go build`
+2. **部署**: `cp -r app/* /home/game/fsm/app/ && cp factorio-server-manager /home/game/fsm/`
+3. **重启**: `kill $(pgrep factorio-server); cd /home/game/fsm && setsid ./factorio-server-manager ...`
+4. **登录**: Playwright 打开 `/login` → 输入凭据 → 确认跳转到主页
+5. **功能页**: 导航到改动的页面，等待 15 秒
+6. **检查**: 控制台 0 个 JS Error，页面正常渲染
+7. **交互**: 点击/拖拽核心功能，确认不崩溃
+
+> 每次提交前跑一遍，不允许「改完就提交」。
+
 ## 🚧 Planned
 
 ### Mods
diff --git a/package-lock.json b/package-lock.json
index 073aa378..f13ea7e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "@fortawesome/fontawesome-svg-core": "^6.4.2",
         "@fortawesome/free-solid-svg-icons": "^6.4.2",
         "@fortawesome/react-fontawesome": "^0.2.0",
+        "@tanstack/react-table": "^8.21.3",
         "axios": "^1.6.0",
         "fuse.js": "^7.0.0",
         "i18next": "^25.5.2",
@@ -2159,6 +2160,39 @@
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
       "dev": true
     },
+    "node_modules/@tanstack/react-table": {
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
+      "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/table-core": "8.21.3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
+    "node_modules/@tanstack/table-core": {
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+      "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -5468,7 +5502,6 @@
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
       "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -5837,7 +5870,6 @@
       "version": "0.23.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
       "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
@@ -8106,6 +8138,19 @@
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
       "dev": true
     },
+    "@tanstack/react-table": {
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
+      "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==",
+      "requires": {
+        "@tanstack/table-core": "8.21.3"
+      }
+    },
+    "@tanstack/table-core": {
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+      "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="
+    },
     "@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -10391,7 +10436,6 @@
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
       "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -10628,7 +10672,6 @@
       "version": "0.23.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
       "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.1.0"
       }
diff --git a/package.json b/package.json
index 1a881193..a6497036 100644
--- a/package.json
+++ b/package.json
@@ -56,18 +56,16 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
+    "@tanstack/react-table": "^8.21.3",
     "axios": "^1.6.0",
     "fuse.js": "^7.0.0",
-    "i18next": "^26.3.1",
-    "i18next-browser-languagedetector": "^8.2.1",
+    "i18next": "^25.5.2",
+    "i18next-browser-languagedetector": "^8.2.0",
+    "i18next-http-backend": "^3.0.2",
     "react-hook-form": "^7.47.0",
-    "react-i18next": "^17.0.8",
+    "react-i18next": "^15.7.3",
     "regenerator-runtime": "^0.14.0",
     "semver": "^7.3.7",
-    "tailwindcss": "^3.3.5",
-    "i18next": "^25.5.2",
-    "react-i18next": "^15.7.3",
-    "i18next-http-backend": "^3.0.2",
-    "i18next-browser-languagedetector": "^8.2.0"
+    "tailwindcss": "^3.3.5"
   }
-}
\ No newline at end of file
+}
diff --git a/src/api/mods_handler.go b/src/api/mods_handler.go
index eb314b44..b6bb0546 100644
--- a/src/api/mods_handler.go
+++ b/src/api/mods_handler.go
@@ -10,11 +10,18 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
 	"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
 	"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
 	"github.com/OpenFactorioServerManager/factorio-server-manager/lockfile"
 )
 
+func broadcastModEvent(evt interface{}) {
+	data, _ := json.Marshal(evt)
+	room := websocket.WebsocketHub.GetRoom("mods_events")
+	room.Send(string(data))
+}
+
 func CreateNewMods(w http.ResponseWriter) (modList factorio.Mods, resp interface{}, err error) {
 	config := bootstrap.GetConfig()
 	modList, err = factorio.NewMods(config.FactorioModsDir)
@@ -127,11 +134,11 @@ func ModDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		log.Println(resp)
 		return
 	}
+	broadcastModEvent(map[string]string{"type": "mod_deleted", "name": data.Name})
 	resp = map[string]string{"status": "ok", "name": data.Name}
 }
 
 func ModDeleteAllHandler(w http.ResponseWriter, r *http.Request) {
-	var err error
 	var resp interface{}
 
 	defer func() {
@@ -140,15 +147,23 @@ func ModDeleteAllHandler(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
 
-	//delete mods folder
-	err = factorio.DeleteAllMods()
-	if err != nil {
+	config := bootstrap.GetConfig()
+
+	mods, listErr := factorio.NewMods(config.FactorioModsDir)
+	if listErr == nil {
+		for _, mod := range mods.ModInfoList.Mods {
+			broadcastModEvent(map[string]string{"type": "mod_deleted", "name": mod.Name})
+		}
+	}
+
+	if err := factorio.DeleteAllMods(); err != nil {
 		resp = fmt.Sprintf("Error deleting all mods: %s", err)
 		log.Println(resp)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
+	broadcastModEvent(map[string]string{"type": "mods_cleared"})
 	resp = nil
 }
 
@@ -386,12 +401,6 @@ func SyncModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if factorio.IsModsSyncing() {
-		w.WriteHeader(http.StatusConflict)
-		resp = "mod sync already in progress"
-		return
-	}
-
 	config := bootstrap.GetConfig()
 	savePath := filepath.Join(config.FactorioSavesDir, syncRequest.Name)
 
@@ -405,6 +414,12 @@ func SyncModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 	resp = map[string]string{"status": "started"}
 }
 
+func CancelModsSyncHandler(w http.ResponseWriter, r *http.Request) {
+	factorio.CancelModsSync()
+	resp := map[string]string{"status": "cancelled"}
+	WriteResponse(w, resp)
+}
+
 func GetModsFromSaveHandler(w http.ResponseWriter, r *http.Request) {
 	var resp interface{}
 	defer func() { WriteResponse(w, resp) }()
diff --git a/src/api/routes.go b/src/api/routes.go
index b70ca4a4..353ba42d 100644
--- a/src/api/routes.go
+++ b/src/api/routes.go
@@ -181,12 +181,18 @@ var apiRoutes = Routes{
 		"/saves/mods/list",
 		GetModsFromSaveHandler,
 		true,
-	}, {
+	}, 	{
 		"SyncModsFromSave",
 		"POST",
 		"/saves/mods/sync",
 		SyncModsFromSaveHandler,
 		true,
+	}, {
+		"CancelModsSync",
+		"POST",
+		"/saves/mods/sync/cancel",
+		CancelModsSyncHandler,
+		false,
 	}, {
 		"LogTail",
 		"GET",
diff --git a/src/factorio/mod_Mods.go b/src/factorio/mod_Mods.go
index c457b925..de1050f5 100644
--- a/src/factorio/mod_Mods.go
+++ b/src/factorio/mod_Mods.go
@@ -74,12 +74,11 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 		result.ModsResult = append(result.ModsResult, modsResult)
 	}
 
-	// Добавляем моды из mod-list.json которых нет как zip (DLC моды)
+	dlcNames := map[string]bool{"elevated-rails": true, "quality": true, "space-age": true}
 	for _, simpleMod := range mods.ModSimpleList.Mods {
-		if simpleMod.Name == "base" {
+		if !dlcNames[simpleMod.Name] {
 			continue
 		}
-		// Проверяем — есть ли уже в результатах
 		found := false
 		for _, r := range result.ModsResult {
 			if r.Name == simpleMod.Name {
@@ -88,7 +87,6 @@ func (mods *Mods) ListInstalledMods() ModsResultList {
 			}
 		}
 		if !found {
-			// DLC мод — только в mod-list.json, без zip
 			var modsResult ModsResult
 			modsResult.Name = simpleMod.Name
 			modsResult.Title = simpleMod.Name
diff --git a/src/factorio/mod_modInfo.go b/src/factorio/mod_modInfo.go
index 10e72a27..221f5afa 100644
--- a/src/factorio/mod_modInfo.go
+++ b/src/factorio/mod_modInfo.go
@@ -172,8 +172,8 @@ func (modInfoList *ModInfoList) deleteMod(modName string) error {
 		}
 	}
 
-	log.Printf("the mod-file for mod %s doesn't exist!", modName)
-	return errors.New("the mod-file for mod " + modName + " doesn't exist!")
+	log.Printf("mod %s not found as zip — nothing to delete", modName)
+	return nil
 }
 
 func (modInfo *ModInfo) getModInfo(reader *zip.Reader) error {
diff --git a/src/factorio/mod_modSimple.go b/src/factorio/mod_modSimple.go
index 4cbb0359..dd4f439d 100644
--- a/src/factorio/mod_modSimple.go
+++ b/src/factorio/mod_modSimple.go
@@ -6,8 +6,11 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"sync"
 )
 
+var modListWriteMu sync.Mutex
+
 type ModSimple struct {
 	Name    string `json:"name"`
 	Enabled bool   `json:"enabled"`
@@ -70,14 +73,15 @@ func (modSimpleList *ModSimpleList) listInstalledMods() error {
 }
 
 func (modSimpleList *ModSimpleList) saveModInfoJson() error {
-	var err error
+	modListWriteMu.Lock()
+	defer modListWriteMu.Unlock()
 
-	//build json of current state
 	newJson, _ := json.MarshalIndent(modSimpleList, "", "    ")
 
-	err = ioutil.WriteFile(modSimpleList.Destination+"/mod-list.json", newJson, 0664)
-	if err != nil {
-		log.Printf("error when writing new mod-list: %s", err)
+	path := modSimpleList.Destination + "/mod-list.json"
+
+	if err := ioutil.WriteFile(path, newJson, 0664); err != nil {
+		log.Printf("error when writing mod-list: %s", err)
 		return err
 	}
 
diff --git a/src/factorio/mod_sync.go b/src/factorio/mod_sync.go
index 84d6fadd..6492182c 100644
--- a/src/factorio/mod_sync.go
+++ b/src/factorio/mod_sync.go
@@ -1,14 +1,19 @@
 package factorio
 
 import (
+	"bytes"
+	"compress/flate"
+	"compress/zlib"
 	"encoding/json"
+	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
-	"bytes"
-	"compress/flate"
-	"compress/zlib"
 	"net/http"
+	"os"
+	"path/filepath"
+	"sync"
 	"sync/atomic"
 
 	"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
@@ -16,11 +21,16 @@ import (
 )
 
 var modsSyncing atomic.Bool
+var modsSyncCancel atomic.Bool
 
 func IsModsSyncing() bool {
 	return modsSyncing.Load()
 }
 
+func CancelModsSync() {
+	modsSyncCancel.Store(true)
+}
+
 type ModSyncResult struct {
 	Name    string `json:"name"`
 	Version string `json:"version"`
@@ -28,14 +38,16 @@ type ModSyncResult struct {
 }
 
 type ModSyncProgress struct {
-	Type    string        `json:"type"`
-	Status  string        `json:"status"`
-	Current int           `json:"current,omitempty"`
-	Total   int           `json:"total,omitempty"`
-	Mod     string        `json:"mod,omitempty"`
-	Message string        `json:"message,omitempty"`
-	Warning string        `json:"warning,omitempty"`
-	Mods    []ModSyncResult `json:"mods,omitempty"`
+	Type       string          `json:"type"`
+	Status     string          `json:"status"`
+	Current    int             `json:"current,omitempty"`
+	Total      int             `json:"total,omitempty"`
+	Mod        string          `json:"mod,omitempty"`
+	Message    string          `json:"message,omitempty"`
+	Warning    string          `json:"warning,omitempty"`
+	Mods       []ModSyncResult `json:"mods,omitempty"`
+	Downloaded int64           `json:"downloaded,omitempty"`
+	Size       int64           `json:"size,omitempty"`
 }
 
 // baseModNames — моды которые есть в любом vanilla + DLC сейве
@@ -84,6 +96,7 @@ func normalizeVersion(v Version) string {
 }
 
 var ErrModNotOnPortal = fmt.Errorf("mod not available on portal (builtin or DLC)")
+var ErrVersionNotFound = fmt.Errorf("requested version not found on portal")
 
 // LevelDatMod хранит мод из level.dat0
 type LevelDatMod struct {
@@ -178,12 +191,9 @@ func getModRelease(modName string, version string) (portalModRelease, error) {
 		Releases []portalModRelease `json:"releases"`
 	}
 	if err := json.Unmarshal(body, &fullInfo); err == nil {
-		// no-category — DLC заглушка без релизов
-		if fullInfo.Category == "no-category" {
+		if fullInfo.Category == "no-category" && len(fullInfo.Releases) == 0 {
 			return portalModRelease{}, ErrModNotOnPortal
 		}
-		// internal без релизов — встроенный DLC (elevated-rails, space-age)
-		// internal с релизами — обычный мод (flib)
 		if fullInfo.Category == "internal" && len(fullInfo.Releases) == 0 {
 			return portalModRelease{}, ErrModNotOnPortal
 		}
@@ -200,6 +210,10 @@ func getModRelease(modName string, version string) (portalModRelease, error) {
 		}
 	}
 
+	if len(info.Releases) > 0 {
+		return info.Releases[0], ErrVersionNotFound
+	}
+
 	return portalModRelease{}, fmt.Errorf("version %s not found for mod %s on portal", version, modName)
 }
 
@@ -213,6 +227,7 @@ func SyncModsFromSave(savePath string, modNames []string) {
 		return
 	}
 	defer modsSyncing.Store(false)
+	modsSyncCancel.Store(false)
 
 	config := bootstrap.GetConfig()
 
@@ -297,78 +312,155 @@ func SyncModsFromSave(savePath string, modNames []string) {
 		return
 	}
 
-	// 5. Качаем недостающие
-	for i, saveMod := range toDownload {
-		wantVersion := normalizeVersion(saveMod.Version)
+	sem := make(chan struct{}, 5)
+	var wg sync.WaitGroup
+	var resultsMu sync.Mutex
+
+	for _, saveMod := range toDownload {
+		saveMod := saveMod
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			defer func() {
+				if r := recover(); r != nil {
+					log.Printf("PANIC in sync goroutine for %s: %v", saveMod.Name, r)
+				}
+			}()
+
+			wantVersion := normalizeVersion(saveMod.Version)
+
+			if baseModNames[saveMod.Name] {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "builtin", Mod: saveMod.Name})
+				return
+			}
 
-		sendSyncProgress(ModSyncProgress{
-			Status:  "progress",
-			Current: i + 1,
-			Total:   total,
-			Mod:     saveMod.Name,
-		})
+			sem <- struct{}{}
+			defer func() { <-sem }()
 
-		// Сначала проверяем локальный список DLC/базовых модов
-		if baseModNames[saveMod.Name] {
-			log.Printf("SyncModsFromSave: %s is builtin/DLC (local list), skipping", saveMod.Name)
-			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
-			continue
-		}
-
-		release, err := getModRelease(saveMod.Name, wantVersion)
-		if err == ErrModNotOnPortal {
-			log.Printf("SyncModsFromSave: %s is builtin/DLC, skipping", saveMod.Name)
-			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
-			continue
-		}
-		if err != nil {
-			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
-			log.Printf("SyncModsFromSave: %s not found on portal: %v", saveMod.Name, err)
-			continue
-		}
+			if modsSyncCancel.Load() {
+				return
+			}
 
-		mods, err = NewMods(config.FactorioModsDir)
-		if err != nil {
-			sendSyncProgress(ModSyncProgress{Status: "error", Message: fmt.Sprintf("cannot refresh mods: %v", err)})
-			return
-		}
+			release, err := getModRelease(saveMod.Name, wantVersion)
+			if err == ErrModNotOnPortal {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "builtin"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "builtin", Mod: saveMod.Name})
+				return
+			}
+			if errors.Is(err, ErrVersionNotFound) {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "version_mismatch"})
+				resultsMu.Unlock()
+				info, _ := json.Marshal(map[string]string{
+					"downloadUrl": release.DownloadURL,
+					"fileName":    release.FileName,
+					"latest":      release.Version,
+				})
+				sendSyncProgress(ModSyncProgress{Status: "version_mismatch", Mod: saveMod.Name, Message: string(info)})
+				return
+			}
+			if err != nil {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "not_found", Mod: saveMod.Name})
+				return
+			}
 
-		if _, err = mods.DownloadMod(release.DownloadURL, release.FileName, saveMod.Name, nil); err != nil {
-			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
-			log.Printf("SyncModsFromSave: download failed for %s: %v", saveMod.Name, err)
-			continue
-		}
+			sendSyncProgress(ModSyncProgress{Status: "progress", Total: total, Mod: saveMod.Name})
 
-		results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "downloaded"})
-		log.Printf("SyncModsFromSave: downloaded %s %s (%d/%d)", saveMod.Name, wantVersion, i+1, total)
-	}
+			cfg := bootstrap.GetConfig()
+			creds := Credentials{}
+			if _, statusErr := creds.Load(); statusErr != nil {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "not_found", Mod: saveMod.Name})
+				return
+			}
 
-	// Обновляем mod-list.json — включаем нужные, выключаем лишние
-	finalMods, err := NewMods(config.FactorioModsDir)
-	if err == nil {
-		// Строим set модов из сейва
-		saveModSet := make(map[string]bool)
-		for _, saveMod := range header.Mods {
-			if saveMod.Name != "base" {
-				saveModSet[saveMod.Name] = true
+			dlURL := "https://mods.factorio.com" + release.DownloadURL + "?username=" + creds.Username + "&token=" + creds.Userkey
+			dlResp, dlErr := http.Get(dlURL)
+			if dlErr != nil {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "not_found", Mod: saveMod.Name})
+				return
 			}
-		}
-		// Включаем моды из сейва, выключаем остальные
-		for i, m := range finalMods.ModSimpleList.Mods {
-			if m.Name == "base" {
-				continue
+			defer dlResp.Body.Close()
+
+			if dlResp.StatusCode != 200 {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "not_found", Mod: saveMod.Name})
+				return
+			}
+
+			filePath := filepath.Join(cfg.FactorioModsDir, release.FileName)
+			FileLock.LockW(filePath)
+			defer FileLock.Unlock(filePath)
+			outFile, createErr := os.Create(filePath)
+			if createErr != nil {
+				resultsMu.Lock()
+				results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "not_found"})
+				resultsMu.Unlock()
+				sendSyncProgress(ModSyncProgress{Status: "not_found", Mod: saveMod.Name})
+				return
 			}
-			if saveModSet[m.Name] {
-				finalMods.ModSimpleList.Mods[i].Enabled = true
+
+			totalSize := dlResp.ContentLength
+			var written int64
+			if totalSize > 0 {
+				buf := make([]byte, 32*1024)
+				for {
+					if modsSyncCancel.Load() {
+						break
+					}
+					n, readErr := dlResp.Body.Read(buf)
+					if n > 0 {
+						_, writeErr := outFile.Write(buf[:n])
+						if writeErr != nil {
+							break
+						}
+						written += int64(n)
+						sendSyncProgress(ModSyncProgress{
+							Status:     "progress",
+							Total:      total,
+							Mod:        saveMod.Name,
+							Downloaded: written,
+							Size:       totalSize,
+						})
+					}
+					if readErr != nil {
+						break
+					}
+				}
 			} else {
-				finalMods.ModSimpleList.Mods[i].Enabled = false
+				written, _ = io.Copy(outFile, dlResp.Body)
 			}
-		}
-		if saveErr := finalMods.ModSimpleList.saveModInfoJson(); saveErr != nil {
-			log.Printf("SyncModsFromSave: error saving mod-list.json: %v", saveErr)
-		}
+			outFile.Close()
+
+			resultsMu.Lock()
+			results = append(results, ModSyncResult{Name: saveMod.Name, Version: wantVersion, Status: "downloaded"})
+			resultsMu.Unlock()
+			log.Printf("SyncModsFromSave: downloaded %s %s", saveMod.Name, wantVersion)
+
+			sendSyncProgress(ModSyncProgress{
+				Status: "downloaded",
+				Mod:    saveMod.Name,
+			})
+		}()
 	}
 
+	wg.Wait()
+
 	sendSyncProgress(ModSyncProgress{Status: "done", Total: total, Mods: results, Warning: vanillaWarning})
 }
 
diff --git a/src/factorio/version_manager.go b/src/factorio/version_manager.go
index 2b0444cd..3cf6c76f 100644
--- a/src/factorio/version_manager.go
+++ b/src/factorio/version_manager.go
@@ -37,14 +37,76 @@ type VersionManager struct {
 	Credentials    *Credentials
 }
 
-func (vm *VersionManager) GetCurrentVersion() (string, error) {
-	cmd := exec.Command(vm.FactorioBinary, "--version")
+func checkBinaryVersion(binPath string) (string, error) {
+	info, err := os.Stat(binPath)
+	if err != nil {
+		return "", fmt.Errorf("failed to stat binary: %w", err)
+	}
+	src, err := os.Open(binPath)
+	if err != nil {
+		return "", fmt.Errorf("failed to open binary: %w", err)
+	}
+	defer src.Close()
+
+	tmpFile, err := os.CreateTemp("", "factorio-version-*")
+	if err != nil {
+		return "", fmt.Errorf("failed to create temp file: %w", err)
+	}
+	tmpPath := tmpFile.Name()
+	defer os.Remove(tmpPath)
+
+	if _, err := io.Copy(tmpFile, src); err != nil {
+		tmpFile.Close()
+		return "", fmt.Errorf("failed to copy binary: %w", err)
+	}
+	tmpFile.Close()
+	src.Close()
+
+	if err := os.Chmod(tmpPath, info.Mode()); err != nil {
+		return "", fmt.Errorf("failed to chmod temp binary: %w", err)
+	}
+
+	cmd := exec.Command(tmpPath, "--version")
 	output, err := cmd.Output()
 	if err != nil {
-		return "", fmt.Errorf("failed to get current version: %w", err)
+		return "", fmt.Errorf("failed to read version: %w", err)
 	}
-	line := string(output)
-	return parseVersionLine(line)
+	return parseVersionLine(string(output))
+}
+
+func (vm *VersionManager) GetCurrentVersion() (string, error) {
+	return checkBinaryVersion(vm.FactorioBinary)
+}
+
+func RefreshServerVersion() error {
+	server := GetFactorioServer()
+	config := bootstrap.GetConfig()
+
+	ver, err := checkBinaryVersion(config.FactorioBinary)
+	if err != nil {
+		return fmt.Errorf("failed to read version: %w", err)
+	}
+
+	reg := regexp.MustCompile("Version.*?((\\d+\\.)?(\\d+\\.)?(\\*|\\d+)+)")
+	found := reg.FindStringSubmatch(ver)
+	if len(found) < 2 {
+		return fmt.Errorf("could not parse version from: %s", ver)
+	}
+
+	if err := server.Version.UnmarshalText([]byte(found[1])); err != nil {
+		return fmt.Errorf("could not parse version: %w", err)
+	}
+
+	baseModInfoFile := filepath.Join(config.FactorioBaseModDir, "info.json")
+	bmifBa, err := ioutil.ReadFile(baseModInfoFile)
+	if err == nil {
+		var modInfo ModInfo
+		if err := json.Unmarshal(bmifBa, &modInfo); err == nil {
+			server.BaseModVersion = modInfo.Version
+		}
+	}
+
+	return nil
 }
 
 func (vm *VersionManager) GetAvailableVersions() ([]Release, error) {
@@ -207,37 +269,6 @@ func (pr *ProgressReader) Read(p []byte) (int, error) {
 	return n, err
 }
 
-func RefreshServerVersion() error {
-	server := GetFactorioServer()
-	config := bootstrap.GetConfig()
-
-	out, err := exec.Command(config.FactorioBinary, "--version").Output()
-	if err != nil {
-		return fmt.Errorf("failed to read version: %w", err)
-	}
-
-	reg := regexp.MustCompile("Version.*?((\\d+\\.)?(\\d+\\.)?(\\*|\\d+)+)")
-	found := reg.FindStringSubmatch(string(out))
-	if len(found) < 2 {
-		return fmt.Errorf("could not parse version from: %s", string(out))
-	}
-
-	if err := server.Version.UnmarshalText([]byte(found[1])); err != nil {
-		return fmt.Errorf("could not parse version: %w", err)
-	}
-
-	baseModInfoFile := filepath.Join(config.FactorioBaseModDir, "info.json")
-	bmifBa, err := ioutil.ReadFile(baseModInfoFile)
-	if err == nil {
-		var modInfo ModInfo
-		if err := json.Unmarshal(bmifBa, &modInfo); err == nil {
-			server.BaseModVersion = modInfo.Version
-		}
-	}
-
-	return nil
-}
-
 func NewVersionManager() *VersionManager {
 	config := bootstrap.GetConfig()
 	var creds Credentials
diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index e0952e64..e25908d8 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -12,10 +12,10 @@ import server from "../api/resources/server";
 import Mods from "./views/Mods/Mods";
 import UserManagement from "./views/UserManagement/UserManagment";
 import ServerSettings from "./views/ServerSettings";
-import GameSettings from "./views/GameSettings";
 import Console from "./views/Console";
 import Help from "./views/Help";
 import ServerVersion from "./views/ServerVersion";
+import EventLog from "./views/EventLog";
 import socket from "../api/socket";
 import "./i18n";
 import {Flash} from "./components/Flash";
@@ -66,12 +66,12 @@ const App = () => {
                         <Route path="saves" element={<Saves serverStatus={serverStatus}/>}/>
                         <Route path="mods" element={<Mods serverStatus={serverStatus}/>}/>
                         <Route path="server-settings" element={<ServerSettings serverStatus={serverStatus}/>}/>
-                        <Route path="game-settings" element={<GameSettings serverStatus={serverStatus}/>}/>
                         <Route path="console" element={<Console serverStatus={serverStatus}/>}/>
                         <Route path="logs" element={<Logs serverStatus={serverStatus}/>}/>
                         <Route path="user-management" element={<UserManagement serverStatus={serverStatus}/>}/>
                         <Route path="help" element={<Help serverStatus={serverStatus}/>}/>
                         <Route path="server-version" element={<ServerVersion serverStatus={serverStatus}/>}/>
+                        <Route path="event-log" element={<EventLog/>}/>
                     </Route>
                 </Route>
             </Routes>
diff --git a/ui/App/components/ConfirmDialog.jsx b/ui/App/components/ConfirmDialog.jsx
index 124a552d..16717579 100644
--- a/ui/App/components/ConfirmDialog.jsx
+++ b/ui/App/components/ConfirmDialog.jsx
@@ -26,13 +26,13 @@ function ConfirmDialog({title, content, isOpen, close, onSuccess, closeImmediate
         <Modal
             title={title}
             content={content}
+            isOpen={isOpen}
             actions={
                 <>
-                    <Button size="sm" type="danger" className="mr-2" onClick={close}>{t('cancel')}</Button>
+                    <Button size="sm" onClick={close}>{t('cancel')}</Button>
                     <Button size="sm" isLoading={isLoading} type="success" onClick={confirm}>{t('confirm')}</Button>
                 </>
             }
-            isOpen={isOpen}
         />
     );
 }
diff --git a/ui/App/components/Layout.jsx b/ui/App/components/Layout.jsx
index 0d5d8628..96239be0 100644
--- a/ui/App/components/Layout.jsx
+++ b/ui/App/components/Layout.jsx
@@ -77,7 +77,6 @@ const Layout = ({handleLogout, serverStatus}) => {
                             <Link to="/mods">{t("mods.title")}</Link>
                             <Link to="/server-version">{t("serverVersion.title")}</Link>
                             <Link to="/server-settings">{t("server_settings.title")}</Link>
-                            <Link to="/game-settings">{t("game_settings.title")}</Link>
                             <Link to="/console">{t("console.title")}</Link>
                         </div>
                     </div>
@@ -86,7 +85,8 @@ const Layout = ({handleLogout, serverStatus}) => {
                         <div className="text-white text-center rounded-sm bg-black shadow-inner mx-4 p-1">
                             <Link to="/user-management">{t("users.title")}</Link>
                             <Button className="w-full mb-1" onClick={() => setIsChangingLang(true)}>{t("lang")}</Button>
-                            <Link to="/help" last={true}>{t("help.title")}</Link>
+                            <Link to="/help">{t("help.title")}</Link>
+                            <Link to="/event-log" last={true}>事件日志</Link>
                             <ChangeLangDialog
                                 isOpen={isChangingLang}
                                 close={() => setIsChangingLang(false)}
diff --git a/ui/App/components/Modal.jsx b/ui/App/components/Modal.jsx
index ae381248..f5f3691d 100644
--- a/ui/App/components/Modal.jsx
+++ b/ui/App/components/Modal.jsx
@@ -1,4 +1,3 @@
-import Panel from "./Panel";
 import React from "react";
 import * as ReactDom from "react-dom";
 
@@ -8,15 +7,16 @@ const Modal = ({title, content, isOpen, actions = null}) => {
 
     return ReactDom.createPortal((isOpen &&
         <div className="relative z-40">
-            <div className="bg-black bg-opacity-75 fixed top-0 left-0 z-10 w-full min-h-screen">
-                <Panel
-                    title={title}
-                    className="w-11/12 md:w-1/2 lg:w-1/3 mx-auto mt-6"
-                    content={content}
-                    actions={actions}
-                />
+            <div className="bg-black bg-opacity-75 fixed top-0 left-0 z-10 w-full min-h-screen flex items-center justify-center">
+                <div className="w-11/12 md:w-1/2 lg:w-1/3 accentuated rounded-sm bg-gray-dark shadow-xl pb-4">
+                    <div className="px-4 py-2 text-xl text-dirty-white font-bold">{title}</div>
+                    <div className="text-white rounded-sm bg-gray-medium shadow-inner mx-4 px-6 pt-4 pb-6">
+                        {content}
+                    </div>
+                    {actions && <div className="mx-4 pt-4 flex justify-between">{actions}</div>}
+                </div>
             </div>
         </div>), modalRoot)
 }
 
-export default Modal;
\ No newline at end of file
+export default Modal;
diff --git a/ui/App/components/Panel.jsx b/ui/App/components/Panel.jsx
index e0707cfd..6d5028bf 100644
--- a/ui/App/components/Panel.jsx
+++ b/ui/App/components/Panel.jsx
@@ -6,15 +6,15 @@ const Panel = ({title, content, actions, className}) => {
             <div className="px-4 py-2 text-xl text-dirty-white font-bold">
                 {title}
             </div>
-            <div className="text-white rounded-sm bg-gray-medium shadow-inner mx-4 px-6 pt-4 pb-6">
-                {content}
-            </div>
             {actions
-                ? <div className="mx-4 pt-4">
+                ? <div className="mx-4 pb-4">
                     {actions}
                 </div>
                 : null
             }
+            <div className="text-white rounded-sm bg-gray-medium shadow-inner mx-4 px-6 pt-4 pb-6">
+                {content}
+            </div>
         </div>
     )
 }
diff --git a/ui/App/components/Tabs/TabControl.jsx b/ui/App/components/Tabs/TabControl.jsx
index 05371074..b4cabf66 100644
--- a/ui/App/components/Tabs/TabControl.jsx
+++ b/ui/App/components/Tabs/TabControl.jsx
@@ -1,9 +1,15 @@
-import React, {useState} from "react";
+import React, {useState, useEffect} from "react";
 import TabTitle from "./TabTitle";
 
-const TabControl = ({children}) => {
+const TabControl = ({children, activeIndex}) => {
     const [selectedTab, setSelectedTab] = useState(0)
 
+    useEffect(() => {
+        if (activeIndex !== undefined && activeIndex !== selectedTab) {
+            setSelectedTab(activeIndex);
+        }
+    }, [activeIndex]);
+
     const handleSelect = (index) => {
         setSelectedTab(index);
         const child = children[index];
diff --git a/ui/App/eventLog.js b/ui/App/eventLog.js
new file mode 100644
index 00000000..0b060d22
--- /dev/null
+++ b/ui/App/eventLog.js
@@ -0,0 +1,46 @@
+const MAX_EVENTS = 500;
+
+let listeners = [];
+let events = [];
+
+export const eventLog = {
+    add(event) {
+        const entry = {
+            id: Date.now() + '_' + Math.random().toString(36).slice(2, 6),
+            time: new Date().toISOString(),
+            type: event.type || 'info',
+            message: event.message || '',
+            source: event.source || 'app',
+        };
+        events.push(entry);
+        if (events.length > MAX_EVENTS) events = events.slice(-MAX_EVENTS);
+        listeners.forEach(fn => fn(entry));
+        return entry;
+    },
+
+    getAll() {
+        return [...events];
+    },
+
+    clear() {
+        events = [];
+        listeners.forEach(fn => fn({type: 'system', message: 'log cleared', source: 'system'}));
+    },
+
+    subscribe(fn) {
+        listeners.push(fn);
+        return () => { listeners = listeners.filter(f => f !== fn); };
+    },
+
+    error(msg, source) {
+        return this.add({type: 'error', message: String(msg), source: source || 'app'});
+    },
+
+    warn(msg, source) {
+        return this.add({type: 'warn', message: String(msg), source: source || 'app'});
+    },
+
+    info(msg, source) {
+        return this.add({type: 'info', message: String(msg), source: source || 'app'});
+    },
+};
diff --git a/ui/App/locales/zh-controls.json b/ui/App/locales/zh-controls.json
index 164965af..5ba05c88 100644
--- a/ui/App/locales/zh-controls.json
+++ b/ui/App/locales/zh-controls.json
@@ -20,5 +20,11 @@
   "stopServer": "停止服务器",
   "saveStopServer": "保存并停止",
   "saveSettings": "保存设置",
-  "settingsSaved": "设置已保存"
+  "settingsSaved": "设置已保存",
+  "players": "在线玩家",
+  "uptime": "运行时长",
+  "compatible": "兼容",
+  "incompatible": "不兼容",
+  "chat": "聊天",
+  "noChatYet": "暂无聊天消息"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-mods.json b/ui/App/locales/zh-mods.json
index affa3083..de29face 100644
--- a/ui/App/locales/zh-mods.json
+++ b/ui/App/locales/zh-mods.json
@@ -47,7 +47,6 @@
   "Enabled": "启用",
   "Compatibility": "兼容性",
   "Mod Version": "模组版本",
-  "Factorio Version": "Factorio 版本",
   "Space Age DLC": "太空时代 DLC",
   "File Size": "文件大小",
   "readModsFromSave": "从存档读取模组",
@@ -66,5 +65,17 @@
   "mod": "模组",
   "required": "需要版本",
   "status": "状态",
-  "columns": "列"
+  "columns": "列",
+  "syncingInProgress": "模组同步中，部分操作暂时禁用",
+  "Game Ver": "游戏版本",
+  "Other Actions": "其他操作",
+  "active": "进行中",
+  "completed": "已完成",
+  "pending": "等待中",
+  "failed": "失败",
+  "downloading": "下载中",
+  "expandAll": "展开全部",
+  "collapseAll": "收起全部",
+  "enableAllMods": "启用全部模组",
+  "disableAllMods": "禁用全部模组"
 }
\ No newline at end of file
diff --git a/ui/App/locales/zh-serverSettings.json b/ui/App/locales/zh-serverSettings.json
index 6d4cee48..b46fcbbb 100644
--- a/ui/App/locales/zh-serverSettings.json
+++ b/ui/App/locales/zh-serverSettings.json
@@ -1,5 +1,5 @@
 {
-  "title": "服务器设置",
+  "title": "配置管理",
   "serverSettings": "服务器设置",
   "gameSettings": "游戏设置",
   "saveSettings": "保存设置",
diff --git a/ui/App/locales/zh-serverVersion.json b/ui/App/locales/zh-serverVersion.json
index 768d2702..d1138924 100644
--- a/ui/App/locales/zh-serverVersion.json
+++ b/ui/App/locales/zh-serverVersion.json
@@ -1,5 +1,5 @@
 {
-  "title": "服务器版本",
+  "title": "版本管理",
   "serverVersion": "服务器版本",
   "installedVersion": "已安装版本",
   "availableVersions": "可用版本",
diff --git a/ui/App/locales/zh.json b/ui/App/locales/zh.json
index 093f7fc1..8641460d 100644
--- a/ui/App/locales/zh.json
+++ b/ui/App/locales/zh.json
@@ -46,7 +46,7 @@
     "removeInstallation": "卸载"
   },
   "server_settings": {
-    "title": "服务器设置",
+    "title": "配置管理",
     "admins": "管理员",
     "name": "服务器名称",
     "description": "服务器描述",
@@ -176,7 +176,7 @@
     "factorio_login_error_message": "用户名或密码不匹配"
   },
   "serverVersion": {
-    "title": "服务器版本",
+    "title": "版本管理",
     "current": "当前版本",
     "available": "可用版本",
     "stable": "稳定版",
diff --git a/ui/App/views/Console.jsx b/ui/App/views/Console.jsx
index b9197447..ecf3f430 100644
--- a/ui/App/views/Console.jsx
+++ b/ui/App/views/Console.jsx
@@ -5,112 +5,72 @@ import socket from "../../api/socket";
 import log from "../../api/resources/log";
 
 const FONT_CLASS = { small: 'text-xs', medium: 'text-sm', large: 'text-base' };
-const WIDTH_STYLE = { compact: 'max-width: 56rem', normal: 'max-width: 72rem', full: 'max-width: none' };
+const WIDTH = { compact: {maxWidth: '56rem'}, normal: {maxWidth: '72rem'}, full: {maxWidth: 'none'} };
 
 const Console = ({serverStatus}) => {
 
     const { t } = useTranslation('console');
     const [logs, setLogs] = useState([]);
-    const [fontSize, setFontSize] = useState(() => localStorage.getItem('console_fontSize') || 'small');
-    const [wrap, setWrap] = useState(() => localStorage.getItem('console_wrap') !== 'false');
-    const [panelWidth, setPanelWidth] = useState(() => localStorage.getItem('console_panelWidth') || 'normal');
+    const [fontSize, setFontSize] = useState(() => { try { return localStorage.getItem('console_fontSize') || 'small'; } catch { return 'small'; } });
+    const [wrap, setWrap] = useState(() => { try { return localStorage.getItem('console_wrap') !== 'false'; } catch { return true; } });
+    const [panelWidth, setPanelWidth] = useState(() => { try { return localStorage.getItem('console_panelWidth') || 'normal'; } catch { return 'normal'; } });
     const consoleInput = useRef(null);
     const logEnd = useRef(null);
 
-    const setFont = (size) => {
-        setFontSize(size);
-        localStorage.setItem('console_fontSize', size);
-    };
-    const toggleWrap = () => {
-        const next = !wrap;
-        setWrap(next);
-        localStorage.setItem('console_wrap', String(next));
-    };
-    const setWidth = (w) => {
-        setPanelWidth(w);
-        localStorage.setItem('console_panelWidth', w);
-    };
+    const setFont = (size) => { setFontSize(size); try { localStorage.setItem('console_fontSize', size); } catch {} };
+    const toggleWrap = () => { const n = !wrap; setWrap(n); try { localStorage.setItem('console_wrap', String(n)); } catch {} };
+    const setW = (w) => { setPanelWidth(w); try { localStorage.setItem('console_panelWidth', w); } catch {} };
 
     useEffect(() => {
         (async () => {
-            const lines = await log.tail();
-            if (lines && Array.isArray(lines)) setLogs(lines);
+            try { const lines = await log.tail(); if (lines && Array.isArray(lines)) setLogs(lines); } catch {}
         })();
-
         const appendLog = line => setLogs(lines => [...lines, line]);
-
         socket.on('gamelog', appendLog);
         socket.emit('log subscribe');
         consoleInput.current?.focus();
-
-        return () => {
-            socket.off('gamelog', appendLog);
-            socket.emit("log unsubscribe");
-        };
+        return () => { socket.off('gamelog', appendLog); socket.emit("log unsubscribe"); };
     }, []);
 
-    useEffect(() => {
-        logEnd.current?.scrollIntoView({ behavior: 'smooth' });
-    }, [logs]);
+    useEffect(() => { logEnd.current?.scrollIntoView({ behavior: 'smooth' }); }, [logs]);
 
     return (
-        <div className="flex flex-col" style={{ height: 'calc(100dvh - 120px)' }}>
+        <div className="flex flex-col" style={{ minHeight: '70vh' }}>
             <div className="flex-none flex flex-wrap items-center gap-1 mb-2 text-xs text-gray-light"
-                 style={{ ...WIDTH_STYLE[panelWidth], margin: '0 auto', width: '100%' }}>
+                 style={{ ...WIDTH[panelWidth], margin: '0 auto', width: '100%' }}>
                 <span className="mr-1">{t('fontSize')}:</span>
                 {Object.keys(FONT_CLASS).map(s => (
-                    <button key={s}
-                        className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
-                        onClick={() => setFont(s)}>
-                        {t(s)}
-                    </button>
+                    <button key={s} className={`px-2 py-0.5 rounded ${fontSize === s ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                        onClick={() => setFont(s)}>{t(s)}</button>
                 ))}
                 <span className="ml-3 mr-1 hidden sm:inline">{t('wrap')}:</span>
-                <button
-                    className={`px-2 py-0.5 rounded hidden sm:inline ${wrap ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
-                    onClick={toggleWrap}>
-                    {wrap ? t('on') : t('off')}
-                </button>
+                <button className={`px-2 py-0.5 rounded hidden sm:inline ${wrap ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                    onClick={toggleWrap}>{wrap ? t('on') : t('off')}</button>
                 <span className="ml-3 mr-1">{t('width')}:</span>
-                {Object.keys(WIDTH_STYLE).map(w => (
-                    <button key={w}
-                        className={`px-2 py-0.5 rounded ${panelWidth === w ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
-                        onClick={() => setWidth(w)}>
-                        {t(w)}
-                    </button>
+                {Object.keys(WIDTH).map(w => (
+                    <button key={w} className={`px-2 py-0.5 rounded ${panelWidth === w ? 'bg-orange text-black' : 'bg-gray-dark hover:bg-gray-light'}`}
+                        onClick={() => setW(w)}>{t(w)}</button>
                 ))}
             </div>
-            <div className="flex-1 flex flex-col overflow-hidden" style={{ ...WIDTH_STYLE[panelWidth], margin: '0 auto', width: '100%' }}>
-                <Panel
-                    title={t('console')}
-                    content={
-                        <div className="flex flex-col" style={{ height: 'calc(100dvh - 260px)' }}>
-                            <div className={`flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light ${FONT_CLASS[fontSize]}`}
-                                 style={{ minHeight: 0, whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
-                                {logs?.map((log, i) => (
-                                    <div key={i} className={wrap ? 'break-all' : ''}>{log}</div>
-                                ))}
+            <div style={{ ...WIDTH[panelWidth], margin: '0 auto', width: '100%', flex: 1, display: 'flex', flexDirection: 'column', minHeight: 0 }}>
+                <Panel title={t('console')} content={
+                    <div className="flex flex-col" style={{ flex: 1, minHeight: 0 }}>
+                        <div className="flex-1 overflow-y-auto bg-black rounded-sm p-2 mb-4 font-mono text-green-light"
+                             style={{ minHeight: '40vh', whiteSpace: wrap ? 'pre-wrap' : 'pre', overflowX: wrap ? 'hidden' : 'auto' }}>
+                            <div className={FONT_CLASS[fontSize]}>
+                                {logs?.map((l, i) => (<div key={i} className={wrap ? 'break-all' : ''}>{l}</div>))}
                                 <div ref={logEnd} />
                             </div>
-                            <div className="flex-none">
-                                {serverStatus.running
-                                    ? <input type="text"
-                                             className="shadow appearance-none border w-full py-2 px-3 text-black font-mono"
-                                             ref={consoleInput}
-                                             placeholder={t('placeholder')}
-                                             onKeyDown={e => {
-                                                 if (e.key === "Enter" && socket) {
-                                                     socket.emit("command send", consoleInput.current.value);
-                                                     consoleInput.current.value = "";
-                                                 }
-                                             }}
-                                      />
-                                    : <p className="text-gray-light text-sm pt-2">{t('consoleNotAvailable')}</p>
-                                }
-                            </div>
                         </div>
-                    }
-                />
+                        <div className="flex-none">
+                            {serverStatus.running
+                                ? <input type="text" className="shadow appearance-none border w-full py-2 px-3 text-black font-mono"
+                                         ref={consoleInput} placeholder={t('placeholder')}
+                                         onKeyDown={e => { if (e.key === "Enter" && socket) { socket.emit("command send", consoleInput.current.value); consoleInput.current.value = ""; } }}/>
+                                : <p className="text-gray-light text-sm pt-2">{t('consoleNotAvailable')}</p>}
+                        </div>
+                    </div>
+                }/>
             </div>
         </div>
     );
diff --git a/ui/App/views/Controls.jsx b/ui/App/views/Controls.jsx
index 38eba33e..f070b888 100644
--- a/ui/App/views/Controls.jsx
+++ b/ui/App/views/Controls.jsx
@@ -1,13 +1,17 @@
-import React, {useEffect, useState} from "react";
+import React, {useEffect, useState, useRef} from "react";
 import { useTranslation } from 'react-i18next';
 import Panel from "../components/Panel";
 import Button from "../components/Button";
 import server from "../../api/resources/server";
 import savesResource from "../../api/resources/saves";
+import modsResource from "../../api/resources/mods";
 import {useForm} from "react-hook-form";
 import Select from "../components/Select";
 import Input from "../components/Input";
 import Error from "../components/Error";
+import socket from "../../api/socket";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faUsers, faClock, faMicrochip, faMemory, faComments} from "@fortawesome/free-solid-svg-icons";
 
 const Controls = ({serverStatus}) => {
 
@@ -20,6 +24,11 @@ const Controls = ({serverStatus}) => {
     const [isStopping, setIsStopping] = useState(false);
     const [isStarting, setIsStarting] = useState(false);
     const [isKilling, setIsKilling] = useState(false);
+    const [chatMessages, setChatMessages] = useState([]);
+    const [modStats, setModStats] = useState({total: 0, compat: 0, incompat: 0});
+    const [uptime, setUptime] = useState(0);
+    const [players, setPlayers] = useState([]);
+    const chatEnd = useRef(null);
 
     const { handleSubmit, reset, register, formState: {errors} } = useForm();
 
@@ -44,105 +53,178 @@ const Controls = ({serverStatus}) => {
         savesResource.list(true)
             .then(res => {
                 setSaves(res);
-                if (res.length > 0) {
-                    setIsDisabled(undefined);
-                }
+                if (res.length > 0) setIsDisabled(undefined);
                 reset();
             });
-    }, [])
+        modsResource.installed().then(mods => {
+            setModStats({
+                total: mods.length,
+                compat: mods.filter(m => m.compatibility).length,
+                incompat: mods.filter(m => !m.compatibility).length
+            });
+        });
+    }, []);
+
+    useEffect(() => {
+        const handler = (msg) => {
+            const text = String(msg);
+            if (text.includes('[CHAT]')) {
+                setChatMessages(prev => [...prev.slice(-49), text.replace(/^.*\[CHAT\]\s*/, '')]);
+            }
+            if (text.includes('joined the game')) {
+                const name = text.match(/\[JOIN\]\s*(\S+)/)?.[1] || '';
+                if (name) setPlayers(prev => prev.includes(name) ? prev : [...prev, name]);
+            }
+            if (text.includes('left the game')) {
+                const name = text.match(/\[LEAVE\]\s*(\S+)/)?.[1] || '';
+                if (name) setPlayers(prev => prev.filter(p => p !== name));
+            }
+        };
+        socket.on('gamelog', handler);
+        return () => socket.off('gamelog', handler);
+    }, []);
+
+    useEffect(() => {
+        if (!serverStatus.running) return;
+        setUptime(0);
+        const timer = setInterval(() => setUptime(u => u + 1), 1000);
+        return () => clearInterval(timer);
+    }, [serverStatus.running]);
+
+    useEffect(() => { chatEnd.current?.scrollIntoView({behavior:'smooth'}); }, [chatMessages]);
+
+    const fmtTime = (s) => {
+        const h = Math.floor(s/3600), m = Math.floor(s%3600/60), sec = s%60;
+        return `${h}h ${m}m ${sec}s`;
+    };
 
     return (
-        <form onSubmit={handleSubmit(startServer)}>
-        <Panel
-            title={t('serverStatus')}
-            content={
-                <div className="lg:flex">
-                    { serverStatus.running
-                        ? <>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('status')}</div>
-                                <div>{serverStatus.running ? t('RUNNING') : t('STOPPED')}</div>
-                            </div>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('ip')}</div>
-                                <div>{serverStatus.bindip}</div>
-                            </div>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('port')}</div>
-                                <div>{serverStatus.port}</div>
-                            </div>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('factorioVersion')}</div>
-                                <div>{factorioVersion}</div>
-                            </div>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('save')}</div>
-                                <div>{serverStatus.savefile}</div>
-                            </div>
-                        </>
-                        : <>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('status')}</div>
-                                <div>{serverStatus.running ? t('RUNNING') : t('STOPPED')}</div>
-                            </div>
-                            <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">{t('ip')}</div>
-                                    <Input
-                                        defaultValue={savedIp}
-                                        disabled={isDisabled}
-                                        register={register('ip',{required: true, pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/})}
-                                    />
-                                <Error error={errors.ip} message={t('ipRequired')}/>
-                            </div>
-                            <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">{t('port')}</div>
-                                    <Input
-                                        type="number"
-                                        min={1}
-                                        max={65535}
-                                        defaultValue={savedPort}
-                                        disabled={isDisabled}
-                                        register={register('port',{required: true, min: 1, max: 65535})}
-                                    />
-                                <Error error={errors.port} message={t('portRequired')}/>
-                            </div>
-                            <div className="lg:w-1/5 mb-2 mr-0 lg:mr-4">
-                                <div className="font-bold">{t('factorioVersion')}</div>
-                                <div>{factorioVersion}</div>
+        <div className="space-y-6">
+            {/* Status Banner */}
+            {serverStatus.running ? (
+                <div className="rounded-sm bg-green-dark p-4 flex items-center justify-between">
+                    <div className="flex items-center gap-3">
+                        <div className="w-3 h-3 rounded-full bg-green animate-pulse"/>
+                        <span className="text-white font-bold text-lg">{t('RUNNING')}</span>
+                        <span className="text-gray-light text-sm">{fmtTime(uptime)}</span>
+                    </div>
+                    <div className="flex items-center gap-4 text-gray-light text-sm">
+                        <span><FontAwesomeIcon icon={faUsers} className="mr-1"/>{players.length} {t('players') || 'players'}</span>
+                        <span>{serverStatus.bindip}:{serverStatus.port}</span>
+                    </div>
+                </div>
+            ) : (
+                <div className="rounded-sm bg-gray-dark p-4 flex items-center gap-3">
+                    <div className="w-3 h-3 rounded-full bg-gray"/>
+                    <span className="text-gray-light font-bold text-lg">{t('STOPPED')}</span>
+                </div>
+            )}
+
+            {/* Info Cards */}
+            <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
+                <div className="accentuated rounded-sm bg-gray-dark p-4 text-center">
+                    <FontAwesomeIcon icon={faMicrochip} className="text-gray-light text-2xl mb-1"/>
+                    <div className="text-dirty-white font-bold">{factorioVersion}</div>
+                    <div className="text-gray-light text-xs">{t('factorioVersion')}</div>
+                </div>
+                <div className="accentuated rounded-sm bg-gray-dark p-4 text-center">
+                    <FontAwesomeIcon icon={faUsers} className="text-gray-light text-2xl mb-1"/>
+                    <div className="text-dirty-white font-bold">{players.length}</div>
+                    <div className="text-gray-light text-xs">{t('players') || 'players'}</div>
+                </div>
+                <div className="accentuated rounded-sm bg-gray-dark p-4 text-center">
+                    <FontAwesomeIcon icon={faClock} className="text-gray-light text-2xl mb-1"/>
+                    <div className="text-dirty-white font-bold">{serverStatus.running ? fmtTime(uptime) : '--'}</div>
+                    <div className="text-gray-light text-xs">{t('uptime') || 'uptime'}</div>
+                </div>
+                <div className="accentuated rounded-sm bg-gray-dark p-4 text-center">
+                    <div className="text-dirty-white font-bold text-lg">{modStats.total}</div>
+                    <div className="text-green text-xs">{modStats.compat} {t('compatible') || 'compatible'}</div>
+                    <div className="text-red text-xs">{modStats.incompat} {t('incompatible') || 'incompatible'}</div>
+                </div>
+            </div>
+
+            {/* Players List */}
+            {serverStatus.running && players.length > 0 && (
+                <Panel title={t('players') || 'Online Players'} content={
+                    <div className="flex flex-wrap gap-2">
+                        {players.map(p => (
+                            <span key={p} className="bg-gray-medium text-dirty-white px-3 py-1 rounded-full text-sm">{p}</span>
+                        ))}
+                    </div>
+                }/>
+            )}
+
+            {/* Server Controls */}
+            <form onSubmit={handleSubmit(startServer)}>
+                <Panel
+                    title={t('serverStatus')}
+                    content={
+                        serverStatus.running ? (
+                            <div className="grid grid-cols-2 md:grid-cols-4 gap-4 text-sm">
+                                <div><span className="text-gray-light">{t('ip')}:</span> <span className="text-dirty-white">{serverStatus.bindip}</span></div>
+                                <div><span className="text-gray-light">{t('port')}:</span> <span className="text-dirty-white">{serverStatus.port}</span></div>
+                                <div><span className="text-gray-light">{t('factorioVersion')}:</span> <span className="text-dirty-white">{factorioVersion}</span></div>
+                                <div><span className="text-gray-light">{t('save')}:</span> <span className="text-dirty-white">{serverStatus.savefile}</span></div>
                             </div>
-                            <div className="lg:w-1/5 mb-2">
-                                <div className="font-bold">{t('save')}</div>
-                                <div className="relative">
-                                    <Select
-                                        register={register('save',{required: true})}
-                                        defaultValue={saves.find((save) => save.name.startsWith('Load Latest'))?.name}
+                        ) : (
+                            <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+                                <div>
+                                    <div className="font-bold text-sm mb-1">{t('ip')}</div>
+                                    <Input defaultValue={savedIp} disabled={isDisabled}
+                                        register={register('ip',{required: true, pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/})}/>
+                                    <Error error={errors.ip} message={t('ipRequired')}/>
+                                </div>
+                                <div>
+                                    <div className="font-bold text-sm mb-1">{t('port')}</div>
+                                    <Input type="number" min={1} max={65535} defaultValue={savedPort} disabled={isDisabled}
+                                        register={register('port',{required: true, min: 1, max: 65535})}/>
+                                    <Error error={errors.port} message={t('portRequired')}/>
+                                </div>
+                                <div>
+                                    <div className="font-bold text-sm mb-1">{t('factorioVersion')}</div>
+                                    <div className="py-2 text-dirty-white">{factorioVersion}</div>
+                                </div>
+                                <div>
+                                    <div className="font-bold text-sm mb-1">{t('save')}</div>
+                                    <Select register={register('save',{required: true})}
+                                        defaultValue={saves.find((s) => s.name.startsWith('Load Latest'))?.name}
                                         disabled={isDisabled}
-                                        options={saves.map(save => new Object({
-                                            value: save.name,
-                                            name: save.name
-                                        }))}
-                                    />
+                                        options={saves.map(s => ({value: s.name, name: s.name}))}/>
                                     <Error error={errors.save} message={t('saveRequired')}/>
                                 </div>
                             </div>
-                        </>
+                        )
                     }
-                </div>
-            }
-            actions={
-                <div className="md:flex">
-                    {serverStatus.running
-                        ? <>
-                            <Button onClick={stopServer} isLoading={isStopping} isDisabled={isKilling} size="sm" className="w-full md:w-auto mb-2 md:mb-0 md:mr-2" type="default">{t('saveStopServer')}</Button>
-                            <Button onClick={killServer} isLoading={isKilling} isDisabled={isStopping} size="sm" type="danger" className="w-full md:w-auto">{t('killServer')}</Button>
-                        </>
-                        : <Button isSubmit={true} isDisabled={isDisabled} isLoading={isStarting} size="sm" type="success" className="w-full md:w-auto">{t('startServer')}</Button>
+                    actions={
+                        <div className="md:flex gap-2">
+                            {serverStatus.running ? (
+                                <>
+                                    <Button onClick={stopServer} isLoading={isStopping} isDisabled={isKilling} size="sm" type="default">{t('saveStopServer')}</Button>
+                                    <Button onClick={killServer} isLoading={isKilling} isDisabled={isStopping} size="sm" type="danger">{t('killServer')}</Button>
+                                </>
+                            ) : (
+                                <Button isSubmit={true} isDisabled={isDisabled} isLoading={isStarting} size="sm" type="success">{t('startServer')}</Button>
+                            )}
+                        </div>
                     }
-                </div>
-            }
-        />
-        </form>
-    )
+                />
+            </form>
+
+            {/* Chat Panel */}
+            {serverStatus.running && (
+                <Panel title={<span><FontAwesomeIcon icon={faComments} className="mr-2"/>{t('chat') || 'Chat'}</span>} content={
+                    <div className="bg-black rounded-sm p-2 max-h-48 overflow-y-auto font-mono text-xs text-green-light">
+                        {chatMessages.length === 0 && <div className="text-gray text-center py-4">{t('noChatYet') || 'No chat messages yet'}</div>}
+                        {chatMessages.map((msg, i) => (
+                            <div key={i} className="py-0.5 border-b border-gray-dark last:border-0">{msg}</div>
+                        ))}
+                        <div ref={chatEnd}/>
+                    </div>
+                }/>
+            )}
+        </div>
+    );
 };
 
 export default Controls;
diff --git a/ui/App/views/EventLog.jsx b/ui/App/views/EventLog.jsx
new file mode 100644
index 00000000..43607cf8
--- /dev/null
+++ b/ui/App/views/EventLog.jsx
@@ -0,0 +1,98 @@
+import React, {useState, useEffect, useRef} from "react";
+import {eventLog} from "../eventLog";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faTrashCan, faCircle, faExclamationTriangle, faInfoCircle, faTimesCircle} from "@fortawesome/free-solid-svg-icons";
+
+const TYPE_CONFIG = {
+    error: {icon: faTimesCircle, color: "text-red", bg: "bg-red-900/20", label: "错误"},
+    warn:  {icon: faExclamationTriangle, color: "text-yellow-500", bg: "bg-yellow-900/20", label: "警告"},
+    info:  {icon: faInfoCircle, color: "text-blue-400", bg: "", label: "信息"},
+    system:{icon: faCircle, color: "text-gray-light", bg: "", label: "系统"},
+};
+
+const EventLog = () => {
+    const [items, setItems] = useState([]);
+    const [filter, setFilter] = useState("all");
+    const bottomRef = useRef(null);
+    const autoScrollRef = useRef(true);
+
+    useEffect(() => {
+        setItems(eventLog.getAll());
+        const unsub = eventLog.subscribe((entry) => {
+            setItems(prev => [...prev, entry]);
+        });
+        return unsub;
+    }, []);
+
+    useEffect(() => {
+        if (autoScrollRef.current && bottomRef.current) {
+            bottomRef.current.scrollIntoView({behavior: "smooth"});
+        }
+    }, [items]);
+
+    const filtered = filter === "all" ? items : items.filter(i => i.type === filter);
+
+    const counts = {
+        all: items.length,
+        error: items.filter(i => i.type === "error").length,
+        warn: items.filter(i => i.type === "warn").length,
+        info: items.filter(i => i.type === "info").length,
+    };
+
+    return (
+        <div className="flex flex-col h-full">
+            <div className="flex items-center justify-between mb-4">
+                <h2 className="text-xl font-bold text-dirty-white">事件日志</h2>
+                <button
+                    className="text-sm text-gray-light hover:text-red flex items-center gap-1"
+                    onClick={() => { eventLog.clear(); setItems([]); }}
+                >
+                    <FontAwesomeIcon icon={faTrashCan}/>
+                    清空
+                </button>
+            </div>
+
+            <div className="flex gap-2 mb-3">
+                {(["all", "error", "warn", "info"]).map(key => (
+                    <button
+                        key={key}
+                        className={`px-3 py-1 rounded text-xs font-bold transition-colors ${
+                            filter === key
+                                ? "bg-gray-light text-black"
+                                : "bg-gray-dark text-gray-light hover:text-white"
+                        }`}
+                        onClick={() => setFilter(key)}
+                    >
+                        {key === "all" ? "全部" : TYPE_CONFIG[key]?.label || key}
+                        <span className="ml-1 opacity-60">({counts[key] || 0})</span>
+                    </button>
+                ))}
+            </div>
+
+            <div className="flex-1 overflow-y-auto bg-gray-dark rounded p-3 font-mono text-xs leading-relaxed">
+                {filtered.length === 0 && (
+                    <div className="text-gray-light text-center py-8">暂无日志</div>
+                )}
+                {filtered.map(entry => {
+                    const cfg = TYPE_CONFIG[entry.type] || TYPE_CONFIG.info;
+                    const time = entry.time ? entry.time.slice(11, 19) : "";
+                    return (
+                        <div
+                            key={entry.id}
+                            className={`flex items-start gap-2 py-0.5 border-b border-gray-dark/50 ${cfg.bg}`}
+                        >
+                            <span className="text-gray-light shrink-0 w-16">{time}</span>
+                            <FontAwesomeIcon icon={cfg.icon} className={`${cfg.color} shrink-0 mt-0.5`} size="xs"/>
+                            <span className="text-gray-light shrink-0 w-12">{cfg.label}</span>
+                            <span className="text-gray-light shrink-0 w-16 truncate">{entry.source}</span>
+                            <span className="text-dirty-white flex-1 break-all">{entry.message}</span>
+                        </div>
+                    );
+                })}
+                <div ref={bottomRef}/>
+            </div>
+        </div>
+    );
+};
+
+export default EventLog;
diff --git a/ui/App/views/GameSettings.jsx b/ui/App/views/GameSettings.jsx
deleted file mode 100644
index 536f17b4..00000000
--- a/ui/App/views/GameSettings.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import Panel from "../components/Panel";
-import React, {useEffect, useState} from "react";
-import { useTranslation } from 'react-i18next';
-import settingsResource from "../../api/resources/settings";
-
-const GameSettings = () => {
-
-    const { t } = useTranslation('serverSettings');
-
-    const [settingsCategories, setSettingsCategories] = useState();
-
-    const fetchSettings = async () => {
-        const res = await settingsResource.game.list();
-        setSettingsCategories(res);
-    }
-
-    useEffect(() => {
-        fetchSettings();
-    }, []);
-
-    return (
-        <Panel
-            className="mb-4"
-            title={t('gameSettings')}
-            content={
-                <>
-                    {settingsCategories && Object.keys(settingsCategories).map(key => {
-                        const settings = settingsCategories[key];
-                        return (
-                            <div key={key}>
-                                <h1 className="mb-1 text-lg text-dirty-white">{key}</h1>
-                                <table key={key} className="w-full mb-2">
-                                    <tbody>
-                                    {settings && (Object.keys(settings).length > 0 && Object.keys(settings).map(key => {
-                                        return (
-                                            <tr className="py-1" key={key}>
-                                                <td className="w-1/3 pr-4">{key}</td>
-                                                <td className="w-2/3 pr-4">{settings[key]}</td>
-                                            </tr>
-                                        )
-                                    })) || <tr>
-                                        <td colSpan={2}>--</td>
-                                    </tr>}
-                                    </tbody>
-                                </table>
-                            </div>
-                        )
-                    })}
-                </>
-            }
-        />
-    )
-}
-
-export default GameSettings;
\ No newline at end of file
diff --git a/ui/App/views/Mods/Mods.jsx b/ui/App/views/Mods/Mods.jsx
index f00ee1bf..6dd0cb74 100644
--- a/ui/App/views/Mods/Mods.jsx
+++ b/ui/App/views/Mods/Mods.jsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import modsResource from "../../../api/resources/mods";
 import Button from "../../components/Button";
 import server from "../../../api/resources/server";
+import socket from "../../../api/socket";
 import TabControl from "../../components/Tabs/TabControl";
 import Tab from "../../components/Tabs/Tab";
 import AddMod from "./components/AddMod/AddMod";
@@ -42,12 +43,12 @@ const Mods = ({serverStatus}) => {
     };
 
     const fetchInstalledMods = () => {
-        modsResource.installed()
+        return modsResource.installed()
             .then(setInstalledMods);
     };
 
     const fetchModPacks = () => {
-        modsResource.packs.list()
+        return modsResource.packs.list()
             .then(setModPacks)
     }
 
@@ -97,18 +98,31 @@ const Mods = ({serverStatus}) => {
 
         const interval = setInterval(() => {
             if (document.hidden) return;
-            fetchInstalledMods();
-            fetchModPacks();
+            fetchInstalledMods().catch(() => {});
+            fetchModPacks().catch(() => {});
         }, 2000);
 
+        const handleModEvent = (message) => {
+            const data = JSON.parse(message);
+            if (data.type === "mod_deleted") {
+                setInstalledMods(prev => prev.filter(m => m.name !== data.name));
+            } else if (data.type === "mods_cleared") {
+                setInstalledMods([]);
+            }
+        };
+        socket.on('mods_events', handleModEvent);
+        socket.emit('mods events subscribe');
+
         const handleRefresh = () => {
-            fetchInstalledMods();
-            fetchModPacks();
+            fetchInstalledMods().catch(() => {});
+            fetchModPacks().catch(() => {});
         };
         window.addEventListener('fsm_refresh_mods', handleRefresh);
 
         return () => {
             clearInterval(interval);
+            socket.off('mods_events', handleModEvent);
+            socket.emit('mods events unsubscribe');
             window.removeEventListener('fsm_refresh_mods', handleRefresh);
         };
     }, []);
@@ -131,12 +145,26 @@ const Mods = ({serverStatus}) => {
             .then(fetchInstalledMods)
     }
 
+    const enableAllMods = () => {
+        const toEnable = installedMods.filter(m => !m.enabled && m.name !== 'base');
+        Promise.all(toEnable.map(m => toggleMod(m.name)))
+            .then(fetchInstalledMods)
+            .catch(() => fetchInstalledMods());
+    }
+
+    const disableAllMods = () => {
+        const toDisable = installedMods.filter(m => m.enabled && m.name !== 'base');
+        Promise.all(toDisable.map(m => toggleMod(m.name)))
+            .then(fetchInstalledMods)
+            .catch(() => fetchInstalledMods());
+    }
+
     let disabled = serverStatus.running
     let isBusy = disabled || isDeletingAllMods || isUpdatingAllMods || isSyncing
 
     return (
         <div>
-            {isBusy ?
+            {disabled && !isSyncing &&
                 <Panel className="mb-6"
                        content={
                             <div className="text-red font-bold text-xl">
@@ -144,8 +172,22 @@ const Mods = ({serverStatus}) => {
                             </div>
                        }
                 />
-                :
-                !authChecked ? null :
+            }
+            {isSyncing &&
+                <Panel className="mb-6"
+                       content={
+                            <div className="flex items-center justify-between">
+                                <div className="text-orange font-bold text-xl">
+                                    {t('syncingInProgress')}
+                                </div>
+                                <Button size="sm" type="danger" onClick={() => modsResource.cancelSync()}>
+                                    取消同步
+                                </Button>
+                            </div>
+                       }
+                />
+            }
+            {!authChecked ? null :
                 <div>
                     {portalLoading &&
                         <div className="mb-4 p-4 bg-gray-dark rounded-sm">
@@ -168,7 +210,7 @@ const Mods = ({serverStatus}) => {
                                 <LoadMods refreshMods={fetchInstalledMods}
                                           isFactorioAuthenticated={isFactorioAuthenticated}
                                           setIsFactorioAuthenticated={setIsFactorioAuthenticated}
-                                          setIsSyncing={setIsSyncing} />
+                                          onSyncingChange={setIsSyncing} />
                             </Tab>
                         </TabControl>
                     </div>
@@ -198,6 +240,8 @@ const Mods = ({serverStatus}) => {
                             <>
                                 <a className="bg-gray-light py-1 px-2 hover:glow-orange hover:bg-orange inline-block accentuated text-black font-bold"
                                    href={modsResource.downloadAllURL}>{t('downloadAllMods')}</a>
+                                <Button size="sm" className="ml-2" onClick={enableAllMods}>{t('enableAllMods')}</Button>
+                                <Button size="sm" className="ml-2" onClick={disableAllMods}>{t('disableAllMods')}</Button>
                                 <Button size="sm" type="danger" className="ml-2"
                                     isLoading={isDeletingAllMods}
                                     onClick={() => setShowDeleteAllConfirm(true)}>{t('deleteAllMods')}</Button>
diff --git a/ui/App/views/Mods/components/LoadMods.jsx b/ui/App/views/Mods/components/LoadMods.jsx
index 29512998..08e6fba4 100644
--- a/ui/App/views/Mods/components/LoadMods.jsx
+++ b/ui/App/views/Mods/components/LoadMods.jsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from "react";
+import React, {useEffect, useState, useRef} from "react";
 import savesResource from "../../../../api/resources/saves";
 import Label from "../../../components/Label";
 import Button from "../../../components/Button";
@@ -7,7 +7,7 @@ import FactorioLogin from "./AddMod/components/FactorioLogin";
 import socket from "../../../../api/socket";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {useTranslation} from "react-i18next";
-import {faSpinner, faCheck, faTimes, faMinusCircle} from "@fortawesome/free-solid-svg-icons";
+import {faSpinner, faCheck, faTimes, faMinusCircle, faChevronDown, faChevronUp, faClock} from "@fortawesome/free-solid-svg-icons";
 
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
 
@@ -21,7 +21,22 @@ const STATUS_ICON = {
     not_found:     <FontAwesomeIcon icon={faTimes} className="text-red"/>,
 };
 
-const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated, setIsSyncing}) => {
+const formatSize = (bytes) => {
+    if (!bytes || bytes < 0) return '0 B';
+    const units = ['B', 'KB', 'MB', 'GB'];
+    let i = 0, v = bytes;
+    while (v >= 1024 && i < units.length - 1) { v /= 1024; i++; }
+    return `${v.toFixed(i > 0 ? 1 : 0)} ${units[i]}`;
+};
+
+const formatTime = (seconds) => {
+    if (!seconds || seconds < 0 || !isFinite(seconds)) return '--:--';
+    const m = Math.floor(seconds / 60);
+    const s = Math.floor(seconds % 60);
+    return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`;
+};
+
+const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthenticated, onSyncingChange}) => {
     const {t} = useTranslation('mods');
     const [saves, setSaves] = useState([]);
     const [selectedSave, setSelectedSave] = useState("");
@@ -31,8 +46,20 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
     const [modRows, setModRows] = useState([]);
     const [checkedMods, setCheckedMods] = useState({});
     const [syncError, setSyncError] = useState(null);
-    const [currentMod, setCurrentMod] = useState(null);
     const [warning, setWarning] = useState(null);
+    const [modProgress, setModProgress] = useState({});
+    const [expanded, setExpanded] = useState(false);
+    const [tick, setTick] = useState(0);
+    const recoveringRef = useRef(false);
+    const modRowsRef = useRef(modRows);
+    modRowsRef.current = modRows;
+    const delayTimers = useRef({});
+
+    useEffect(() => {
+        if (!isSyncing) return;
+        const id = setInterval(() => setTick(t => t + 1), 500);
+        return () => clearInterval(id);
+    }, [isSyncing]);
 
     useEffect(() => {
         (async () => {
@@ -51,16 +78,83 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
     useEffect(() => {
         const handler = (message) => {
             const data = JSON.parse(message);
+            if (modRowsRef.current.length === 0 && data.status && data.status !== "done" && data.status !== "error") {
+                if (recoveringRef.current) return;
+                recoveringRef.current = true;
+                const saved = sessionStorage.getItem('fsm_sync_save');
+                if (saved && selectedSave !== saved) {
+                    setSelectedSave(saved);
+                }
+                setIsSyncing(true);
+                if (onSyncingChange) onSyncingChange(true);
+                if (saved) {
+                    modsResource.getFromSave(saved).then(mods => {
+                        setModRows(prev => {
+                            if (prev.length > 0) return prev;
+                            return mods || [];
+                        });
+                    }).catch(() => {}).finally(() => {
+                        recoveringRef.current = false;
+                    });
+                } else {
+                    recoveringRef.current = false;
+                }
+            }
             if (data.status === "progress") {
-                setCurrentMod(data.mod);
                 setModRows(rows => rows.map(r =>
                     r.name === data.mod ? {...r, status: "downloading"} : r
                 ));
+
+                const now = Date.now();
+                const bytes = data.downloaded || 0;
+
+                setModProgress(prev => {
+                    const existing = prev[data.mod] || {};
+                    const startedAt = existing.startedAt || now;
+                    const elapsed = (now - startedAt) / 1000;
+                    const speed = elapsed > 0.1 ? Math.round(bytes / elapsed) : 0;
+
+                    return {
+                        ...prev,
+                        [data.mod]: {
+                            downloaded: bytes,
+                            size: data.size || existing.size || 0,
+                            speed,
+                            startedAt,
+                        }
+                    };
+                });
+            } else if (data.status === "downloaded") {
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "downloaded"} : r
+                ));
+                if (delayTimers.current[data.mod]) clearTimeout(delayTimers.current[data.mod]);
+                delayTimers.current[data.mod] = setTimeout(() => {
+                    setModRows(rows => rows.map(r =>
+                        r.name === data.mod && r.status === "downloaded" ? {...r, status: "done_delayed"} : r
+                    ));
+                    delete delayTimers.current[data.mod];
+                }, 2000);
+            } else if (data.status === "not_found") {
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "not_found"} : r
+                ));
+            } else if (data.status === "builtin") {
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "builtin"} : r
+                ));
+            } else if (data.status === "version_mismatch") {
+                let latestInfo = {latest: '?', downloadUrl: '', fileName: ''};
+                try { latestInfo = JSON.parse(data.message || '{}'); } catch(e) {}
+                setModRows(rows => rows.map(r =>
+                    r.name === data.mod ? {...r, status: "version_mismatch", latestInfo} : r
+                ));
             } else if (data.status === "done") {
                 setIsSyncing(false);
-                if (setIsSyncing) setIsSyncing(false);
-                setCurrentMod(null);
+                if (onSyncingChange) onSyncingChange(false);
+                sessionStorage.removeItem('fsm_sync_save');
                 setWarning(data.warning || null);
+                setExpanded(false);
                 if (data.mods) {
                     setModRows(data.mods);
                     setCheckedMods({});
@@ -68,9 +162,9 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                 refreshMods();
             } else if (data.status === "error") {
                 setIsSyncing(false);
-                if (setIsSyncing) setIsSyncing(false);
-                setCurrentMod(null);
+                if (onSyncingChange) onSyncingChange(false);
                 setSyncError(data.message);
+                setExpanded(false);
             }
         };
 
@@ -79,6 +173,10 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
         return () => {
             socket.off('mods_sync', handler);
             socket.emit('mods sync unsubscribe');
+            recoveringRef.current = false;
+            Object.values(delayTimers.current).forEach(clearTimeout);
+            delayTimers.current = {};
+            if (onSyncingChange) onSyncingChange(false);
         };
     }, []);
 
@@ -89,6 +187,8 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
         setCheckedMods({});
         setSyncError(null);
         setWarning(null);
+        setModProgress({});
+        setExpanded(false);
 
         try {
             const mods = await modsResource.getFromSave(selectedSave);
@@ -112,13 +212,16 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
         if (toSync.length === 0) return;
 
         setIsSyncing(true);
-        if (setIsSyncing) setIsSyncing(true);
+        if (onSyncingChange) onSyncingChange(true);
+        sessionStorage.setItem('fsm_sync_save', selectedSave);
         setSyncError(null);
+        setExpanded(false);
         try {
             await modsResource.syncFromSave(selectedSave, toSync);
         } catch (e) {
             setSyncError(t('failedToStartSync') + ': ' + e.message);
             setIsSyncing(false);
+            if (onSyncingChange) onSyncingChange(false);
         }
     };
 
@@ -140,6 +243,154 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
         return <FactorioLogin setIsFactorioAuthenticated={setIsFactorioAuthenticated}/>;
     }
 
+    if (isSyncing && modRows.length > 0) {
+        const now = Date.now();
+        const downloading = modRows.filter(r => r.status === 'downloading');
+        const downloaded = modRows.filter(r => r.status === 'downloaded');
+        const failed = modRows.filter(r => r.status === 'not_found');
+        const total = modRows.length;
+        const pending = total - downloading.length - downloaded.length - failed.length;
+
+        const sorted = [...modRows].sort((a, b) => {
+            const o = {downloading: 0, downloaded: 1};
+            return (o[a.status] ?? 2) - (o[b.status] ?? 2);
+        });
+
+        return (
+            <div>
+                <Label text={t('save')} htmlFor="save"/>
+                <select
+                    className="shadow appearance-none border w-full py-2 px-3 text-black mb-4 opacity-50"
+                    disabled={true}
+                    value={selectedSave}
+                >
+                    {saves?.map(save => (
+                        <option key={save.name} value={save.name}>{save.name}</option>
+                    ))}
+                </select>
+
+                {syncError && (
+                    <div className="mt-4 p-3 bg-red-100 text-red font-bold">
+                        ⚠ {syncError}
+                    </div>
+                )}
+
+                {warning && (
+                    <div className="mt-4 p-3 bg-yellow-100 text-yellow-800">
+                        ⚠ {warning}
+                    </div>
+                )}
+
+                <div className="mt-4">
+                    <div className="flex items-center gap-4 mb-3 p-2 bg-gray-dark rounded text-sm">
+                        <span className="text-orange font-bold">
+                            ⬇ {downloading.length} {t('active') || '进行中'}
+                        </span>
+                        <span className="text-green">
+                            ✅ {downloaded.length} {t('completed') || '已完成'}
+                        </span>
+                        <span className="text-gray-light">
+                            ⏳ {pending} {t('pending') || '等待中'}
+                        </span>
+                        {failed.length > 0 && (
+                            <span className="text-red">
+                                ❌ {failed.length} {t('failed') || '失败'}
+                            </span>
+                        )}
+                        <span className="text-gray-light ml-auto">
+                            {downloaded.length + downloading.length}/{total}
+                        </span>
+                    </div>
+
+                    {downloading.length > 0 && (
+                        <div className="mb-3">
+                            <div className="text-xs text-gray-light mb-1 uppercase tracking-wide">
+                                {t('downloading') || '下载中'}
+                            </div>
+                            {downloading.map(mod => {
+                                const mp = modProgress[mod.name] || {};
+                                const pct = mp.size ? Math.min(100, ((mp.downloaded || 0) / mp.size) * 100) : 0;
+                                const elapsed = mp.startedAt ? (now - mp.startedAt) / 1000 : 0;
+                                const eta = mp.speed > 0 ? ((mp.size - (mp.downloaded || 0)) / mp.speed) : 0;
+
+                                return (
+                                    <div key={mod.name} className="mb-2 p-3 bg-gray-dark rounded border border-gray-medium">
+                                        <div className="flex items-center gap-2 mb-1">
+                                            <FontAwesomeIcon icon={faSpinner} spin={true} className="text-orange text-sm"/>
+                                            <span className="text-white font-bold text-sm">{mod.name}</span>
+                                            <span className="text-xs text-orange ml-auto">
+                                                {formatSize(mp.speed || 0)}/s
+                                            </span>
+                                        </div>
+                                        <div className="w-full bg-gray-medium rounded-full h-2 overflow-hidden mb-1">
+                                            <div
+                                                className="bg-orange h-2 rounded-full transition-all duration-300"
+                                                style={{width: `${Math.max(pct, 2)}%`}}
+                                            />
+                                        </div>
+                                        <div className="flex justify-between text-xs text-gray-light">
+                                            <span>{formatSize(mp.downloaded || 0)} / {formatSize(mp.size || 0)}</span>
+                                            <span>{pct.toFixed(0)}%</span>
+                                            <span>
+                                                <FontAwesomeIcon icon={faClock} className="mr-1"/>
+                                                {formatTime(elapsed)} / {formatTime(eta)}
+                                            </span>
+                                        </div>
+                                    </div>
+                                );
+                            })}
+                        </div>
+                    )}
+
+                    {!expanded && (downloaded.length + pending + failed.length) > 0 && (
+                        <div className="mb-2">
+                            <button
+                                className="text-blue-400 hover:text-blue-300 text-sm flex items-center gap-1"
+                                onClick={() => setExpanded(true)}
+                            >
+                                <FontAwesomeIcon icon={faChevronDown}/>
+                                {t('expandAll') || '展开全部'} ({total - downloading.length})
+                            </button>
+                        </div>
+                    )}
+
+                    {expanded && (
+                        <div>
+                            <button
+                                className="text-blue-400 hover:text-blue-300 text-sm flex items-center gap-1 mb-2"
+                                onClick={() => setExpanded(false)}
+                            >
+                                <FontAwesomeIcon icon={faChevronUp}/>
+                                {t('collapseAll') || '收起全部'}
+                            </button>
+                            <div className="max-h-64 overflow-y-auto">
+                                {sorted.map(mod => (
+                                    <div key={mod.name} className="flex items-center gap-3 py-1.5 px-2 border-b border-gray-dark text-sm">
+                                        <span className="w-5 text-center">{STATUS_ICON[mod.status]}</span>
+                                        <span className="flex-1 truncate">{mod.name}</span>
+                                        {modProgress[mod.name] && (
+                                            <span className="text-xs text-gray-light w-28 text-right">
+                                                {formatSize(modProgress[mod.name].downloaded || 0)} / {formatSize(modProgress[mod.name].size || 0)}
+                                            </span>
+                                        )}
+                                        {!modProgress[mod.name] && mod.status !== 'downloading' && (
+                                            <span className="text-xs text-gray-light w-28 text-right">
+                                                {mod.status === 'downloaded' ? '✅ 完成' :
+                                                 mod.status === 'not_found' ? '❌ 失败' :
+                                                 mod.status === 'builtin' ? '内置' :
+                                                 mod.status === 'version_mismatch' ? `⚠️ v${mod.latestInfo?.latest || '?'}` : ''}
+                                            </span>
+                                        )}
+                                    </div>
+                                ))}
+                            </div>
+                        </div>
+                    )}
+                </div>
+            </div>
+        );
+    }
+
     return (
         <div>
             <Label text={t('save')} htmlFor="save"/>
@@ -190,13 +441,6 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                         </Button>
                     </div>
 
-                    {currentMod && (
-                        <div className="mb-2 text-sm text-orange">
-                            <FontAwesomeIcon icon={faSpinner} spin={true} className="mr-2"/>
-                            {t('downloadingStatus')}: {currentMod}
-                        </div>
-                    )}
-
                     <table className="w-full text-sm">
                         <thead>
                             <tr className="border-b font-bold">
@@ -204,7 +448,8 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                                 <td className="py-1 pr-4">{t('mod')}</td>
                                 <td className="py-1 pr-4">{t('required')}</td>
                                 <td className="py-1 pr-4">{t('installed')}</td>
-                                <td className="py-1">{t('status')}</td>
+                                <td className="py-1 pr-4" style={{width: 120}}>{t('status')}</td>
+                                <td className="py-1" style={{width: 80}}></td>
                             </tr>
                         </thead>
                         <tbody>
@@ -232,8 +477,26 @@ const LoadMods = ({refreshMods, isFactorioAuthenticated, setIsFactorioAuthentica
                                     </td>
                                     <td className="py-1 pr-4">{mod.version_required || mod.version}</td>
                                     <td className="py-1 pr-4">{mod.version_installed || '-'}</td>
+                                    <td className="py-1 pr-4">
+                                        <span className="flex items-center gap-1">
+                                            {STATUS_ICON[mod.status] || mod.status}
+                                        </span>
+                                    </td>
                                     <td className="py-1">
-                                        {STATUS_ICON[mod.status] || mod.status}
+                                        {mod.status === 'version_mismatch' && mod.latestInfo && (
+                                            <Button size="sm" onClick={() => {
+                                                modsResource.update({
+                                                    modName: mod.name,
+                                                    downloadUrl: mod.latestInfo.downloadUrl,
+                                                    fileName: mod.latestInfo.fileName
+                                                }).then(() => refreshMods());
+                                            }}>
+                                                下载最新版 v{mod.latestInfo.latest || '?'}
+                                            </Button>
+                                        )}
+                                        {mod.status !== 'version_mismatch' && mod.file_size > 0 && (
+                                            <span className="text-xs text-gray-light">{((mod.file_size || 0) / 1024).toFixed(0)} KB</span>
+                                        )}
                                     </td>
                                 </tr>
                             ))}
diff --git a/ui/App/views/Mods/components/Mod.jsx b/ui/App/views/Mods/components/Mod.jsx
index 51e52d06..3f187108 100644
--- a/ui/App/views/Mods/components/Mod.jsx
+++ b/ui/App/views/Mods/components/Mod.jsx
@@ -1,157 +1,200 @@
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {
-    faArrowCircleUp,
-    faCheck,
-    faSpinner,
-    faTimes,
-    faToggleOff,
-    faToggleOn,
-    faTrashAlt,
-    faCaretDown,
-    faCaretRight
+    faArrowCircleUp, faCheck, faSpinner, faTimes,
+    faToggleOff, faToggleOn, faTrashAlt, faCaretDown, faCaretRight,
+    faUpRightFromSquare, faDownload, faRotate, faEye
 } from "@fortawesome/free-solid-svg-icons";
 import modsResource from "../../../../api/resources/mods";
 import React, {useEffect, useState} from "react";
 import {coerce, gt, satisfies} from "semver";
 
-const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod, disabled = false, visibleCols}) => {
+const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age', 'base']);
 
+const Mod = ({mod, factorioVersion, toggleMod, deleteMod, updateMod, addUpdatableMod, disabled = false, visibleCols, index, allMods, tableMode}) => {
+    const isDLC = DLC_MODS.has(mod.name);
     const [newVersion, setNewVersion] = useState(null)
     const [icon, setIcon] = useState(faArrowCircleUp)
     const [checked, setChecked] = useState(false)
-    const [depsOpen, setDepsOpen] = useState(false)
+    const [safeDepsOpen, setSafeDepsOpen] = useState(false)
+    const [repairing, setRepairing] = useState(false)
+    const [safeDeps, setSafeDeps] = useState([])
 
     useEffect(() => {
-        if (!disabled && !checked) {
+        try {
+            const raw = mod.dependencies;
+            if (Array.isArray(raw)) setSafeDeps(raw.filter(d => typeof d === 'string' && d && parseDepName(d) !== 'base'));
+            else setSafeDeps([]);
+        } catch(e) { setSafeDeps([]); }
+    }, [mod]);
+
+    useEffect(() => {
+        if (!disabled && !isDLC && !checked) {
             setChecked(true);
             (async () => {
                 try {
                     const data = await modsResource.portal.info(mod.name)
-
-                let newestRelease;
-                data.releases.forEach(release => {
-                    if (
-                        gt(
-                            coerce(release.version),
-                            coerce(mod.version)
-                        ) && (
+                    let newestRelease;
+                    (data.releases || []).forEach(release => {
+                        if (gt(coerce(release.version), coerce(mod.version)) && (
                             satisfies(factorioVersion, "~" + coerce(release.info_json.factorio_version).version) ||
-                            (
-                                satisfies(factorioVersion, "1.0.0") &&
-                                satisfies(coerce(release.info_json.factorio_version), "0.18.x")
-                            )
-                        )
-                    ) {
-                        if (!newestRelease) {
-                            newestRelease = release;
-                        } else if (gt(coerce(release.version).version, coerce(newestRelease.version).version)) {
-                            newestRelease = release;
+                            (satisfies(factorioVersion, "1.0.0") && satisfies(coerce(release.info_json.factorio_version), "0.18.x"))
+                        )) {
+                            if (!newestRelease || gt(coerce(release.version).version, coerce(newestRelease.version).version))
+                                newestRelease = release;
                         }
-                    }
-                });
-
-                if (newestRelease && newestRelease.version !== mod.version) {
-                    const installableVersion = {
-                        downloadUrl: newestRelease.download_url,
-                        fileName: newestRelease.file_name,
-                        modName: mod.name
-                    }
-                    setNewVersion(installableVersion);
-                    if (addUpdatableMod !== null) {
-                        addUpdatableMod(installableVersion)
-                    }
-                } else {
-                    setNewVersion(null);
-                }
-
-            } catch (e) {}
+                    });
+                    if (newestRelease && newestRelease.version !== mod.version) {
+                        const v = {downloadUrl: newestRelease.download_url, fileName: newestRelease.file_name, modName: mod.name};
+                        setNewVersion(v);
+                        if (addUpdatableMod !== null) addUpdatableMod(v);
+                    } else setNewVersion(null);
+                } catch (e) {}
             })();
         }
     }, [mod]);
 
-    const deps = mod.dependencies || [];
-    const displayDeps = deps.filter(d => d && d.trim()).slice(0, 10);
     const vis = visibleCols || ['compatibility','enabled','name','version','factorio'];
 
-    return (
-        <tr className="py-1 border-b border-gray-dark">
-            {vis.includes('compatibility') && (
-            <td className="pr-4">
-                {mod.compatibility
-                    ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
-                    : <FontAwesomeIcon className="text-red" icon={faTimes}/>
-                }
-            </td>
-            )}
-            {vis.includes('enabled') && (
-            <td className="pr-4">
-                {
-                    disabled
-                        ?
-
-                        mod.enabled
-                            ? <FontAwesomeIcon className="text-green" icon={faCheck}/>
-                            : <FontAwesomeIcon className="text-red" icon={faTimes}/>
-                        :
-                        mod.enabled
-                            ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green"
-                                                icon={faToggleOn}
-                                                onClick={() => toggleMod(mod.name)}/>
-                            :
-                            <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red"
-                                              icon={faToggleOff}
-                                              onClick={() => toggleMod(mod.name)}/>
-                }
-            </td>
-            )}
-            {vis.includes('name') && (
-            <td className="pr-4">
+    if (tableMode) {
+        const isDLC = DLC_MODS.has(mod.name);
+        const isDepInstalled = (depName) => Array.isArray(allMods) && allMods.some(m => m.name === depName);
+        return (
+            <div>
                 {mod.title}
-                {displayDeps.length > 0 && (
-                    <span className="ml-1 text-gray-light cursor-pointer select-none"
-                          onClick={() => setDepsOpen(!depsOpen)}>
-                        <FontAwesomeIcon icon={depsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
-                        <span className="text-xs">{displayDeps.length}</span>
+                {safeDeps.length > 0 && (
+                    <span className="ml-1 text-gray-light cursor-pointer select-none" onClick={() => setSafeDepsOpen(!safeDepsOpen)}>
+                        <FontAwesomeIcon icon={safeDepsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
+                        <span className="text-xs">{safeDeps.length}</span>
                     </span>
                 )}
-                {depsOpen && displayDeps.length > 0 && (
+                {safeDepsOpen && safeDeps.length > 0 && (
                     <div className="mt-1 pl-2 border-l-2 border-gray-dark text-xs text-gray-light">
-                        {displayDeps.map((d, i) => (
-                            <div key={i} className="whitespace-nowrap">{d}</div>
-                        ))}
-                        {deps.length > 10 && (
-                            <div className="text-gray">... and {deps.length - 10} more</div>
-                        )}
+                        {safeDeps.map((d, i) => {
+                            const name = parseDepName(d);
+                            const inst = isDepInstalled(name);
+                            return (<div key={i} className={'whitespace-nowrap py-0.5 ' + (inst ? '' : 'opacity-60')}>{d.trim()}{inst ? <FontAwesomeIcon icon={faEye} className="ml-2 text-blue-400 cursor-pointer hover:text-blue-200" title="定位" onClick={() => { scrollToMod(name); setSafeDepsOpen(false); }}/> : <FontAwesomeIcon icon={faDownload} className="ml-2 text-gray cursor-pointer hover:text-orange" title="下载" onClick={() => window.open('https://mods.factorio.com/mod/' + name, '_blank')}/>}</div>);
+                        })}
                     </div>
                 )}
-            </td>
-            )}
-            {vis.includes('version') && (
-            <td className="pr-4">
-                {mod.version}
-                {!disabled && newVersion && <FontAwesomeIcon spin={icon === faSpinner}
-                                                onClick={() => {
-                                                    setIcon(faSpinner)
-                                                    updateMod(newVersion)
-                                                        .finally(() => setIcon(faArrowCircleUp))
-                                                }}
-                                                className="hover:text-orange cursor-pointer ml-1"
-                                                icon={icon}/>}
-            </td>
-            )}
-            {vis.includes('factorio') && (
-            <td className="pr-4">{mod.dep_op ? mod.dep_op + ' ' + mod.factorio_version : mod.factorio_version}</td>
-            )}
-            {vis.includes('size') && (
-            <td className="pr-4 text-gray-light text-sm">{mod.file_size > 0 ? ((mod.file_size / 1024).toFixed(0) + ' KB') : '-'}</td>
-            )}
-            {
-                !disabled &&
-                <td className="pr-4">
-                    <FontAwesomeIcon className={"text-red cursor-pointer hover:text-red-light"}
-                                     onClick={() => deleteMod(mod.name)} icon={faTrashAlt}/>
-                </td>
-            }
+            </div>
+        );
+    }
+
+
+    const stripVersion = (v) => {
+        if (!v) return v;
+        const parts = v.split('.');
+        if (parts.length === 4 && parts[3] === '0') parts.pop();
+        return parts.join('.');
+    };
+
+    const parseDepName = (dep) => {
+        if (typeof dep !== 'string') return '';
+        const parts = dep.split(/\s+/);
+        const first = parts[0] || '';
+        return first.replace(/^[?!()]+/, '').replace(/[?!()]+$/, '');
+    };
+
+    const isDepInstalled = (depName) => Array.isArray(allMods) && allMods.some(m => m.name === depName);
+
+    const scrollToMod = (name) => {
+        const el = document.getElementById('mod-row-' + name.replace(/[^a-zA-Z0-9_-]/g, ''));
+        if (el) { el.scrollIntoView({behavior:'smooth',block:'center'}); el.classList.add('mod-flash'); setTimeout(() => el.classList.remove('mod-flash'), 2000); }
+    };
+
+    const repairMod = async () => {
+        setRepairing(true);
+        try {
+            const info = await modsResource.portal.info(mod.name);
+            const release = info.releases.find(r => r.version === mod.version) || info.releases[info.releases.length - 1];
+            if (release) await updateMod({downloadUrl: release.download_url, fileName: release.file_name, modName: mod.name});
+        } catch (e) {}
+        setRepairing(false);
+    };
+
+    const downloadMod = () => window.open('https://mods.factorio.com' + (newVersion?.downloadUrl || '/mod/' + mod.name), '_blank');
+
+    // Data-driven cell rendering — column key → render function
+    const renderCell = (colKey) => {
+        switch (colKey) {
+            case 'compatibility':
+                return (
+                    <td key="compat" className="pr-4 text-center">
+                        {mod.compatibility ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>}
+                    </td>
+                );
+            case 'enabled':
+                return (
+                    <td key="enabled" className="pr-4 text-center">
+                        {isDLC ? (mod.enabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>)
+                        : disabled ? (mod.enabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>)
+                        : mod.enabled ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green" icon={faToggleOn} onClick={() => toggleMod(mod.name)}/>
+                        : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={() => toggleMod(mod.name)}/>}
+                    </td>
+                );
+            case 'name':
+                return (
+                    <td key="name" className="pr-4">
+                        {mod.title}
+                        {safeDeps.length > 0 && (
+                            <span className="ml-1 text-gray-light cursor-pointer select-none" onClick={() => setSafeDepsOpen(!safeDepsOpen)}>
+                                <FontAwesomeIcon icon={safeDepsOpen ? faCaretDown : faCaretRight} className="mr-1 text-xs"/>
+                                <span className="text-xs">{safeDeps.length}</span>
+                            </span>
+                        )}
+                        {safeDepsOpen && safeDeps.length > 0 && (
+                            <div className="mt-1 pl-2 border-l-2 border-gray-dark text-xs text-gray-light">
+                                {safeDeps.map((d, i) => {
+                                    const name = parseDepName(d);
+                                    const inst = isDepInstalled(name);
+                                    return (
+                                        <div key={i} className={'whitespace-nowrap py-0.5 ' + (inst ? '' : 'opacity-60')}>
+                                            {d.trim()}
+                                            {inst
+                                                ? <FontAwesomeIcon icon={faEye} className="ml-2 text-blue-400 cursor-pointer hover:text-blue-200" title="定位" onClick={() => { scrollToMod(name); setSafeDepsOpen(false); }}/>
+                                                : <FontAwesomeIcon icon={faDownload} className="ml-2 text-gray cursor-pointer hover:text-orange" title="下载" onClick={() => window.open('https://mods.factorio.com/mod/' + name, '_blank')}/>}
+                                        </div>
+                                    );
+                                })}
+                            </div>
+                        )}
+                    </td>
+                );
+            case 'version':
+                return (
+                    <td key="version" className="pr-4">
+                        {mod.version}
+                        {!disabled && newVersion && <FontAwesomeIcon spin={icon === faSpinner} onClick={() => { setIcon(faSpinner); updateMod(newVersion).finally(() => setIcon(faArrowCircleUp)); }} className="hover:text-orange cursor-pointer ml-1" icon={icon}/>}
+                    </td>
+                );
+            case 'factorio':
+                return (
+                    <td key="factorio" className="pr-4">
+            <td className="pr-4">{'≥ ' + stripVersion(mod.factorio_version)}</td>
+                    </td>
+                );
+            case 'size':
+                return (
+                    <td key="size" className="pr-4 text-gray-light text-sm">
+                        {mod.file_size > 0 ? ((mod.file_size / 1024).toFixed(0) + ' KB') : '-'}
+                    </td>
+                );
+            default:
+                return null;
+        }
+    };
+
+    return (
+        <tr className="py-1 border-b border-gray-dark" id={'mod-row-' + (mod.name || '').replace(/[^a-zA-Z0-9_-]/g, '')}>
+            <td className="text-gray-light text-xs" style={{width: 40, height: 40, textAlign: 'center', verticalAlign: 'middle'}}>{index}</td>
+            {vis.map(key => renderCell(key))}
+            {!isDLC && !disabled && (
+            <td className="pr-2 text-center" style={{width: 100}}>
+                <FontAwesomeIcon icon={faUpRightFromSquare} className="text-gray-light cursor-pointer hover:text-white mx-1" title="模组门户" onClick={() => window.open('https://mods.factorio.com/mod/' + mod.name, '_blank')}/>
+                <FontAwesomeIcon icon={faDownload} className="text-gray-light cursor-pointer hover:text-white mx-1" title="下载模组" onClick={downloadMod}/>
+                <FontAwesomeIcon icon={faRotate} spin={repairing} className={repairing ? 'text-orange cursor-pointer mx-1' : 'text-gray-light cursor-pointer hover:text-orange mx-1'} title="修复模组" onClick={repairMod}/>
+                <FontAwesomeIcon icon={faTrashAlt} className="text-red cursor-pointer hover:text-red-light mx-1" title="删除模组" onClick={() => deleteMod(mod.name)}/>
+            </td>)}
         </tr>
     )
 }
diff --git a/ui/App/views/Mods/components/ModList.jsx b/ui/App/views/Mods/components/ModList.jsx
index cbcd9c93..75feda4e 100644
--- a/ui/App/views/Mods/components/ModList.jsx
+++ b/ui/App/views/Mods/components/ModList.jsx
@@ -1,214 +1,347 @@
-import Mod from "./Mod";
-import React, {useState, useMemo, useCallback, useRef, useEffect} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
-import {faCheck, faTimes, faToggleOff, faToggleOn, faSort, faSortUp, faSortDown, faCog} from "@fortawesome/free-solid-svg-icons";
+import {faCog, faSort, faSortUp, faSortDown, faCheck, faTimes, faToggleOn, faToggleOff, faUpRightFromSquare, faDownload, faRotate, faTrashAlt} from "@fortawesome/free-solid-svg-icons";
+import Mod from "./Mod";
+import React, { useState, useMemo, useCallback, useRef, useEffect } from "react";
+import { useReactTable, getCoreRowModel, getSortedRowModel, flexRender } from "@tanstack/react-table";
 import { useTranslation } from 'react-i18next';
 
 const DLC_MODS = new Set(['elevated-rails', 'quality', 'space-age']);
+const INIT_VIS = { compatibility: true, enabled: true, name: true, version: true, factorio: true, size: false, actions: true };
+const loadVis = () => { try { const s = localStorage.getItem('modlist_cols_v3'); if (s) { const v = JSON.parse(s); v.name = true; return v; } } catch {} return INIT_VIS; };
+const loadWidths = () => { try { return JSON.parse(localStorage.getItem('modlist_widths_v3') || '{}'); } catch { return {}; } };
+const saveWidths = (w) => localStorage.setItem('modlist_widths_v3', JSON.stringify(w));
 
-const COLUMNS = [
-    { key: 'compatibility', label: 'Compatibility', default: true, sortable: true, sortKey: 'compatibility', width: 80 },
-    { key: 'enabled',       label: 'Enabled',       default: true, sortable: true, sortKey: 'enabled',       width: 70 },
-    { key: 'name',          label: 'Name',          default: true, sortable: true, sortKey: 'title',         width: 0 },
-    { key: 'version',       label: 'Mod Version',   default: true, sortable: true, sortKey: 'version',       width: 100 },
-    { key: 'factorio',      label: 'Factorio Version', default: true, sortable: false,                       width: 140 },
-    { key: 'size',          label: 'File Size',     default: false, sortable: true, sortKey: 'file_size',    width: 80 },
-];
-
-const loadWidths = () => {
-    try { return JSON.parse(localStorage.getItem('modlist_widths') || '{}'); } catch { return {}; }
-};
-const saveWidths = (w) => localStorage.setItem('modlist_widths', JSON.stringify(w));
-
-const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod = null, disabled = false}) => {
-
-    const { t } = useTranslation('mods');
-    const [sortCol, setSortCol] = useState(null);
-    const [sortDir, setSortDir] = useState('asc');
-    const [colWidths, setColWidths] = useState(loadWidths);
-    const [visibleCols, setVisibleCols] = useState(() => {
-        const saved = localStorage.getItem('modlist_cols');
-        if (saved) { try { return JSON.parse(saved); } catch {} }
-        return COLUMNS.filter(c => c.default).map(c => c.key);
+const COLS_ORDER = Object.keys(INIT_VIS).filter(k => k !== 'actions');
+const DEF_SIZES = { compatibility: 80, enabled: 70, name: 200, version: 100, factorio: 140, size: 80, actions: 110 };
+const MIN_PAD = 28;
+const ICON_WIDTH = 16;
+const IDX_WIDTH = 40;
+
+const ModList = ({mods, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod, disabled = false}) => {
+    const { t, i18n } = useTranslation('mods');
+    const [sorting, setSorting] = useState([]);
+    const [columnVisibility, setColumnVisibility] = useState(loadVis);
+    const [columnOrder, setColumnOrder] = useState(() => {
+        const saved = localStorage.getItem('modlist_colorder_v2');
+        return saved ? JSON.parse(saved) : COLS_ORDER;
     });
     const [showSettings, setShowSettings] = useState(false);
     const [resizing, setResizing] = useState(null);
+    const [dragOverCol, setDragOverCol] = useState(null);
+    const [autoFitReady, setAutoFitReady] = useState(false);
+    const [, setTick] = useState(0);
+    const dragCol = useRef(null);
+    const colWidthsRef = useRef(loadWidths());
+    const contentMinRef = useRef({});
+    const containerRef = useRef(null);
+    const persistWidths = useCallback(() => saveWidths(colWidthsRef.current), []);
+    const settingsRef = useRef(null);
 
-    const dlcMods = mods.filter(m => DLC_MODS.has(m.name));
-    const regularMods = mods.filter(m => !DLC_MODS.has(m.name));
-    const dlcEnabled = dlcMods.some(m => m.enabled);
+    useEffect(() => {
+        const handler = (e) => { if (settingsRef.current && !settingsRef.current.contains(e.target)) setShowSettings(false); };
+        document.addEventListener('mousedown', handler);
+        return () => document.removeEventListener('mousedown', handler);
+    }, []);
 
+    const dlcMods = useMemo(() => mods.filter(m => DLC_MODS.has(m.name)), [mods]);
+    const regularMods = useMemo(() => mods.filter(m => !DLC_MODS.has(m.name)), [mods]);
     const sortedMods = useMemo(() => {
-        if (!sortCol) return regularMods;
-        const col = COLUMNS.find(c => c.key === sortCol);
-        if (!col || !col.sortKey) return regularMods;
-        const dir = sortDir === 'asc' ? 1 : -1;
+        if (sorting.length === 0) return regularMods;
+        const { id, desc } = sorting[0];
         return [...regularMods].sort((a, b) => {
-            let va = a[col.sortKey], vb = b[col.sortKey];
-            if (typeof va === 'string') va = va.toLowerCase();
-            if (typeof vb === 'string') vb = vb.toLowerCase();
-            if (va == null) return 1;
-            if (vb == null) return -1;
-            const cmp = va < vb ? -dir : va > vb ? dir : 0;
-            if (cmp !== 0) return cmp;
-            const nameCmp = (a.name || '').localeCompare(b.name || '');
-            if (nameCmp !== 0) return nameCmp;
-            return (a.version || '').localeCompare(b.version || '');
+            const va = a[id], vb = b[id];
+            if (va == null && vb == null) return 0;
+            if (va == null) return desc ? -1 : 1;
+            if (vb == null) return desc ? 1 : -1;
+            const cmp = String(va).localeCompare(String(vb), undefined, { numeric: true });
+            return desc ? -cmp : cmp;
         });
-    }, [regularMods, sortCol, sortDir]);
+    }, [regularMods, sorting]);
 
-    const handleSort = (colKey) => {
-        if (sortCol === colKey) { setSortDir(d => d === 'asc' ? 'desc' : 'asc'); }
-        else { setSortCol(colKey); setSortDir('asc'); }
-    };
+    const doMeasure = useCallback(() => {
+        if (sortedMods.length === 0) return;
+        const parent = containerRef.current || document.body;
+        const run = () => {
+            const span = document.createElement('span');
+            span.style.cssText = 'position:absolute;visibility:hidden;white-space:nowrap;font:inherit';
+            parent.appendChild(span);
+            const m = (text) => { span.textContent = text; return span.offsetWidth; };
+            const saved = colWidthsRef.current;
+            const cm = {};
 
-    const toggleCol = (key) => {
-        setVisibleCols(prev => {
-            const next = prev.includes(key) ? prev.filter(k => k !== key) : [...prev, key];
-            localStorage.setItem('modlist_cols', JSON.stringify(next));
-            return next;
-        });
-    };
+            cm.compatibility = m(t('Compatibility')) + ICON_WIDTH + 4;
+            cm.enabled = m(t('Enabled')) + ICON_WIDTH + 4;
+            cm.version = m(t('Mod Version')) + ICON_WIDTH + 4;
+            for (const mod of sortedMods) { const w = m(mod.version || ''); if (w > cm.version) cm.version = w; }
+            cm.factorio = m(t('Game Ver'));
+            for (const mod of sortedMods) {
+                const v = mod.factorio_version || '';
+                const parts = String(v).split('.'); while (parts.length > 2 && parts[parts.length-1] === '0') parts.pop();
+                const w = m('≥ ' + parts.join('.')); if (w > cm.factorio) cm.factorio = w;
+            }
+            cm.actions = m(t('Other Actions'));
+            cm.size = m(t('File Size')) + ICON_WIDTH + 4;
+            for (const mod of sortedMods) { const label = mod.file_size > 0 ? ((mod.file_size/1024).toFixed(0)+' KB') : '-'; const w = m(label); if (w > cm.size) cm.size = w; }
+            cm.name = ICON_WIDTH + 4;
+            for (const mod of sortedMods) { const w = m(mod.title || mod.name || ''); if (w > cm.name) cm.name = w; }
+            parent.removeChild(span);
 
-    const onResizeStart = useCallback((e, colKey) => {
-        e.preventDefault();
-        const startX = e.clientX;
-        const startWidth = colWidths[colKey] || COLUMNS.find(c => c.key === colKey)?.width || 100;
-        setResizing({ colKey, startX, startWidth });
-    }, [colWidths]);
+            contentMinRef.current = cm;
+            const nw = { ...saved };
+            for (const [colId, minW] of Object.entries(cm)) {
+                if (!saved[colId]) nw[colId] = minW + MIN_PAD;
+            }
+            colWidthsRef.current = nw;
+            setAutoFitReady(true);
+        };
+        if (document.fonts && document.fonts.ready) {
+            document.fonts.ready.then(run);
+        } else {
+            run();
+        }
+    }, [sortedMods, t]);
+
+    useEffect(() => { doMeasure(); }, [doMeasure]);
+
+    useEffect(() => {
+        let timer;
+        const onResize = () => {
+            clearTimeout(timer);
+            timer = setTimeout(() => doMeasure(), 200);
+        };
+        window.addEventListener('resize', onResize);
+        return () => { window.removeEventListener('resize', onResize); clearTimeout(timer); };
+    }, [doMeasure]);
+
+    useEffect(() => {
+        if (!autoFitReady) return;
+        const el = containerRef.current;
+        if (!el) return;
+        const recalc = () => {
+            const cm = contentMinRef.current;
+            let fixedSum = IDX_WIDTH;
+            for (const colId of Object.keys(DEF_SIZES)) {
+                if (colId === 'name' || !columnVisibility[colId]) continue;
+                fixedSum += colWidthsRef.current[colId] || (cm[colId] != null ? cm[colId] + MIN_PAD : DEF_SIZES[colId]);
+            }
+            const avail = el.clientWidth - fixedSum;
+            const nameMin = cm.name != null ? cm.name + MIN_PAD : DEF_SIZES.name;
+            colWidthsRef.current = { ...colWidthsRef.current, name: Math.max(nameMin, avail) };
+            setTick(t => t + 1);
+        };
+        recalc();
+        const ro = new ResizeObserver(recalc);
+        ro.observe(el);
+        return () => ro.disconnect();
+    }, [autoFitReady, columnVisibility]);
 
     useEffect(() => {
         if (!resizing) return;
         const onMove = (e) => {
             const diff = e.clientX - resizing.startX;
             const newWidth = Math.max(40, resizing.startWidth + diff);
-            setColWidths(prev => ({ ...prev, [resizing.colKey]: newWidth }));
-        };
-        const onUp = () => {
-            setColWidths(prev => { saveWidths(prev); return prev; });
-            setResizing(null);
+            colWidthsRef.current = { ...colWidthsRef.current, [resizing.colId]: newWidth };
+            setResizing(prev => prev ? { ...prev, _tick: Date.now() } : null);
         };
+        const onUp = () => { persistWidths(); setResizing(null); };
         document.addEventListener('mousemove', onMove);
         document.addEventListener('mouseup', onUp);
-        return () => {
-            document.removeEventListener('mousemove', onMove);
-            document.removeEventListener('mouseup', onUp);
-        };
-    }, [resizing]);
+        return () => { document.removeEventListener('mousemove', onMove); document.removeEventListener('mouseup', onUp); };
+    }, [resizing, persistWidths]);
+
+    const dlcEnabled = dlcMods.some(m => m.enabled);
+    const toggleDLC = () => { dlcMods.forEach(m => { if (dlcEnabled === m.enabled) toggleMod(m.name); }); };
+
+    const visibleCols = useMemo(() => Object.entries(columnVisibility).filter(([,v]) => v).map(([k]) => k), [columnVisibility]);
+    const vis = useCallback((key) => columnVisibility[key], [columnVisibility]);
 
-    const toggleDLC = () => {
-        dlcMods.forEach(m => {
-            if (dlcEnabled === m.enabled) toggleMod(m.name);
+    const columns = useMemo(() => [
+        { id: 'compatibility', accessorKey: 'compatibility', header: t('Compatibility'), size: DEF_SIZES.compatibility, enableSorting: true,
+            cell: ({ row }) => <div className="text-center">{row.original.compatibility ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>}</div>,
+        },
+        { id: 'enabled', accessorKey: 'enabled', header: t('Enabled'), size: DEF_SIZES.enabled, enableSorting: true,
+            cell: ({ row }) => {
+                const m = row.original;
+                const isDLC = DLC_MODS.has(m.name);
+                if (isDLC) return <div className="text-center">{m.enabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>}</div>;
+                return (<div className="text-center">{disabled ? (m.enabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>) : m.enabled ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green" icon={faToggleOn} onClick={() => toggleMod(m.name)}/> : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={() => toggleMod(m.name)}/>}</div>);
+            },
+        },
+        { id: 'name', accessorKey: 'name', header: t('Name'), size: DEF_SIZES.name, enableSorting: true,
+            cell: ({ row }) => <Mod mod={row.original} factorioVersion={factorioVersion} updateMod={updateMod} toggleMod={toggleMod} deleteMod={deleteMod} addUpdatableMod={addUpdatableMod} disabled={disabled} allMods={regularMods} visibleCols={visibleCols} index={row.index + 1} tableMode={true} />,
+        },
+        { id: 'version', accessorKey: 'version', header: t('Mod Version'), size: DEF_SIZES.version, enableSorting: true,
+            cell: ({ row }) => <span>{row.original.version}</span>,
+        },
+        { id: 'factorio', header: t('Game Ver'), size: DEF_SIZES.factorio, enableSorting: false,
+            cell: ({ row }) => { const v = row.original.factorio_version || ''; const parts = String(v).split('.'); while (parts.length > 2 && parts[parts.length-1] === '0') parts.pop(); return <span>≥ {parts.join('.')}</span>; },
+        },
+        { id: 'size', accessorKey: 'size', header: t('File Size'), size: DEF_SIZES.size, enableSorting: true,
+            cell: ({ row }) => <span className="text-gray-light text-sm">{row.original.file_size > 0 ? ((row.original.file_size/1024).toFixed(0)+' KB') : '-'}</span>,
+        },
+        { id: 'actions', header: t('Other Actions'), size: DEF_SIZES.actions, enableSorting: false, enableReorder: false,
+            cell: ({ row }) => {
+                const m = row.original;
+                if (disabled || DLC_MODS.has(m.name)) return null;
+                return (<div className="text-center"><FontAwesomeIcon icon={faUpRightFromSquare} className="text-gray-light cursor-pointer hover:text-white mx-1" title="模组门户" onClick={() => window.open('https://mods.factorio.com/mod/' + m.name, '_blank')}/><FontAwesomeIcon icon={faDownload} className="text-gray-light cursor-pointer hover:text-white mx-1" title="下载模组"/><FontAwesomeIcon icon={faRotate} className="text-gray-light cursor-pointer hover:text-orange mx-1" title="修复模组"/><FontAwesomeIcon icon={faTrashAlt} className="text-red cursor-pointer hover:text-red-light mx-1" title="删除模组" onClick={() => deleteMod(m.name)}/></div>);
+            },
+        },
+    ], [t, factorioVersion, updateMod, toggleMod, deleteMod, addUpdatableMod, disabled, regularMods, visibleCols]);
+
+    const table = useReactTable({
+        data: sortedMods,
+        columns,
+        state: { sorting, columnVisibility, columnOrder },
+        onSortingChange: setSorting,
+        onColumnVisibilityChange: updater => {
+            setColumnVisibility(prev => {
+                const next = typeof updater === 'function' ? updater(prev) : updater;
+                next.name = true;
+                localStorage.setItem('modlist_cols_v3', JSON.stringify(next));
+                return next;
+            });
+        },
+        onColumnOrderChange: updater => {
+            setColumnOrder(prev => {
+                const next = typeof updater === 'function' ? updater(prev) : updater;
+                localStorage.setItem('modlist_colorder_v2', JSON.stringify(next));
+                return next;
+            });
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+    });
+
+    const onResizeStart = useCallback((e, colId) => {
+        e.preventDefault();
+        colWidthsRef.current = { ...colWidthsRef.current };
+        setResizing({ colId, startX: e.clientX, startWidth: colWidthsRef.current[colId] || DEF_SIZES[colId] || 100 });
+    }, []);
+
+    const onDragStart = useCallback((e, colId) => {
+        dragCol.current = colId;
+        e.dataTransfer.effectAllowed = 'move';
+        e.dataTransfer.setData('text/plain', colId);
+    }, []);
+
+    const onDragOver = useCallback((e, colId) => {
+        e.preventDefault();
+        e.dataTransfer.dropEffect = 'move';
+        if (dragCol.current !== colId) setDragOverCol(colId);
+    }, []);
+
+    const onDragLeave = useCallback(() => { setDragOverCol(null); }, []);
+
+    const onDrop = useCallback((e, targetId) => {
+        e.preventDefault();
+        setDragOverCol(null);
+        const src = dragCol.current;
+        if (!src || src === targetId) return;
+        setColumnOrder(prev => {
+            const a = [...prev];
+            const i1 = a.indexOf(src), i2 = a.indexOf(targetId);
+            if (i1 >= 0 && i2 >= 0) { a.splice(i1, 1); a.splice(i2, 0, src); }
+            return a;
         });
-    };
+    }, []);
 
-    const SortIcon = ({colKey}) => {
-        if (sortCol !== colKey) return <FontAwesomeIcon icon={faSort} className="ml-1 text-gray opacity-40"/>;
-        return <FontAwesomeIcon icon={sortDir === 'asc' ? faSortUp : faSortDown} className="ml-1"/>;
-    };
+    const getColWidth = useCallback((colId) => {
+        return colWidthsRef.current[colId] || DEF_SIZES[colId] || 100;
+    }, []);
 
-    const getWidth = (col) => colWidths[col.key] || col.width || undefined;
-    const vis = (key) => visibleCols.includes(key);
+    const toggleCol = useCallback((key) => {
+        if (key === 'name') return;
+        setColumnVisibility(prev => {
+            const next = { ...prev, [key]: !prev[key] };
+            localStorage.setItem('modlist_cols_v3', JSON.stringify(next));
+            return next;
+        });
+    }, []);
+
+    const visibleLeaves = table.getVisibleLeafColumns();
+    const colIds = visibleLeaves.map(c => c.id);
 
     return (
-        <div>
-            <div className="flex justify-end mb-1 relative">
-                <button className="text-xs text-gray-light hover:text-white px-2 py-0.5 rounded"
-                        onClick={() => setShowSettings(!showSettings)}>
-                    <FontAwesomeIcon icon={faCog} className="mr-1"/>{t('columns')}
-                </button>
-                {showSettings && (
-                    <div className="absolute right-0 top-6 bg-gray-dark border border-gray-medium rounded-sm p-2 z-10 shadow-xl text-xs">
-                        {COLUMNS.map(c => (
-                            <label key={c.key} className="flex items-center gap-1 py-0.5 cursor-pointer text-gray-light hover:text-white">
-                                <input type="checkbox" checked={vis(c.key)} onChange={() => toggleCol(c.key)} className="mr-1"/>
-                                {t(c.label)}
-                            </label>
-                        ))}
-                    </div>
-                )}
-            </div>
-            <table className="w-full" style={{ tableLayout: 'fixed' }}>
-                <colgroup>
-                    {vis('compatibility') && <col style={{ width: getWidth(COLUMNS[0]) }}/>}
-                    {vis('enabled') && <col style={{ width: getWidth(COLUMNS[1]) }}/>}
-                    {vis('name') && <col/>}
-                    {vis('version') && <col style={{ width: getWidth(COLUMNS[3]) }}/>}
-                    {vis('factorio') && <col style={{ width: getWidth(COLUMNS[4]) }}/>}
-                    {vis('size') && <col style={{ width: getWidth(COLUMNS[5]) }}/>}
-                    <col style={{ width: 30 }}/>
-                </colgroup>
+        <div className="overflow-x-auto max-w-full" ref={containerRef}>
+            <table className="whitespace-nowrap" style={{ tableLayout: 'fixed', width: table.getCenterTotalSize() }}>
                 <thead>
-                    <tr className="text-left border-b-2 border-gray">
-                        {vis('compatibility') && (
-                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('compatibility')}>
-                                {t('Compatibility')}<SortIcon colKey="compatibility"/>
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'compatibility')}/>
-                            </th>
-                        )}
-                        {vis('enabled') && (
-                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('enabled')}>
-                                {t('Enabled')}<SortIcon colKey="enabled"/>
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'enabled')}/>
-                            </th>
-                        )}
-                        {vis('name') && (
-                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('name')}>
-                                {t('Name')}<SortIcon colKey="name"/>
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'name')}/>
-                            </th>
-                        )}
-                        {vis('version') && (
-                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('version')}>
-                                {t('Mod Version')}<SortIcon colKey="version"/>
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'version')}/>
+                    {table.getHeaderGroups().map(hg => (
+                        <tr key={hg.id} className="text-left border-b-2 border-gray sticky top-0 z-10 bg-gray-dark">
+                            <th className="border-r border-gray relative sticky left-0 z-[15] bg-gray-dark" style={{ width: IDX_WIDTH }}>
+                                <div className="flex items-center justify-center h-10 relative" ref={settingsRef}>
+                                    <button className="text-gray-light hover:text-white text-sm px-1"
+                                        onClick={() => setShowSettings(!showSettings)}
+                                        title={t('columns')}>
+                                        <FontAwesomeIcon icon={faCog}/>
+                                    </button>
+                                    {showSettings && (
+                                        <div className="absolute left-0 top-full mt-1 bg-gray-dark border border-gray-medium rounded-sm p-2 z-20 shadow-xl text-xs w-36">
+                                            {columns.filter(c => c.id !== 'actions' && c.id !== 'name').map(c => (
+                                                <label key={c.id} className="flex items-center gap-1 py-0.5 cursor-pointer text-gray-light hover:text-white whitespace-nowrap">
+                                                    <input type="checkbox" checked={vis(c.id)} onChange={() => toggleCol(c.id)} className="mr-1"/>
+                                                    {typeof c.header === 'string' ? c.header : c.id}
+                                                </label>
+                                            ))}
+                                        </div>
+                                    )}
+                                </div>
                             </th>
-                        )}
-                        {vis('factorio') && (
-                            <th className="px-2 relative border-r border-gray">
-                                {t('Factorio Version')}
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'factorio')}/>
-                            </th>
-                        )}
-                        {vis('size') && (
-                            <th className="cursor-pointer select-none px-2 relative border-r border-gray" onClick={() => handleSort('size')}>
-                                {t('File Size')}<SortIcon colKey="size"/>
-                                <div className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-blue-400"
-                                     onMouseDown={(e) => onResizeStart(e, 'size')}/>
-                            </th>
-                        )}
-                        <th style={{width: 30}}/>
-                    </tr>
+                            {hg.headers.map(header => {
+                                const c = header.column;
+                                const dragging = dragOverCol === c.id;
+                                return (
+                                    <th key={header.id}
+                                        className="px-2 relative border-r border-gray select-none transition-colors bg-gray-dark"
+                                        style={{ width: getColWidth(c.id), cursor: c.getCanSort() ? 'pointer' : 'default',
+                                            borderLeft: dragging ? '3px solid #5C8FFF' : undefined,
+                                            opacity: dragging ? 0.6 : 1 }}
+                                        draggable={c.id !== 'actions'}
+                                        onDragStart={(e) => onDragStart(e, c.id)}
+                                        onDragOver={(e) => onDragOver(e, c.id)}
+                                        onDragLeave={onDragLeave}
+                                        onDrop={(e) => onDrop(e, c.id)}>
+                                        <div className="flex items-center gap-1 overflow-hidden"
+                                            onClick={c.getCanSort() ? c.getToggleSortingHandler() : undefined}>
+                                            <span className="overflow-hidden text-ellipsis whitespace-nowrap">{flexRender(c.columnDef.header, header.getContext())}</span>
+                                            {c.getIsSorted() === 'asc' ? <FontAwesomeIcon icon={faSortUp} className="text-xs pointer-events-none"/> :
+                                             c.getIsSorted() === 'desc' ? <FontAwesomeIcon icon={faSortDown} className="text-xs pointer-events-none"/> :
+                                             c.getCanSort() ? <FontAwesomeIcon icon={faSort} className="text-xs text-gray opacity-40 pointer-events-none"/> : null}
+                                        </div>
+                                        <div className="absolute right-0 top-0 bottom-0 w-1.5 cursor-col-resize hover:bg-blue-400 group"
+                                            onMouseDown={(e) => { e.stopPropagation(); onResizeStart(e, c.id); }}>
+                                            <div className="absolute right-0 top-1 bottom-1 w-px bg-gray-medium"/>
+                                        </div>
+                                    </th>
+                                );
+                            })}
+                        </tr>
+                    ))}
                 </thead>
                 <tbody>
                     {factorioVersion !== null && dlcMods.length > 0 && (
                         <tr className="border-b border-gray-dark bg-blue-50 hover:bg-blue-100">
-                            {vis('compatibility') && <td className="px-2"><FontAwesomeIcon className="text-green" icon={faCheck}/></td>}
-                            {vis('enabled') && <td className="px-2">
-                                {disabled
-                                    ? dlcEnabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>
-                                    : dlcEnabled
-                                        ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green" icon={faToggleOn} onClick={toggleDLC}/>
-                                        : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={toggleDLC}/>
-                                }
-                            </td>}
-                            {vis('name') && <td className="px-2 italic text-blue-600">{t('Space Age DLC')}</td>}
-                            {vis('version') && <td className="px-2">{dlcMods[0]?.version}</td>}
-                            {vis('factorio') && <td className="px-2">{dlcMods[0]?.factorio_version}</td>}
-                            {vis('size') && <td className="px-2 text-gray-light text-sm">-</td>}
-                            <td/>
+                            <td className="text-gray-light text-xs text-center sticky left-0 z-[5] bg-[#1C1C1C]">DLC</td>
+                            {colIds.map(colId => {
+                                if (colId === 'actions') return <td key={colId}/>;
+                                if (colId === 'compatibility') return <td key={colId} className="px-2 text-center"><FontAwesomeIcon className="text-green" icon={faCheck}/></td>;
+                                if (colId === 'enabled') return <td key={colId} className="px-2 text-center">{disabled ? (dlcEnabled ? <FontAwesomeIcon className="text-green" icon={faCheck}/> : <FontAwesomeIcon className="text-red" icon={faTimes}/>) : (dlcEnabled ? <FontAwesomeIcon className="cursor-pointer hover:text-green-light text-green" icon={faToggleOn} onClick={toggleDLC}/> : <FontAwesomeIcon className="cursor-pointer hover:text-red-light text-red" icon={faToggleOff} onClick={toggleDLC}/>)}</td>;
+                                if (colId === 'name') return <td key={colId} className="px-2 italic text-blue-600">{t('Space Age DLC')}</td>;
+                                if (colId === 'version') return <td key={colId} className="px-2">{dlcMods[0]?.version}</td>;
+                                if (colId === 'factorio') return <td key={colId} className="px-2">≥ {dlcMods[0]?.factorio_version}</td>;
+                                if (colId === 'size') return <td key={colId} className="px-2 text-gray-light text-sm">-</td>;
+                                return <td key={colId}/>;
+                            })}
                         </tr>
                     )}
-                    {factorioVersion !== null && sortedMods.map(mod => (
-                        <Mod mod={mod} key={mod.file_name || mod.name}
-                             updateMod={updateMod} toggleMod={toggleMod} deleteMod={deleteMod}
-                             addUpdatableMod={addUpdatableMod} factorioVersion={factorioVersion}
-                             disabled={disabled} visibleCols={visibleCols} />
+                    {table.getRowModel().rows.map(row => (
+                        <tr key={row.id} className="py-1 border-b border-gray-dark">
+                            <td className="text-gray-light text-xs text-center sticky left-0 z-[5] bg-[#1C1C1C]" style={{height: 40}}>{row.index + 1}</td>
+                            {row.getVisibleCells().map(cell => (
+                                <td key={cell.id} className="pr-4 overflow-hidden text-ellipsis">
+                                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                                </td>
+                            ))}
+                        </tr>
                     ))}
                 </tbody>
             </table>
diff --git a/ui/api/client.js b/ui/api/client.js
index 572d7542..b5784f53 100644
--- a/ui/api/client.js
+++ b/ui/api/client.js
@@ -8,8 +8,9 @@ const client = Axios.create({
 });
 
 client.interceptors.response.use(res => res, err => {
+    const url = err.config?.url || '';
     if (!err.response) {
-        if (window.flash) window.flash("Network error or request timeout", "red");
+        if (window.flash && !url.includes('/portal/info/')) window.flash("Network error or request timeout", "red");
         return Promise.reject(err);
     }
     const status = err.response.status;
@@ -22,7 +23,7 @@ client.interceptors.response.use(res => res, err => {
         }
     } else if (status === 404) {
         // 404 is expected for portal "mod not found" — don't flash
-    } else {
+    } else if (!url.includes('/portal/info/')) {
         if (window.flash) {
             const data = err.response.data;
             const msg = typeof data === 'string' ? data
diff --git a/ui/api/resources/mods.js b/ui/api/resources/mods.js
index 1210398b..3fa99b87 100644
--- a/ui/api/resources/mods.js
+++ b/ui/api/resources/mods.js
@@ -40,15 +40,11 @@ const mods = {
         const response = await client.post('/api/saves/mods/sync', {saveFile, modNames});
         return response.data;
     },
-    downloadAllURL: '/api/mods/download',
-    getFromSave: async saveFile => {
-        const response = await client.post('/api/saves/mods', {saveFile});
-        return response.data;
-    },
-    syncFromSave: async (saveFile, modNames) => {
-        const response = await client.post('/api/mods/sync', {saveFile, modNames});
+    cancelSync: async () => {
+        const response = await client.post('/api/saves/mods/sync/cancel');
         return response.data;
     },
+    downloadAllURL: '/api/mods/download',
     portal: {
         login: async (username, token) => {
             const response = await client.post('/api/mods/portal/login', {
@@ -81,10 +77,23 @@ const mods = {
             const response = await client.get('/api/mods/portal/list');
             return response.data
         },
-        info: async mod => {
-            const response = await client.get(`/api/mods/portal/info/${mod}`);
-            return response.data;
-        }
+        info: (() => {
+            let queue = Promise.resolve();
+            return async (mod) => {
+                const prev = queue;
+                let resolve;
+                queue = new Promise(r => { resolve = r; });
+                await prev;
+                try {
+                    const response = await client.get(`/api/mods/portal/info/${mod}`);
+                    resolve();
+                    return response.data;
+                } catch (e) {
+                    resolve();
+                    throw e;
+                }
+            };
+        })(),
     },
     packs: {
         list: async () => {
diff --git a/ui/api/socket.js b/ui/api/socket.js
index 7400eede..490e0583 100644
--- a/ui/api/socket.js
+++ b/ui/api/socket.js
@@ -4,91 +4,33 @@ const bus = new EventEmitter();
 
 const ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
 
+const activeRooms = new Set();
+
 function connect() {
     const socket = new WebSocket(ws_scheme + "://" + window.location.host + "/ws");
 
     function logSubscribeEvent() {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "subscribe",
-                        value: "gamelog"
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "gamelog"}}));
     }
 
     function logUnsubscribeEvent() {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "unsubscribe",
-                        value: "gamelog"
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "unsubscribe", value: "gamelog"}}));
     }
 
     function serverStatusSubscribeEvent() {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "subscribe",
-                        value: "server_status"
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "server_status"}}));
     }
 
     function commandSendEvent(command) {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "command",
-                        value: command
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "command", value: command}}));
     }
 
     function modInstallSubscribeEvent() {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "subscribe",
-                        value: "mod_install"
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "mod_install"}}));
     }
 
     function serverVersionSubscribeEvent() {
-        socket.send(
-            JSON.stringify(
-                {
-                    room_name: "",
-                    controls: {
-                        type: "subscribe",
-                        value: "server_version"
-                    }
-                }
-            )
-        );
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "server_version"}}));
     }
 
     function modsSyncSubscribeEvent() {
@@ -99,26 +41,64 @@ function connect() {
         socket.send(JSON.stringify({room_name: "", controls: {type: "unsubscribe", value: "mods_sync"}}));
     }
 
+    function modsEventsSubscribeEvent() {
+        socket.send(JSON.stringify({room_name: "", controls: {type: "subscribe", value: "mods_events"}}));
+    }
+
+    function modsEventsUnsubscribeEvent() {
+        socket.send(JSON.stringify({room_name: "", controls: {type: "unsubscribe", value: "mods_events"}}));
+    }
+
+    const roomSubs = {
+        gamelog: logSubscribeEvent,
+        server_status: serverStatusSubscribeEvent,
+        mod_install: modInstallSubscribeEvent,
+        server_version: serverVersionSubscribeEvent,
+        mods_sync: modsSyncSubscribeEvent,
+        mods_events: modsEventsSubscribeEvent,
+    };
+
+    function subscribe(room) {
+        activeRooms.add(room);
+        const fn = roomSubs[room];
+        if (fn) fn();
+    }
+
+    function unsubscribe(room) {
+        activeRooms.delete(room);
+    }
+
     function registerEventEmitter() {
-        bus.on('log subscribe', logSubscribeEvent);
-        bus.on('log unsubscribe', logUnsubscribeEvent);
-        bus.on('server status subscribe', serverStatusSubscribeEvent);
-        bus.on('command send', commandSendEvent);
-        bus.on('mods sync subscribe', modsSyncSubscribeEvent);
-        bus.on('mods sync unsubscribe', modsSyncUnsubscribeEvent);
-        bus.on('server version subscribe', serverVersionSubscribeEvent);
-        bus.on('mod install subscribe', modInstallSubscribeEvent);
+        bus.on('log subscribe',      () => subscribe('gamelog'));
+        bus.on('log unsubscribe',    () => { unsubscribe('gamelog'); logUnsubscribeEvent(); });
+        bus.on('server status subscribe', () => subscribe('server_status'));
+        bus.on('command send',       commandSendEvent);
+        bus.on('mods sync subscribe',     () => subscribe('mods_sync'));
+        bus.on('mods sync unsubscribe',   () => { unsubscribe('mods_sync'); modsSyncUnsubscribeEvent(); });
+        bus.on('mods events subscribe',   () => subscribe('mods_events'));
+        bus.on('mods events unsubscribe', () => { unsubscribe('mods_events'); modsEventsUnsubscribeEvent(); });
+        bus.on('server version subscribe', () => subscribe('server_version'));
+        bus.on('mod install subscribe',    () => subscribe('mod_install'));
     }
 
     function unregisterEventEmitter() {
-        bus.off('log subscribe', logSubscribeEvent);
-        bus.off('log unsubscribe', logUnsubscribeEvent);
-        bus.off('server status subscribe', serverStatusSubscribeEvent);
-        bus.off('command send', commandSendEvent);
-        bus.off('mods sync subscribe', modsSyncSubscribeEvent);
-        bus.off('mods sync unsubscribe', modsSyncUnsubscribeEvent);
-        bus.off('server version subscribe', serverVersionSubscribeEvent);
-        bus.off('mod install subscribe', modInstallSubscribeEvent);
+        bus.off('log subscribe',      () => subscribe('gamelog'));
+        bus.off('log unsubscribe',    () => { unsubscribe('gamelog'); logUnsubscribeEvent(); });
+        bus.off('server status subscribe', () => subscribe('server_status'));
+        bus.off('command send',       commandSendEvent);
+        bus.off('mods sync subscribe',     () => subscribe('mods_sync'));
+        bus.off('mods sync unsubscribe',   () => { unsubscribe('mods_sync'); modsSyncUnsubscribeEvent(); });
+        bus.off('mods events subscribe',   () => subscribe('mods_events'));
+        bus.off('mods events unsubscribe', () => { unsubscribe('mods_events'); modsEventsUnsubscribeEvent(); });
+        bus.off('server version subscribe', () => subscribe('server_version'));
+        bus.off('mod install subscribe',    () => subscribe('mod_install'));
+    }
+
+    function resubscribeAll() {
+        for (const room of activeRooms) {
+            const fn = roomSubs[room];
+            if (fn) fn();
+        }
     }
 
     socket.onmessage = e => {
@@ -132,15 +112,15 @@ function connect() {
 
     socket.onclose = e => {
         unregisterEventEmitter()
-        // reconnect after 5 seconds
         setTimeout(connect, 5000);
     }
 
     socket.onopen = e => {
-        registerEventEmitter(socket)
+        registerEventEmitter()
+        resubscribeAll()
     }
 }
 
 connect();
 
-export default bus;
\ No newline at end of file
+export default bus;
diff --git a/ui/index.js b/ui/index.js
index 27bed460..7911e169 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -4,8 +4,12 @@ import Bus from "./notifications"
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App/App.jsx';
+import { eventLog } from './App/eventLog';
 
-window.flash = (message, color="gray-light") => Bus.emit('flash', ({message, color}));
+window.flash = (message, color="gray-light") => {
+    eventLog.add({type: color === 'red' ? 'error' : color === 'yellow' ? 'warn' : 'info', message: String(message), source: 'flash'});
+    Bus.emit('flash', ({message, color}));
+};
 
 const root = ReactDOM.createRoot(document.getElementById('app'));
 root.render(