Remove leftover cache file

.github/workflows/build_all.yml

@@ -5,7 +5,6 @@ on:
     branches:
      - main
      - release/*
-     - belt-printer
     paths:
      - 'deps/**'
      - 'src/**'
@@ -56,23 +55,11 @@ jobs:
   build_linux:
     strategy:
       fail-fast: false
-      # Build both arches on every event (PRs included), through the same
-      # build_check_cache -> build_deps -> build_orca chain (the AppImage).
-      # aarch64 always uses the GitHub-hosted arm runner (there is no arm
-      # self-hosted server). amd64's empty arch is load-bearing: it keeps the
-      # historical 'linux-clang' deps cache key and the unsuffixed asset names.
-      matrix:
-        include:
-          - arch: ""
-            os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
-          - arch: "aarch64"
-            os: ubuntu-24.04-arm
     # Don't run scheduled builds on forks:
     if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
     uses: ./.github/workflows/build_check_cache.yml
     with:
-      os: ${{ matrix.os }}
-      arch: ${{ matrix.arch }}
+      os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
     secrets: inherit
   build_windows:
@@ -112,9 +99,7 @@ jobs:
     secrets: inherit
   unit_tests:
     name: Unit Tests
-    # Tests are built on the aarch64 leg by default (faster GitHub arm runner),
-    # so run them there; self-hosted builds them on the amd64 server instead.
-    runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04-arm' }}
+    runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
     needs: build_linux
     if: ${{ !cancelled() && success() }}
     steps:
@@ -185,9 +170,6 @@ jobs:
       date:
       ver:
       ver_pure:
-      # Belt-printer nightlies share the main nightly release but carry a `_belt`
-      # suffix so they never overwrite the main assets.
-      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
     steps:
     - name: "Remove unneeded stuff to free disk space"
       run:
@@ -246,12 +228,13 @@ jobs:
         name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
         path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
     - name: Deploy Flatpak to nightly release
-      if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer')
+      if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main'
       uses: WebFreak001/deploy-nightly@v3.2.0
       with:
         upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
         release_id: 137995723
         asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_nightly${{ env.nightly_suffix }}_${{ matrix.variant.arch }}.flatpak
+        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
         asset_content_type: application/octet-stream
         max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+

.github/workflows/build_check_cache.yml

@@ -33,10 +33,8 @@ jobs:
       - name: set outputs
         id: set_outputs
         env:
-          # Keep macOS/Linux cache keys architecture-specific. amd64 Linux passes
-          # no arch (key stays 'linux-clang', preserving the existing cache);
-          # aarch64 gets its own 'linux-clang-aarch64' key.
-          cache-os: ${{ runner.os == 'macOS' && format('macos-{0}', inputs.arch) || (runner.os == 'Windows' && 'windows' || format('linux-clang{0}', inputs.arch && format('-{0}', inputs.arch) || '')) }}
+          # Keep macOS cache keys and paths architecture-specific.
+          cache-os: ${{ runner.os == 'macOS' && format('macos-{0}', inputs.arch) || (runner.os == 'Windows' && 'windows' || 'linux-clang') }}
           dep-folder-name: ${{ runner.os == 'macOS' && format('/{0}', inputs.arch) || '/OrcaSlicer_dep' }}
           output-cmd: ${{ runner.os == 'Windows' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
         run: |

.github/workflows/build_orca.yml

@@ -29,11 +29,6 @@ jobs:
       ubuntu-ver: '2404'
       ubuntu-ver-str: '_Ubuntu2404'
       ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
-      # Branches whose builds are published to the nightly release. The
-      # belt-printer branch ships alongside main but its assets carry a `_belt`
-      # suffix (nightly_suffix) so they never overwrite the main nightly assets.
-      deploy_nightly: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' }}
-      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
 
     steps:
       - name: Checkout
@@ -70,11 +65,6 @@ jobs:
           echo "ver_pure=$ver_pure" >> $GITHUB_ENV
           echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
           echo "git_commit_hash=$git_commit_hash" >> $GITHUB_ENV
-          # Per-arch Linux AppImage naming: amd64 keeps the historical unsuffixed
-          # name (arch_suffix empty). Unused on macOS/Windows.
-          if [ '${{ inputs.arch }}' = 'aarch64' ]; then
-            echo "arch_suffix=_aarch64" >> $GITHUB_ENV
-          fi
         shell: bash
 
       - name: Get the version and date on Windows
@@ -127,6 +117,15 @@ jobs:
         run: |
           ./build_release_macos.sh -s -n -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a ${{ inputs.arch }} -t 10.15
 
+      - name: Generate system presets cache (macOS)
+        if: runner.os == 'macOS' && !inputs.macos-combine-only
+        working-directory: ${{ github.workspace }}
+        shell: bash
+        run: |
+          tool=$(find build/${{ inputs.arch }} -name generate_system_cache -type f | head -1)
+          profiles=$(find build/${{ inputs.arch }} -path "*/Resources/profiles" -type d | head -1)
+          "$tool" --path "$profiles" --log_level 2
+
       - name: Pack macOS app bundle ${{ inputs.arch }}
         if: runner.os == 'macOS' && !inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
