Merge branch 'RROrg:main' into main

offsoc · Feb 21, 2025 · aae72ad · aae72ad
2 parents 2147a4e + 5ddf7ee
commit aae72ad
Show file tree

Hide file tree

Showing 18 changed files with 288 additions and 65 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-25.2.1
+25.2.2
diff --git a/docs/addons.json b/docs/addons.json
@@ -739,6 +739,26 @@
             "zh_TW": "作者: GXNAS. 強制將 UPS 供電時的待機模式修改為關機. 參數: -f - 關機前觸發關機任務; -e - 待機模式前發關機任務(不修改為關機)."
         }
     },
+    "vmtools": {
+        "system": false,
+        "description": {
+            "en_US": "qemu-ga & &open-vm-tools.",
+            "ar_SA": "qemu-ga & &open-vm-tools.",
+            "de_DE": "qemu-ga & &open-vm-tools.",
+            "es_ES": "qemu-ga & &open-vm-tools.",
+            "fr_FR": "qemu-ga & &open-vm-tools.",
+            "ja_JP": "qemu-ga & &open-vm-tools.",
+            "ko_KR": "qemu-ga & &open-vm-tools.",
+            "ru_RU": "qemu-ga & &open-vm-tools.",
+            "th_TH": "qemu-ga & &open-vm-tools.",
+            "tr_TR": "qemu-ga & &open-vm-tools.",
+            "uk_UA": "qemu-ga & &open-vm-tools.",
+            "vi_VN": "qemu-ga & &open-vm-tools.",
+            "zh_CN": "qemu-ga & &open-vm-tools.",
+            "zh_HK": "qemu-ga & &open-vm-tools.",
+            "zh_TW": "qemu-ga & &open-vm-tools."
+        }
+    },
     "wireless": {
         "system": false,
         "description": {

diff --git a/docs/addons.xlsx b/docs/addons.xlsx
diff --git a/docs/issues.html b/docs/issues.html
@@ -69,7 +69,7 @@
                             $("#version").on("change", changeVersion);
                             $("#language").on("change", changeVersion);
                             $("#kernel").on("change", chanageKernel);
-                            $('#addons').val("acpid,mountloader,powersched,reboottoloader,trivial");
+                            $('#addons').val("acpid,mountloader,powersched,reboottoloader,trivial,vmtools");
                             setModels();
                         });
                     });

diff --git a/docs/models.json b/docs/models.json
@@ -119,8 +119,8 @@
             "7.2": "4.4.302"
         },
         "models": [
-            "FS6400",
-            "HD6500"
+            "HD6500",
+            "FS6400"
         ]
     },
     "r1000": {

diff --git a/docs/models.xlsx b/docs/models.xlsx