Merge branch 'MCSManager:master' into master

Author: un-boxing-man

.github/workflows/docker.yml

@@ -99,4 +99,4 @@ jobs:
           labels: ${{ steps.meta_daemon.outputs.labels }}
           build-args: |
             BUILDPLATFORM=linux/amd64
-            JAVA_RUNTIME=${{ matrix.java_version }}
+            EMBEDDED_JAVA_VERSION=${{ matrix.java_version }}

.github/workflows/release.yml

@@ -36,6 +36,11 @@ jobs:
           cp prod-scripts/linux/* dist_linux/
           cp prod-scripts/windows/* dist_windows/
 
+      - name: Copy license
+        run: |
+          cp LICENSE dist_linux/LICENSE
+          cp LICENSE dist_windows/LICENSE
+
       - name: Copy node runtime to windows build
         run: |
           wget https://nodejs.org/download/release/latest-v20.x/win-x64/node.exe -O dist_windows/daemon/node_app.exe
@@ -45,13 +50,21 @@ jobs:
         run: |
           mv dist_linux/ mcsmanager/
           tar czf mcsmanager_linux_release.tar.gz mcsmanager/
+          tar --exclude='mcsmanager/daemon' --exclude='mcsmanager/start-daemon.sh' -czf mcsmanager_linux_web_only_release.tar.gz mcsmanager/
+          tar --exclude='mcsmanager/web' --exclude='mcsmanager/start-web.sh' -czf mcsmanager_linux_daemon_only_release.tar.gz mcsmanager/
           rm -rf mcsmanager/
           mv dist_windows/ mcsmanager/
           zip -r mcsmanager_windows_release.zip mcsmanager/
+          zip -r mcsmanager_windows_web_only_release.zip mcsmanager/ -x "mcsmanager/daemon/*"
+          zip -r mcsmanager_windows_daemon_only_release.zip mcsmanager/ -x "mcsmanager/web/*"
 
       - name: Upload assets to release
         uses: softprops/action-gh-release@v2
         with:
           files: |
             mcsmanager_windows_release.zip
+            mcsmanager_windows_web_only_release.zip
+            mcsmanager_windows_daemon_only_release.zip
             mcsmanager_linux_release.tar.gz
+            mcsmanager_linux_web_only_release.tar.gz
+            mcsmanager_linux_daemon_only_release.tar.gz

.gitignore

@@ -16,6 +16,7 @@ production/
 production-code/
 test.js
 .idea/
+ai-api.key
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "lokalise.i18n-ally",
+        "esbenp.prettier-vscode",
+        "vue.volar",
+        "dbaeumer.vscode-eslint"
+    ]
+}

.vscode/settings.json

@@ -6,7 +6,22 @@
 
   "i18n-ally.sourceLanguage": "en",
   "i18n-ally.extract.keyMaxLength": 10000,
-  "cSpell.words": ["BUKKIT", "BUNGEECORD", "MINECRAFT"],
+  "cSpell.words": [
+    "BUKKIT",
+    "BUNGEECORD",
+    "cpuset",
+    "frpc",
+    "LOGNAME",
+    "MCSM",
+    "mcsmanager",
+    "MINECRAFT",
+    "mkdirs",
+    "openfrp",
+    "percpu",
+    "precpu",
+    "steamcmd",
+    "totp"
+  ],
   "i18n-ally.localesPaths": [
     "languages",
     "frontend/src/lang",
@@ -15,5 +30,16 @@
   ],
   "i18n-ally.keystyle": "flat",
   "i18n-ally.enabledFrameworks": ["vue"],
-  "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?"
+  "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "always",
+    "source.organizeImports": "always"
+  },
+  "typescript.preferences.organizeImports": {
+    "enabled": true
+  },
+  "javascript.preferences.organizeImports": {
+    "enabled": true
+  },
+  "editor.formatOnSave": true
 }