@@ -163,9 +162,17 @@ jobs:
         run: |
           ./build_release_macos.sh -u -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a universal -t 10.15
 
+      - name: Delete intermediate per-arch artifacts
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        uses: geekyeggo/delete-artifact@v6
+        with:
+          name: |
+            OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}
+            OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}
+
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -173,8 +180,6 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
           CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
         run: |
-          # Load the `retry` helper (retries flaky commands such as `hdiutil create`).
-          source ${{ github.workspace }}/scripts/retry.sh
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
@@ -197,7 +202,7 @@ jobs:
           rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
           cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
           ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          retry hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           
           # Create separate OrcaSlicer_profile_validator DMG if the app exists
@@ -206,7 +211,7 @@ jobs:
             rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
             cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
             ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            retry hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
+            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
             codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           fi
           
@@ -221,16 +226,14 @@ jobs:
           fi
 
       - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/belt-printer' && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.ref != 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         run: |
-          # Load the `retry` helper (retries flaky commands such as `hdiutil create`).
-          source ${{ github.workspace }}/scripts/retry.sh
           mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg
           rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
           cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
           ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          retry hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
           
           # Create separate OrcaSlicer_profile_validator DMG if the app exists
           if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
@@ -238,19 +241,9 @@ jobs:
             rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
             cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
             ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            retry hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
+            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           fi
 
-      # Delete the per-arch bundles only after signing/DMG creation succeeded, so a
-      # failed run keeps them available for a re-run instead of forcing a full rebuild.
-      - name: Delete intermediate per-arch artifacts
-        if: success() && runner.os == 'macOS' && inputs.macos-combine-only
-        uses: geekyeggo/delete-artifact@v6
-        with:
-          name: |
-            OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}
-            OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}
-
       - name: Upload artifacts mac
         if: runner.os == 'macOS' && inputs.macos-combine-only
         uses: actions/upload-artifact@v7
@@ -267,13 +260,13 @@ jobs:
           if-no-files-found: ignore
 
       - name: Deploy Mac release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
           asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_universal_nightly${{ env.nightly_suffix }}.dmg
+          asset_name: OrcaSlicer_Mac_universal_nightly.dmg
           asset_content_type: application/octet-stream
           max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
 
@@ -308,6 +301,22 @@ jobs:
         #   WindowsSDKVersion: '10.0.26100.0\'
         run: .\build_release_vs.bat slicer
 
