Merge remote-tracking branch 'origin/main' into dev-1.6.0

# Conflicts:
#	.github/workflows/electron-build.yml

.github/workflows/electron-build.yml

@@ -5,9 +5,9 @@ on:
     branches:
       - development
     paths-ignore:
-      - "**.md"
+      - '**.md'
-      - ".gitignore"
+      - '.gitignore'
-      - "docker/**"
+      - 'docker/**'
   workflow_dispatch:
     inputs:
       build_type:
@@ -34,8 +34,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: '20'
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install dependencies
         run: npm ci
@@ -48,9 +48,7 @@ jobs:
 
       - name: Create Windows Portable zip
         run: |
-          cd release/win-unpacked
+          Compress-Archive -Path "release/win-unpacked/*" -DestinationPath "Termix-Windows-Portable.zip"
-          Compress-Archive -Path * -DestinationPath "../../Termix-Windows-Portable.zip"
-          cd ../..
 
       - name: Upload Windows Portable Artifact
         uses: actions/upload-artifact@v4
@@ -79,8 +77,8 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: '20'
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install dependencies
         run: npm ci