+      - name: Generate system presets cache (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $tool = Get-ChildItem -Recurse -Path build -Filter "generate_system_cache.exe" | Select-Object -First 1
+          if (-not $tool) { Write-Error "generate_system_cache.exe not found in build tree"; exit 1 }
+          $profiles = Get-ChildItem -Recurse -Path build -Directory -Filter profiles |
+            Where-Object { $_.FullName -match 'resources' } | Select-Object -First 1
+          if (-not $profiles) { Write-Error "profiles directory not found in build tree"; exit 1 }
+          # Add the slicer's runtime DLL directory to PATH so generate_system_cache.exe
+          # can resolve its dependencies (TKernel.dll etc.) without a full install step.
+          $dll_dir = Get-ChildItem -Recurse -Path build -Filter "TKernel.dll" |
+            Select-Object -First 1 | Select-Object -ExpandProperty DirectoryName
+          if ($dll_dir) { $env:PATH = "$dll_dir;$env:PATH" }
+          & $tool.FullName --path $profiles.FullName --log_level 2
+
       - name: Create installer Win
         if: runner.os == 'Windows' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build
@@ -355,24 +364,24 @@ jobs:
           path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
 
       - name: Deploy Windows release portable
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
           asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
-          asset_name: OrcaSlicer_Windows_nightly${{ env.nightly_suffix }}_portable.zip
+          asset_name: OrcaSlicer_Windows_nightly_portable.zip
           asset_content_type: application/x-zip-compressed
           max_releases: 1
 
       - name: Deploy Windows release installer
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
           asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
-          asset_name: OrcaSlicer_Windows_Installer_nightly${{ env.nightly_suffix }}.exe
+          asset_name: OrcaSlicer_Windows_Installer_nightly.exe
           asset_content_type: application/x-msdownload
           max_releases: 1
 
@@ -417,23 +426,16 @@ jobs:
         if: runner.os == 'Linux'
         shell: bash
         run: |
-          # Build + tar the unit tests (-t) only on the leg that runs them: the
-          # aarch64 leg by default (faster GitHub arm runner), or amd64 when using
-          # self-hosted runners (no arm self-hosted server). unit_tests downloads
-          # this tarball. The profile validator is built with -s, so amd64 keeps it.
-          tests=${{ (!vars.SELF_HOSTED && inputs.arch == 'aarch64') || (vars.SELF_HOSTED && inputs.arch != 'aarch64') }}
-          if $tests; then flags=-istrlL; else flags=-isrlL; fi
-          ./build_linux.sh "$flags"
+          ./build_linux.sh -istrlL
           ./scripts/check_appimage_libs.sh ./build/package ./build/package/bin/orca-slicer
-          appimage=./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage "$appimage"
-          chmod +x "$appimage"
-          if $tests; then tar -cvpf build_tests.tar build/tests; fi
+          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          tar -cvpf build_tests.tar build/tests
 
         # Use tar because upload-artifacts won't always preserve directory structure
         # and doesn't preserve file permissions
       - name: Upload Test Artifact
-        if: runner.os == 'Linux' && ((!vars.SELF_HOSTED && inputs.arch == 'aarch64') || (vars.SELF_HOSTED && inputs.arch != 'aarch64'))
+        if: runner.os == 'Linux'
         uses: actions/upload-artifact@v7
         with:
           name: ${{ github.sha }}-tests
@@ -442,8 +444,24 @@ jobs:
           retention-days: 5
           if-no-files-found: error
 
+      - name: Generate system presets cache (Linux)
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          tool=$(find build -name generate_system_cache -type f | head -1)
+          if [ -z "$tool" ]; then echo "ERROR: generate_system_cache not found in build tree" >&2; exit 1; fi
+          "$tool" --path build/package/resources/profiles --log_level 2
+          # Re-pack the AppImage so the per-vendor caches are included
+          appimage=$(find build -maxdepth 1 -name "OrcaSlicer_Linux_AppImage*.AppImage" | head -1)
+          chmod +x "$appimage"
+          "$appimage" --appimage-extract
+          cp build/package/resources/profiles/*.cache squashfs-root/resources/profiles/
+          appimagetool=$(find build -name "appimagetool.AppImage" | head -1)
+          ARCH=$(uname -m) "$appimagetool" --appimage-extract-and-run squashfs-root "$appimage"
+          rm -rf squashfs-root
+
       - name: Run external slicer regression tests
-        if: runner.os == 'Linux' && inputs.arch != 'aarch64'
+        if: runner.os == 'Linux'
         timeout-minutes: 20
         shell: bash
         run: |
@@ -453,7 +471,7 @@ jobs:
           python3 "$test_repo_dir/run_test.py" "${{ github.workspace }}/build/package/bin/orca-slicer"
 
       - name: Build orca_custom_preset_tests
-        if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64'
+        if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: bash
         run: |
@@ -465,28 +483,28 @@ jobs:
         if: ${{ ! env.ACT && runner.os == 'Linux' }}
         uses: actions/upload-artifact@v7
         with:
-          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}${{ env.arch_suffix }}_${{ env.ver }}
-          path: "./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage"
+          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
+          path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
 
       - name: Upload OrcaSlicer_profile_validator Ubuntu
-        if: ${{ ! env.ACT && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ ! env.ACT && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
           path: './build/src/Release/OrcaSlicer_profile_validator'
 
       - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && env.deploy_nightly == 'true' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
           release_id: 137995723
-          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly${{ env.nightly_suffix }}.AppImage
+          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_nightly.AppImage
           asset_content_type: application/octet-stream
           max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
       - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: rickstaa/action-create-tag@v1
         with:
           tag: "nightly-builds"
@@ -495,7 +513,7 @@ jobs:
           message: "nightly-builds"
 
       - name: Deploy Ubuntu OrcaSlicer_profile_validator release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
@@ -506,7 +524,7 @@ jobs:
           max_releases: 1
 
       - name: Deploy orca_custom_preset_tests
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED && inputs.arch != 'aarch64' }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
         uses: WebFreak001/deploy-nightly@v3.2.0
         with:
           upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}

.github/workflows/pr-label-bot.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Ask PR author for label
-        uses: actions/github-script@v9
+        uses: actions/github-script@v7
         with:
           script: |
             function isPermissionDenied(error) {
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Apply label command from PR author
-        uses: actions/github-script@v9
+        uses: actions/github-script@v7
         with:
           script: |
             function isPermissionDenied(error) {

README.md

@@ -161,8 +161,6 @@ It can also be installed through graphical software managers (KDE Discover, GNOM
 
 ### AppImage
 
-AppImages are published for both **x86_64** and **aarch64** (ARM64). Pick the file matching your CPU — the ARM64 build has `aarch64` in its name (e.g. `OrcaSlicer_Linux_AppImage_Ubuntu2404_aarch64_*.AppImage`).
-
  1. Download App image from the [releases page](https://github.com/OrcaSlicer/OrcaSlicer/releases).
  2. Double click the downloaded file to run it.
 

build_linux.sh

@@ -567,6 +567,8 @@ if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
 	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer
 	echo "Building OrcaSlicer_profile_validator .."
 	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer_profile_validator
+	echo "Building generate_system_cache ..."
+	print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target generate_system_cache
 	./scripts/run_gettext.sh
     fi
     if [[ -n "${BUILD_TESTS}" ]] ; then

deps/Boost/Boost.cmake

@@ -10,13 +10,7 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
     set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
 endif ()
 
-set(_options "")
-if (MSVC AND DEP_DEBUG)
-    set(_options "FORWARD_CONFIG")
-endif ()
-
 orcaslicer_add_cmake_project(Boost
-    ${_options}
     URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
     URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
     LIST_SEPARATOR |

deps/CMakeLists.txt

@@ -155,25 +155,17 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
 endif ()
 
 function(orcaslicer_add_cmake_project projectname)
-    cmake_parse_arguments(P_ARGS "FORWARD_CONFIG" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
+    cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
 
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi OR MSVC)
-        if (P_ARGS_FORWARD_CONFIG)
-            set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-        elseif (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
+        if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
             set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
         else ()
             set(_configs_line "")
         endif ()
     endif ()
 
-    if (P_ARGS_FORWARD_CONFIG)
-        set(_target_config "$<CONFIG>")
-    else()
-        set(_target_config "Release")
-    endif()
-
     if (MSVC)
       set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}")
     else()
@@ -216,8 +208,8 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
             ${DEP_CMAKE_OPTS}
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
-       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_target_config} -- ${_build_j}
-       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${_target_config}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
 
     if (FLATPAK)
@@ -259,8 +251,8 @@ else()
             ${DEP_CMAKE_OPTS}
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
-       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_target_config} -- ${_build_j}
-       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${_target_config}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
 
 endif()

deps/Draco/Draco.cmake

@@ -1,10 +1,4 @@
-set(_options "")
-if (MSVC AND DEP_DEBUG)
-    set(_options "FORWARD_CONFIG")
-endif ()
-
 orcaslicer_add_cmake_project(Draco
-    ${_options}
     URL https://github.com/google/draco/archive/refs/tags/1.5.7.zip
     URL_HASH SHA256=27b72ba2d5ff3d0a9814ad40d4cb88f8dc89a35491c0866d952473f8f9416b77
 )

deps/OpenCV/OpenCV.cmake

@@ -1,11 +1,7 @@
 if (MSVC)
     set(_use_IPP "-DWITH_IPP=ON")
-    if (DEP_DEBUG)
-        set(_options "FORWARD_CONFIG")
-    endif ()
 else ()
     set(_use_IPP "-DWITH_IPP=OFF")
-    set(_options "")
 endif ()
 
 if (IN_GIT_REPO)
@@ -13,7 +9,6 @@ if (IN_GIT_REPO)
 endif ()
 
 orcaslicer_add_cmake_project(OpenCV
-    ${_options}
     URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
     URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
     PATCH_COMMAND git apply ${OpenCV_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs.patch  ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch

deps_src/libnest2d/include/libnest2d/placers/nfpplacer.hpp

@@ -1123,17 +1123,18 @@ private:
 
         std::vector<RawShape> objs,excludes;
         for (const Item &item : items_) {
-            if (item.isFixed())
-                excludes.push_back(item.transformedShape());
-            else
-                objs.push_back(item.transformedShape());
+            if (item.isFixed()) continue;
+            objs.push_back(item.transformedShape());
         }
         if (objs.empty())
             return;
-        // Without fixed items this inner-fit NFP can exceed clipper's range and crash MSVC.
-        if (!excludes.empty())
         { // find a best position inside NFP of fixed items (excluded regions), so the center of pile is cloest to bed center
             RawShape objs_convex_hull = sl::convexHull(objs);
+            for (const Item &item : items_) {
+                if (item.isFixed()) {
+        		    excludes.push_back(item.transformedShape());
+                }
+            }
 
             auto   nfps = calcnfp(objs_convex_hull, excludes, bbin, Lvl<MaxNfpLevel::value>());
             if (nfps.empty()) {

resources/calib/temperature_tower/gen_belt_temp_tower.py

@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-"""Belt temperature-tower asset generator (discrete-provini design).
-
-A vertical temperature tower cannot be sliced on a belt printer, so lay a row of
-DISCRETE provini (one per temperature) along the belt (designed Y) with a fixed
-surface gap. Each provino is the chevron+arc unit (belt_temp_provino_unit.stl,
-keel-first); its temperature is ENGRAVED upright into the 50 mm face — a raised
-number would be an unsupported overhang on the belt. The C++ calib_temp belt branch
-(Plater.cpp) injects one M104 per zone 70 layers INTO provino i:
-  print_z[i] = i * PITCH * cos(theta) + 70 * layer_height   (theta = 45)
-inside the body, not in the empty inter-provino gap (which has no sliced layers for
-the event to attach to). PITCH below is the shared geometry contract with that code —
-keep them in sync.
-
-Generates one STL per filament temp range used by Temp_Calibration_Dlg.
-"""
-import numpy as np, trimesh, os
-from matplotlib.textpath import TextPath
-from matplotlib.font_manager import FontProperties
-from shapely.geometry import Polygon as ShPoly
-from shapely.ops import unary_union
-
-HERE = os.path.dirname(os.path.abspath(__file__))
-UNIT = os.path.join(HERE, 'belt_temp_provino_unit.stl')   # single provino, keel-first
-SURF_GAP = 25.0            # surface-to-surface gap between provini (mm) — user spec
-TEXT_H = 9.0
-TEXT_DEPTH = 0.8           # engraving depth (numbers are CUT into the face, not raised:
-                          # a raised number is an unsupported Y-overhang on the belt)
-TEXT_OVERSHOOT = 0.6       # extra height poking out of the face for a clean boolean cut
-
-# Temperature ranges (start, end) per filament family, 5 C step. File name encodes them.
-RANGES = [(230,190),(270,230),(250,230),(280,240),(240,210),(320,280)]
-
-unit = trimesh.load(UNIT)
-dY = unit.bounds[1,1] - unit.bounds[0,1]
-PITCH = dY + SURF_GAP                       # designed-Y pitch == C++ contract constant
-print(f"unit dY={dY:.2f}  PITCH={PITCH:.3f}  (C++ contract: print_z[i]=i*{PITCH:.3f}*cos45)")
-
-# 50 mm face normal (0,-1,1)/sqrt2 ; UPRIGHT basis u=+X det(+1) (verified non-mirrored)
-n = np.array([0,-1,1.])/np.sqrt(2)
-u = np.array([1,0,0.]); v = np.array([0,1,1.])/np.sqrt(2)
-R = np.column_stack([u,v,n])
-fn = unit.face_normals; fc = unit.triangles_center; fa = unit.area_faces
-sel = (fn@n) > 0.9
-face_c = (fc[sel]*fa[sel,None]).sum(0)/fa[sel].sum()
-
-def text_mesh(s):
-    tp = TextPath((0,0), s, size=TEXT_H, prop=FontProperties(family='DejaVu Sans'))
-    rings = [ShPoly(p) for p in tp.to_polygons() if len(p)>=3]
-    rings.sort(key=lambda r:r.area, reverse=True)
-    used=[False]*len(rings); parts=[]
-    for i,o in enumerate(rings):
-        if used[i]: continue
-        holes=[]
-        for j in range(i+1,len(rings)):
-            if not used[j] and o.contains(rings[j]): holes.append(rings[j].exterior.coords); used[j]=True
-        parts.append(ShPoly(o.exterior.coords,holes)); used[i]=True
-    poly = unary_union(parts)
-    geoms = list(poly.geoms) if poly.geom_type=='MultiPolygon' else [poly]
-    m = trimesh.util.concatenate([trimesh.creation.extrude_polygon(g,height=TEXT_DEPTH+TEXT_OVERSHOOT) for g in geoms])
-    c = m.bounds.mean(axis=0); m.apply_translation([-c[0],-c[1],0]); return m
-
-for t_start, t_end in RANGES:
-    temps = list(range(t_start, t_end-1, -5))
-    parts=[]
-    for i,T in enumerate(temps):
-        c = unit.copy(); c.apply_translation([0, i*PITCH, 0])
-        t = text_mesh(str(T)); M=np.eye(4); M[:3,:3]=R; t.apply_transform(M)
-        # place the text spanning from TEXT_DEPTH inside the face to TEXT_OVERSHOOT outside,
-        # then CUT it out of the provino (engrave) — no raised material, no Y-overhang.
-        t.apply_translation(face_c - n*TEXT_DEPTH + np.array([0,i*PITCH,0]))
-        c = trimesh.boolean.difference([c, t], engine='manifold')
-        parts.append(c)
-    asset = trimesh.util.concatenate(parts)
-    out = os.path.join(HERE, f"belt_temp_tower_{t_start}_{t_end}.stl")
-    asset.export(out)
-    dims = np.round(asset.bounds[1]-asset.bounds[0],1)
-    wt = all(p.is_watertight for p in parts)
-    print(f"  {t_start}->{t_end}: {len(temps)} zones  bbox={dims}  watertight={wt}  -> {os.path.basename(out)}")

resources/data/hints.ini

@@ -146,16 +146,16 @@ text = Fine-tuning for flow rate\nDid you know that flow rate can be fine-tuned
 text = Split your prints into plates\nDid you know that you can split a model that has a lot of parts into individual plates ready to print? This will simplify the process of keeping track of all the parts.
 
 [hint:Speed up your print with Adaptive Layer Height]
-text = Speed up your print with Adaptive Layer Height\nDid you know that you can print a model even faster by using the Adaptive Layer Height option? Check it out!
+text = Speed up your print with Adaptive Layer Height\nDid you know that you can print a model even faster, by using the Adaptive Layer Height option? Check it out!
 
 [hint:Support painting]
 text = Support painting\nDid you know that you can paint the location of your supports? This feature makes it easy to place the support material only on the sections of the model that actually need it.
 
 [hint:Different types of supports]
-text = Different types of supports\nDid you know that you can choose from multiple types of supports? Tree supports work great for organic models while saving filament and improving print speed. Check them out!
+text = Different types of supports\nDid you know that you can choose from multiple types of supports? Tree supports work great for organic models, while saving filament and improving print speed. Check them out!
 
 [hint:Printing Silk Filament]
-text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print successfully? A higher temperature and lower speed are always recommended for the best results.
+text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
 
 [hint:Brim for better adhesion]
 text = Brim for better adhesion\nDid you know that when printed models have a small contact interface with the printing surface, it's recommended to use a brim?
@@ -167,13 +167,13 @@ text = Set parameters for multiple objects\nDid you know that you can set slicin
 text = Stack objects\nDid you know that you can stack objects as a whole one?
 
 [hint:Flush into support/objects/infill]
-text = Flush into support/objects/infill\nDid you know that you can reduce wasted filament by flushing it into support/objects/infill during filament changes?
+text = Flush into support/objects/infill\nDid you know that you can reduce wasted filament by flushing it into support/objects/infill during filament change?
 
 [hint:Improve strength]
 text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?
 
 [hint:When do you need to print with the printer door opened]
-text = When do you need to print with the printer door opened?\nDid you know that opening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature? There is more info about this in the Wiki.
+text = When do you need to print with the printer door opened?\nDid you know that opening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature? More info about this in the Wiki.
 
 [hint:Avoid warping]
 text = Avoid warping\nDid you know that when printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping?

resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json

@@ -123,7 +123,7 @@
 		"0"
 	],
 	"machine_pause_gcode": "M600",
-	"machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM109 S[first_layer_temperature];\nDRAW_LINE_ONLY",
+	"machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nDRAW_LINE_ONLY",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"max_layer_height": [

resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json

@@ -126,7 +126,7 @@
 		"0"
 	],
 	"machine_pause_gcode": "M600",
-	"machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM109 S[first_layer_temperature];\nDRAW_LINE_ONLY",
+	"machine_start_gcode": "M140 S60\nM104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nNOZZLE_WIPE\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nDRAW_LINE_ONLY",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"max_layer_height": [

resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json

@@ -126,7 +126,7 @@
 		"0"
 	],
 	"machine_pause_gcode": "M600",
-	"machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X230 Y300 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y20  F4000\nG1 X230 F4000\nG1 Z-1  F600 \nG1 X270 F4000\nG1 Y25  F4000\nG1 X230 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=300\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM109 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X200 Y0.8 Z0.3 F1800.0 E20.0;draw line\nG92 E0\nG1 X200 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X100 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X100 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X180 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X180 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0",
+	"machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X230 Y300 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y20  F4000\nG1 X230 F4000\nG1 Z-1  F600 \nG1 X270 F4000\nG1 Y25  F4000\nG1 X230 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=300\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X200 Y0.8 Z0.3 F1800.0 E20.0;draw line\nG92 E0\nG1 X200 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X100 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X100 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X180 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X180 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"max_layer_height": [

resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json

@@ -126,7 +126,7 @@
 		"0"
 	],
 	"machine_pause_gcode": "M600",
-	"machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X180 Y247 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y11 F4000\nG1 X180 F4000\nG1 Z-1 F600 \nG1 X230 F4000\nG1 Y15 F4000\nG1 X180 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=247\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM109 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X170 Y0.8 Z0.3 F1800.0 E17.0;draw line\nG92 E0\nG1 X170 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X70 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X70 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X150 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X150 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0\n",
+	"machine_start_gcode": "M104 S140\nM190 S[first_layer_bed_temperature]\nM109 S{temperature_vitrification[0]}\nG28;\nG1 X180 Y247 Z10 F5000\nSET_KINEMATIC_POSITION Y=0\nG1 Y11 F4000\nG1 X180 F4000\nG1 Z-1 F600 \nG1 X230 F4000\nG1 Y15 F4000\nG1 X180 F4000\nG92 E0\nG1 Z10 F1200\nG1 Y0 F5000\nG1 E-1 F3000\nM400\nSET_KINEMATIC_POSITION Y=247\nG92 E-1\nM140 S[first_layer_bed_temperature];\nM104 S[first_layer_temperature];\nG1 X0 Y0.8 Z0.8 F18000\nG92 E0\nG1 X0 Y0.8 Z0.3 E8 F600\nG92 E0\nG1 X170 Y0.8 Z0.3 F1800.0 E17.0;draw line\nG92 E0\nG1 X170 Y0 Z0.3 F1800.0 E0.08;draw line\nG92 E0\nG1 X70 Y0 Z0.3 F1800.0 E10.0;draw line\nG92 E0\nG1 X70 Y1.6 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 X150 Y1.6 Z0.3 F1800.0 E8;draw line\nG92 E0\nG1 X150 Y0 Z0.3 F1800.0 E0.16;draw line\nG92 E0\nG1 E-1 Z5 F18000\nG92 E0\n",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"max_layer_height": [

resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json

@@ -45,7 +45,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-Nylon @Ender-5 Max-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-PETG @Hi-all.json

@@ -51,7 +51,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "1"
     ],
     "filament_retraction_length": [
         "0.8"

resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "1"
     ],
     "filament_retraction_length": [
         "0.8"

resources/profiles/Creality/filament/CR-PETG @SPARKX i7-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "2"
     ],
     "filament_type": [
         "PETG"

resources/profiles/Creality/filament/CR-PLA @Hi-all.json

@@ -39,7 +39,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "16"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json

@@ -45,7 +45,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "16"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-PLA Fluo @K2 Plus-all.json

@@ -45,7 +45,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "16"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-PLA Matte @K2 Plus-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-PLA Matte @SPARKX i7-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/CR-Silk @SPARKX i7-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "1.8"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/ENDER FAST PLA @K2 Plus-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "16"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Generic BVOH @Hi-all.json

@@ -45,7 +45,7 @@
         "1"
     ],
     "filament_max_volumetric_speed": [
-        "6"
+        "3"
     ],
     "filament_retract_before_wipe": [
         "100%"

resources/profiles/Creality/filament/Generic HIPS @K1 Max_CFS-C-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "4"
     ],
     "filament_retract_before_wipe": [
         "100%"

resources/profiles/Creality/filament/Generic HIPS @K1C-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "4"
     ],
     "filament_retract_before_wipe": [
         "100%"

resources/profiles/Creality/filament/Generic HIPS @K1C_CFS-C-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "4"
     ],
     "filament_retract_before_wipe": [
         "100%"

resources/profiles/Creality/filament/Generic HIPS @K1_CFS-C-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "4"
     ],
     "filament_retract_before_wipe": [
         "100%"

resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json

@@ -48,7 +48,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "16"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Generic PVA @Hi-all.json

@@ -48,7 +48,7 @@
         "1"
     ],
     "filament_max_volumetric_speed": [
-        "6"
+        "3"
     ],
     "filament_retract_before_wipe": [
         "100"

resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json

@@ -57,7 +57,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "10"
+        "1"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Hyper ABS @K2 Plus-all.json

@@ -51,7 +51,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "23"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Hyper PC @K2 Plus-all.json

@@ -54,7 +54,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "18"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json

@@ -51,7 +51,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "18"
+        "2"
     ],
     "filament_retract_before_wipe": [
         "100"

resources/profiles/Creality/filament/Hyper PLA @Hi-all.json

@@ -39,7 +39,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "21"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json

@@ -45,7 +45,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "21"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Creality/filament/Hyper PLA @SPARKX i7-all.json

@@ -51,7 +51,7 @@
         "0"
     ],
     "filament_max_volumetric_speed": [
-        "21"
+        "2"
     ],
     "filament_minimal_purge_on_wipe_tower": [
         "15"

resources/profiles/Custom.json

@@ -1,13 +1,9 @@
 {
 	"name": "Custom Printer",
-	"version": "02.04.00.03",
+	"version": "02.04.00.00",
 	"force_update": "0",
 	"description": "My configurations",
 	"machine_model_list": [
-		{
-			"name": "Generic Belt Printer",
-			"sub_path": "machine/MyBeltPrinter.json"
-		},
 		{
 			"name": "Generic Klipper Printer",
 			"sub_path": "machine/MyKlipper.json"
@@ -266,38 +262,18 @@
 			"name": "MyKlipper 0.8 nozzle",
 			"sub_path": "machine/MyKlipper 0.8 nozzle.json"
 		},
-		{
-			"name": "fdm_belt_common",
-			"sub_path": "machine/fdm_belt_common.json"
-		},
 		{
 			"name": "fdm_toolchanger_common",
 			"sub_path": "machine/fdm_toolchanger_common.json"
 		},
-		{
-			"name": "MyRRF 0.4 nozzle",
-			"sub_path": "machine/MyRRF 0.4 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.2 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.2 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.4 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.4 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.6 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.6 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.8 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.8 nozzle.json"
-		},
 		{
 			"name": "MyRepetier 0.4 nozzle",
 			"sub_path": "machine/MyRepetier 0.4 nozzle.json"
 		},
+		{
+			"name": "MyRRF 0.4 nozzle",
+			"sub_path": "machine/MyRRF 0.4 nozzle.json"
+		},
 		{
 			"name": "MyToolChanger 0.2 nozzle",
 			"sub_path": "machine/MyToolChanger 0.2 nozzle.json"

resources/profiles/Custom/machine/MyBeltPrinter 0.2 nozzle.json

@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.2 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "GM_BELT_001",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.2"
-	],
-	"max_layer_height": [
-		"0.16"
-	],
-	"min_layer_height": [
-		"0.04"
-	],
-	"printer_variant": "0.2",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}

resources/profiles/Custom/machine/MyBeltPrinter 0.4 nozzle.json

@@ -1,20 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.4 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "GM_BELT_002",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"printer_variant": "0.4",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}

resources/profiles/Custom/machine/MyBeltPrinter 0.6 nozzle.json

@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.6 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "GM_BELT_003",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.6"
-	],
-	"max_layer_height": [
-		"0.4"
-	],
-	"min_layer_height": [
-		"0.12"
-	],
-	"printer_variant": "0.6",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}

resources/profiles/Custom/machine/MyBeltPrinter 0.8 nozzle.json

@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.8 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "GM_BELT_004",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.8"
-	],
-	"max_layer_height": [
-		"0.6"
-	],
-	"min_layer_height": [
-		"0.2"
-	],
-	"printer_variant": "0.8",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}

resources/profiles/Custom/machine/MyBeltPrinter.json

@@ -1,12 +0,0 @@
-{
-	"type": "machine_model",
-	"name": "Generic Belt Printer",
-	"model_id": "my_belt_01",
-	"nozzle_diameter": "0.4;0.2;0.6;0.8",
-	"machine_tech": "FFF",
-	"family": "MyPrinter",
-	"bed_model": "Custom_350_bed.stl",
-	"bed_texture": "orcaslicer_bed_texture.svg",
-	"hotend_model": "",
-	"default_materials": "Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
-}

resources/profiles/Custom/machine/fdm_belt_common.json

@@ -1,99 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_belt_common",
-	"inherits": "fdm_klipper_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"single_extruder_multi_material": "0",
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @System",
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"long_retractions_when_cut": [
-		"0"
-	],
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"retract_lift_above": [
-		"0"
-	],
-	"retract_lift_below": [
-		"0"
-	],
-	"retract_lift_enforce": [
-		"All Surfaces"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_distances_when_cut": [
-		"18"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"travel_slope": [
-		"3"
-	],
-	"wipe": [
-		"1"
-	],
-	"wipe_distance": [
-		"1"
-	],
-	"z_hop": [
-		"0.4"
-	],
-	"z_hop_types": [
-		"Normal Lift"
-	],
-	"gcode_remap_x": "rev_x",
-	"gcode_remap_y": "pos_z",
-	"gcode_remap_z": "pos_y",
-	"printer_extruder_id": [
-		"1"
-	],
-	"belt_printer": "1",
-	"belt_slice_rotation": "x",
-	"belt_slice_rotation_angle": "45",
-	"belt_slice_rotation_global": "1",
-	"build_plate_tilt_x": "45",
-	"purge_in_prime_tower": "0",
-	"scan_first_layer": "0",
-	"auxiliary_fan": "0"
-}

resources/profiles/Flashforge.json

@@ -1,7 +1,7 @@
 {
 	"name": "Flashforge",
 	"url": "",
-	"version": "02.04.00.03",
+	"version": "02.04.00.01",
 	"force_update": "0",
 	"description": "Flashforge configurations",
 	"machine_model_list": [

resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge ABS Basic @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge ABS Basic.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge ASA Basic @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge ASA Basic.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge HS PETG @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge HS PETG.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PETG Basic @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PETG Pro @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PETG Pro.json

@@ -32,6 +32,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PETG Transparent @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json

@@ -32,6 +32,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PLA Basic @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Basic.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PLA Color Change @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json

@@ -9,7 +9,14 @@
 		"Flashforge PLA Galaxy @FF AD5M 0.25 nozzle"
 	],
 	"compatible_printers": [
-		"Flashforge Adventurer 5M 0.25 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.25 Nozzle"
+		"Flashforge Adventurer 5M 0.4 Nozzle",
+		"Flashforge Adventurer 5M 0.6 Nozzle",
+		"Flashforge Adventurer 5M 0.8 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }

resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json

@@ -14,6 +14,9 @@
 		"Flashforge Adventurer 5M 0.8 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.4 Nozzle",
 		"Flashforge Adventurer 5M Pro 0.6 Nozzle",
-		"Flashforge Adventurer 5M Pro 0.8 Nozzle"
+		"Flashforge Adventurer 5M Pro 0.8 Nozzle",
+		"Flashforge AD5X 0.4 nozzle",
+		"Flashforge AD5X 0.6 nozzle",
+		"Flashforge AD5X 0.8 nozzle"
 	]
 }