Fix "Access Violation" (#12704) (#12856)

Co-authored-by: Kiss Lorand <50251547+kisslorand@users.noreply.github.com>

.github/workflows/build_all.yml

@@ -49,37 +49,53 @@ concurrency:
 
 jobs:
   build_linux:
-    name: Build Linux
     strategy:
       fail-fast: false
     # 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: ubuntu-24.04
+      os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
     secrets: inherit
-  build_all:
-    name: Build Non-Linux
+  build_windows:
+    # 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: ${{ vars.SELF_HOSTED && 'orca-win-server' || 'windows-latest' }}
+      build-deps-only: ${{ inputs.build-deps-only || false }}
+      force-build: ${{ github.event_name == 'schedule' }}
+    secrets: inherit
+  build_macos_arch:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: windows-latest
-          - os: orca-macos-arm64
-            arch: arm64
+        arch:
+          - arm64
+          - x86_64
     # 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 }}
+      os: ${{ vars.SELF_HOSTED && 'orca-macos-arm64' || 'macos-14' }}
       arch: ${{ matrix.arch }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
       force-build: ${{ github.event_name == 'schedule' }}
     secrets: inherit
+  build_macos_universal:
+    name: Build macOS Universal
+    needs: build_macos_arch
+    if: ${{ !cancelled() && needs.build_macos_arch.result == 'success' && !inputs.build-deps-only && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
+    uses: ./.github/workflows/build_orca.yml
+    with:
+      os: ${{ vars.SELF_HOSTED && 'orca-macos-arm64' || 'macos-14' }}
+      arch: universal
+      macos-combine-only: true
+    secrets: inherit
   unit_tests:
     name: Unit Tests
-    runs-on: ubuntu-24.04
+    runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }}
     needs: build_linux
     if: ${{ !cancelled() && success() }}
     steps:
@@ -91,21 +107,24 @@ jobs:
             scripts
             tests
       - name: Apt-Install Dependencies
+        if: ${{ !vars.SELF_HOSTED }}
         uses: ./.github/actions/apt-install-deps
       - name: Restore Test Artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: ${{ github.sha }}-tests
       - uses: lukka/get-cmake@latest
         with:
-          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
+          cmakeVersion: "~4.3.0"  # use most recent 4.3.x version
+          useLocalCache: true         # <--= Use the local cache (default is 'false').
+          useCloudCache: true
       - name: Unpackage and Run Unit Tests
         timeout-minutes: 20
         run: |
           tar -xvf build_tests.tar
           scripts/run_unit_tests.sh
       - name: Upload Test Logs
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: ${{ failure() }}
         with:
           name: unit-test-logs
@@ -115,10 +134,15 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           files: "ctest_results.xml"
+      - name: Delete Test Artifact
+        if: success()
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: ${{ github.sha }}-tests
   flatpak:
     name: "Flatpak"
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49
       options: --privileged
       volumes:
         - /usr/local/lib/android:/usr/local/lib/android
@@ -134,8 +158,8 @@ jobs:
             runner: ubuntu-24.04
           - arch: aarch64
             runner: ubuntu-24.04-arm
-    # Don't run scheduled builds on forks:
-    if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
+    # Don't run scheduled builds on forks; skip entirely on self-hosted runners
+    if: ${{ !cancelled() && !vars.SELF_HOSTED && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
     runs-on: ${{ matrix.variant.runner }}
     env:
       date:
@@ -154,22 +178,47 @@ jobs:
           git_commit_hash="${{ github.event.pull_request.head.sha }}"
         else
           ver=V$ver_pure
-          git_commit_hash=""
+          git_commit_hash="${{ github.sha }}"
         fi
         echo "ver=$ver" >> $GITHUB_ENV
         echo "ver_pure=$ver_pure" >> $GITHUB_ENV
         echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         echo "git_commit_hash=$git_commit_hash" >> $GITHUB_ENV
       shell: bash
+    # Manage flatpak-builder cache externally so PRs restore but never upload
+    - name: Restore flatpak-builder cache
+      if: github.event_name == 'pull_request'
+      uses: actions/cache/restore@v5
+      with:
+        path: .flatpak-builder
+        key: flatpak-builder-${{ matrix.variant.arch }}-${{ github.event.pull_request.base.sha }}
+        restore-keys: flatpak-builder-${{ matrix.variant.arch }}-
+    - name: Save/restore flatpak-builder cache
+      if: github.event_name != 'pull_request'
+      uses: actions/cache@v5
+      with:
+        path: .flatpak-builder
+        key: flatpak-builder-${{ matrix.variant.arch }}-${{ github.sha }}
+        restore-keys: flatpak-builder-${{ matrix.variant.arch }}-
+    - name: Disable debug info for faster CI builds
+      run: |
+        sed -i '/^build-options:/a\  no-debuginfo: true\n  strip: true' \
+          scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
+      shell: bash
+    - name: Inject git commit hash into Flatpak manifest
+      run: |
+        sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n    build-options:\n      env:\n        git_commit_hash: \"$git_commit_hash\"|}" \
+          scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
+      shell: bash
     - uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        manifest-path: scripts/flatpak/io.github.softfever.OrcaSlicer.yml
-        cache: true
+        manifest-path: scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
+        cache: false
         arch: ${{ matrix.variant.arch }}
         upload-artifact: false
     - name: Upload artifacts Flatpak
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
         path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
@@ -183,3 +232,4 @@ jobs:
         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

@@ -28,15 +28,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'true'
+          lfs: 'false'
         
       - name: set outputs
         id: set_outputs
         env:
-          dep-folder-name: ${{ inputs.os != 'orca-macos-arm64' && '/OrcaSlicer_dep' || '' }}
-          output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
+          # 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: |
-          echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
+          echo cache-key=${{ env.cache-os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
           echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }}
             
       - name: load cache

.github/workflows/build_deps.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'true'
+          lfs: 'false'
 
       - name: load cached deps
         uses: actions/cache@v5
@@ -46,85 +46,86 @@ jobs:
 
       - uses: lukka/get-cmake@latest
         with:
-          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
+          cmakeVersion: "~4.3.0"  # use most recent 4.3.x version
+          useLocalCache: true         # <--= Use the local cache (default is 'false').
+          useCloudCache: true
 
       - name: setup dev on Windows
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         uses: microsoft/setup-msbuild@v2
 
       - name: Get the date on Ubuntu and macOS
-        if: inputs.os != 'windows-latest'
+        if: runner.os != 'Windows'
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
       - name: Get the date on Windows
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
 
       # Build Dependencies
       - name: Build on Windows
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}
         run: |
-            choco install strawberryperl
+            if (-not "${{ vars.SELF_HOSTED }}") {
+              choco install strawberryperl
+            }
             .\build_release_vs.bat deps
             .\build_release_vs.bat pack
-            cd ${{ github.workspace }}/deps/build
+        shell: pwsh
 
       - name: Build on Mac ${{ inputs.arch }}
-        if: inputs.os == 'orca-macos-arm64'
+        if: runner.os == 'macOS'
         working-directory: ${{ github.workspace }}
         run: |
-            # brew install automake texinfo libtool
-            # brew list
-            # brew uninstall --ignore-dependencies zstd
-            ./build_release_macos.sh -dx -a universal -t 10.15
-            for arch in arm64 x86_64; do
-                (cd "${{ github.workspace }}/deps/build/${arch}" && \
-                find . -mindepth 1 -maxdepth 1 ! -name 'OrcaSlicer_dep' -exec rm -rf {} +)
-            done
-            # brew install zstd
+            if [ -z "${{ vars.SELF_HOSTED }}" ]; then
+              brew install automake texinfo libtool
+            fi
+            ./build_release_macos.sh -dx ${{ !vars.SELF_HOSTED && '-1' || '' }} -a ${{ inputs.arch }} -t 10.15
+            (cd "${{ github.workspace }}/deps/build/${{ inputs.arch }}" && \
+            find . -mindepth 1 -maxdepth 1 ! -name 'OrcaSlicer_dep' -exec rm -rf {} +)
 
 
       - name: Apt-Install Dependencies
-        if: inputs.os == 'ubuntu-24.04'
+        if: runner.os == 'Linux' && !vars.SELF_HOSTED
         uses: ./.github/actions/apt-install-deps
 
       - name: Build on Ubuntu
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: runner.os == 'Linux'
         working-directory: ${{ github.workspace }}
         run: |
             mkdir -p ${{ github.workspace }}/deps/build/destdir
-            ./build_linux.sh -dr
+            ./build_linux.sh -drlL
             cd deps/build
             tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
 
 
       # Upload Artifacts
       # - name: Upload Mac ${{ inputs.arch }} artifacts
-      #   if: inputs.os == 'orca-macos-arm64'
+      #   if: runner.os == 'macOS'
       #   uses: actions/upload-artifact@v6
       #   with:
       #     name: OrcaSlicer_dep_mac_${{ env.date }}
       #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz
 
-      - name: Upload Windows artifacts
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v6
-        with:
-          name: OrcaSlicer_dep_win64_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
+      # - name: Upload Windows artifacts
+      #   if: runner.os == 'Windows'
+      #   uses: actions/upload-artifact@v6
+      #   with:
+      #     name: OrcaSlicer_dep_win64_${{ env.date }}
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
 
-      - name: Upload Ubuntu artifacts
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
-        env:
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v6
-        with:
-          name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
+      # - name: Upload Ubuntu artifacts
+      #   if: runner.os == 'Linux' && !env.ACT
+      #   env:
+      #     ubuntu-ver: '2404'
+      #   uses: actions/upload-artifact@v6
+      #   with:
+      #     name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
 
   build_orca:
     name: Build OrcaSlicer

.github/workflows/build_orca.yml

@@ -2,10 +2,10 @@ on:
     workflow_call:
       inputs:
         cache-key:
-          required: true
+          required: false
           type: string
         cache-path:
-          required: true
+          required: false
           type: string
         os:
           required: true
@@ -13,6 +13,10 @@ on:
         arch:
           required: false
           type: string
+        macos-combine-only:
+          required: false
+          type: boolean
+          default: false
 
 jobs:
   build_orca:
@@ -22,15 +26,18 @@ jobs:
       date:
       ver:
       ver_pure:
+      ubuntu-ver: '2404'
+      ubuntu-ver-str: '_Ubuntu2404'
       ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          lfs: 'true'
+          lfs: 'false'
 
       - name: load cached deps
+        if: ${{ !(runner.os == 'macOS' && inputs.macos-combine-only) }}
         uses: actions/cache@v5
         with:
           path: ${{ inputs.cache-path }}
@@ -39,10 +46,12 @@ jobs:
 
       - uses: lukka/get-cmake@latest
         with:
-          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
-          
+          cmakeVersion: "~4.3.0"  # use most recent 4.3.x version
+          useLocalCache: true         # <--= Use the local cache (default is 'false').
+          useCloudCache: true
+
       - name: Get the version and date on Ubuntu and macOS
-        if: inputs.os != 'windows-latest'
+        if: runner.os != 'Windows'
         run: |
           ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
@@ -59,7 +68,7 @@ jobs:
         shell: bash
 
       - name: Get the version and date on Windows
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         run: |
           $date = Get-Date -Format 'yyyyMMdd'
           $ref = "${{ github.ref }}"
@@ -86,29 +95,75 @@ jobs:
 
 #   Mac
       - name: Install tools mac
-        if: inputs.os == 'orca-macos-arm64'
+        if: runner.os == 'macOS' && !inputs.macos-combine-only
         run: |
-          # brew install libtool
-          # brew list
-          mkdir -p ${{ github.workspace }}/deps/build
+          if [ -z "${{ vars.SELF_HOSTED }}" ]; then
+            brew install libtool
+            brew list
+          fi
+          mkdir -p ${{ github.workspace }}/deps/build/${{ inputs.arch }}
 
-      # - name: Free disk space
-      #   if: inputs.os == 'orca-macos-arm64'
-      #   run: |
-      #     df -hI /dev/disk3s1s1
-      #     sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} +
-      #     sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
-      #     df -hI /dev/disk3s1s1
+      - name: Free disk space
+        if: runner.os == 'macOS' && !inputs.macos-combine-only && !vars.SELF_HOSTED
+        run: |
+          df -hI /dev/disk3s1s1
+          sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} +
+          sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
+          df -hI /dev/disk3s1s1
 
       - name: Build slicer mac
-        if: inputs.os == 'orca-macos-arm64'
+        if: runner.os == 'macOS' && !inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -x -a universal -t 10.15
+          ./build_release_macos.sh -s -n -x ${{ !vars.SELF_HOSTED && '-1' || '' }} -a ${{ inputs.arch }} -t 10.15
+
+      - name: Pack macOS app bundle ${{ inputs.arch }}
+        if: runner.os == 'macOS' && !inputs.macos-combine-only
+        working-directory: ${{ github.workspace }}
+        run: |
+          tar -czvf OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz -C build/${{ inputs.arch }} OrcaSlicer
+
+      - name: Upload macOS app bundle ${{ inputs.arch }}
+        if: runner.os == 'macOS' && !inputs.macos-combine-only
+        uses: actions/upload-artifact@v7
+        with:
+          name: OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}
+          path: ${{ github.workspace }}/OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz
+
+      - name: Download macOS app bundles
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        uses: actions/download-artifact@v8
+        with:
+          pattern: OrcaSlicer_Mac_bundle_*_${{ github.sha }}
+          path: ${{ github.workspace }}/mac_bundles
+
+      - name: Extract macOS app bundles
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p build/arm64 build/x86_64
+          arm_bundle=$(find "${{ github.workspace }}/mac_bundles/OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}" -name '*.tar.gz' -print -quit)
+          x86_bundle=$(find "${{ github.workspace }}/mac_bundles/OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}" -name '*.tar.gz' -print -quit)
+          tar -xzvf "$arm_bundle" -C "${{ github.workspace }}/build/arm64"
+          tar -xzvf "$x86_bundle" -C "${{ github.workspace }}/build/x86_64"
+
+      - name: Build universal mac app bundle
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        working-directory: ${{ github.workspace }}
+        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@v5
+        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' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'orca-macos-arm64'
+        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 }}
@@ -162,7 +217,7 @@ jobs:
           fi
 
       - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && inputs.os == 'orca-macos-arm64'
+        if: github.ref != 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only
         working-directory: ${{ github.workspace }}
         run: |
           mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg
@@ -181,22 +236,22 @@ jobs:
           fi
 
       - name: Upload artifacts mac
-        if: inputs.os == 'orca-macos-arm64'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'macOS' && inputs.macos-combine-only
+        uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_Mac_universal_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
       - name: Upload OrcaSlicer_profile_validator DMG mac
-        if: inputs.os == 'orca-macos-arm64'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           if-no-files-found: ignore
 
       - name: Deploy Mac release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'orca-macos-arm64'
+        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}
@@ -207,7 +262,7 @@ jobs:
           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 Mac OrcaSlicer_profile_validator DMG release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'orca-macos-arm64'
+        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}
@@ -219,17 +274,17 @@ jobs:
 
 # Windows
       - name: setup MSVC
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         uses: microsoft/setup-msbuild@v2
 
       - name: Install nsis
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
         run: |
           dir "C:/Program Files (x86)/Windows Kits/10/Include"
           choco install nsis
 
       - name: Build slicer Win
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}
         env:
           WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
@@ -237,53 +292,53 @@ jobs:
         run: .\build_release_vs.bat slicer
 
       - name: Create installer Win
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build
         run: |
           cpack -G NSIS
 
       - name: Pack app
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}/build
         shell: cmd
         run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer'
 
       - name: Pack PDB
-        if: inputs.os == 'windows-latest'
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: cmd
         run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z  *.pdb'
 
       - name: Upload artifacts Win zip
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows'
+        uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}_portable
           path: ${{ github.workspace }}/build/OrcaSlicer
 
       - name: Upload artifacts Win installer
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 
       - name: Upload artifacts Win PDB
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v7
         with:
           name: PDB
           path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
 
       - name: Upload OrcaSlicer_profile_validator Win
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v7
         with:
           name: OrcaSlicer_profile_validator_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
 
       - name: Deploy Windows release portable
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        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}
@@ -294,7 +349,7 @@ jobs:
           max_releases: 1
 
       - name: Deploy Windows release installer
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        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}
@@ -305,7 +360,7 @@ jobs:
           max_releases: 1
 
       - name: Deploy Windows OrcaSlicer_profile_validator release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        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}
@@ -317,18 +372,16 @@ jobs:
 
 # Ubuntu
       - name: Apt-Install Dependencies
-        if: inputs.os == 'ubuntu-24.04'
+        if: runner.os == 'Linux' && !vars.SELF_HOSTED
         uses: ./.github/actions/apt-install-deps
 
         # Tests must built at the same time as the slicer;
         # if you untangle them feel free to separate them here too
       - name: Build slicer and tests
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: runner.os == 'Linux'
         shell: bash
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
         run: |
-          ./build_linux.sh -istr
+          ./build_linux.sh -istrlL
           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
@@ -336,8 +389,8 @@ jobs:
         # Use tar because upload-artifacts won't always preserve directory structure
         # and doesn't preserve file permissions
       - name: Upload Test Artifact
-        if: inputs.os == 'ubuntu-24.04'
-        uses: actions/upload-artifact@v6
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ github.sha }}-tests
           overwrite: true
@@ -346,7 +399,7 @@ jobs:
           if-no-files-found: error
 
       - name: Build orca_custom_preset_tests
-        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04'
+        if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: bash
         run: |
@@ -355,28 +408,21 @@ jobs:
           zip -r orca_custom_preset_tests.zip user/
 
       - name: Upload artifacts Ubuntu
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
-        env:
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        uses: actions/upload-artifact@v6
+        if: ${{ ! env.ACT && runner.os == 'Linux' }}
+        uses: actions/upload-artifact@v7
         with:
           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 && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
-        env:
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v6
+        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 && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
+        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}
@@ -386,7 +432,7 @@ jobs:
           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' && inputs.os == 'ubuntu-24.04' }}
+        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"
@@ -395,9 +441,7 @@ jobs:
           message: "nightly-builds"
 
       - name: Deploy Ubuntu OrcaSlicer_profile_validator release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
+        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}
@@ -408,7 +452,7 @@ jobs:
           max_releases: 1
 
       - name: Deploy orca_custom_preset_tests
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
+        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/check_profiles.yml

@@ -15,12 +15,11 @@ on:
         default: 'warning'
 
 permissions:
-  pull-requests: write
   contents: read
 
 
 jobs:
-  check_translation:
+  check_profiles:
     name: Check profiles
     runs-on: ubuntu-24.04
     steps:
@@ -62,11 +61,11 @@ jobs:
           ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_custom.log
           exit ${PIPESTATUS[0]}
 
-      - name: Post error comment on PR
+      - name: Prepare comment artifact
         if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
-        env:
-          GH_TOKEN: ${{ github.token }}
         run: |
+          mkdir -p ${{ runner.temp }}/profile-check-results
+
           {
             echo "## :x: Profile Validation Errors"
             echo ""
@@ -100,16 +99,20 @@ jobs:
 
             echo "---"
             echo "*Please fix the above errors and push a new commit.*"
-          } > ${{ runner.temp }}/pr_comment.md
+          } > ${{ runner.temp }}/profile-check-results/pr_comment.md
 
-          gh pr comment ${{ github.event.pull_request.number }} --body-file ${{ runner.temp }}/pr_comment.md
+          echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
+
+      - name: Upload comment artifact
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: profile-check-results
+          path: ${{ runner.temp }}/profile-check-results/
+          retention-days: 1
 
       - name: Fail if any check failed
         if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |
           echo "One or more profile checks failed. See above for details."
           exit 1
-
-
-
-

.github/workflows/check_profiles_comment.yml

@@ -0,0 +1,46 @@
+name: Post profile check comment
+
+# NOTE: The workflow name in the 'workflows' filter below must match the 'name'
+# field in check_profiles.yml exactly. If that name changes, update it here too.
+on:
+  workflow_run:
+    workflows: ["Check profiles"]
+    types:
+      - completed
+
+permissions:
+  pull-requests: write
+
+jobs:
+  post_comment:
+    name: Post PR comment
+    runs-on: ubuntu-24.04
+    if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - name: Download artifact
+        id: download
+        uses: actions/download-artifact@v8
+        continue-on-error: true
+        with:
+          name: profile-check-results
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ github.token }}
+
+      - name: Post comment on PR
+        if: ${{ steps.download.outcome == 'success' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          if [ ! -f pr_number.txt ] || [ ! -f pr_comment.md ]; then
+            echo "No comment artifact found, skipping."
+            exit 0
+          fi
+
+          PR_NUMBER=$(cat pr_number.txt)
+          if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
+            echo "Invalid PR number: $PR_NUMBER"
+            exit 1
+          fi
+
+          gh pr comment "$PR_NUMBER" --body-file pr_comment.md

.github/workflows/winget_updater.yml

@@ -0,0 +1,14 @@
+name: Publish to WinGet
+on:
+  release:
+    types: [ released ]
+jobs:
+  publish:
+    runs-on: windows-latest
+    steps:
+      - uses: vedantmgoyal9/winget-releaser@main
+        with:
+          identifier: SoftFever.OrcaSlicer
+          version: ${{ github.event.release.tag_name }}
+          token: ${{ secrets.WINGET_TOKEN }}
+          installers-regex: '\.exe$'

.gitignore

@@ -36,6 +36,7 @@ src/OrcaSlicer-doc/
 /deps/DL_CACHE/
 /deps/DL_CACHE
 **/.flatpak-builder/
+*.no-debug.yml
 resources/profiles/user/default
 *.code-workspace
 deps_src/build/
@@ -43,3 +44,5 @@ test.js
 /.cache/
 .clangd
 internal_docs/
+*.flatpak
+/flatpak-repo/

CLAUDE.md

@@ -42,7 +42,7 @@ cmake --build build/arm64 --config RelWithDebInfo --target all --
 ### Building on Linux
  **Always use this command to build the project when testing build issues on Linux.**
 ```bash
-cmake --build build/arm64 --config RelWithDebInfo --target all --
+cmake --build build --config RelWithDebInfo --target all --
 
 ```
 

CMakeLists.txt

@@ -89,10 +89,9 @@ else ()
 endif ()
 
 find_package(Git)
-if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
-        message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
-
+if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
+    message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
+    if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
         # Convert the given hash to short hash
         execute_process(
             COMMAND ${GIT_EXECUTABLE} rev-parse --short "$ENV{git_commit_hash}"
@@ -100,17 +99,20 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
             OUTPUT_VARIABLE GIT_COMMIT_HASH
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-        add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
     else()
-        # Check current Git commit hash
-        execute_process(
-            COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            OUTPUT_VARIABLE GIT_COMMIT_HASH
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-        add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+        # No .git directory (e.g., Flatpak sandbox) — truncate directly
+        string(SUBSTRING "$ENV{git_commit_hash}" 0 7 GIT_COMMIT_HASH)
     endif()
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    # Check current Git commit hash
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
 endif()
 
 if(DEFINED ENV{SLIC3R_STATIC})
@@ -122,7 +124,6 @@ endif()
 option(SLIC3R_STATIC 			"Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
 option(SLIC3R_GUI    			"Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1)
 option(SLIC3R_FHS               "Assume OrcaSlicer is to be installed in a FHS directory structure" 0)
-option(SLIC3R_WX_STABLE         "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
 option(SLIC3R_PROFILE 			"Compile OrcaSlicer with an invasive Shiny profiler" 0)
 option(SLIC3R_PCH               "Use precompiled headers" 1)
 option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
@@ -160,7 +161,7 @@ if (APPLE)
     if (CMAKE_MACOSX_BUNDLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
-    SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
+    SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.orcaslicer.OrcaSlicer")
 
     message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
 endif ()
@@ -171,10 +172,7 @@ option(BUILD_TESTS       "Build unit tests" OFF)
 option(ORCA_TOOLS       "Build Orca tools" OFF)
 
 if (FLATPAK)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20")
-    set(SLIC3R_PCH OFF CACHE BOOL "" FORCE)
     set(SLIC3R_FHS ON CACHE BOOL "" FORCE)
-    set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(SLIC3R_DESKTOP_INTEGRATION OFF CACHE BOOL "" FORCE)
 endif ()
 
@@ -436,7 +434,11 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
     endif()
 
     if((${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
-        add_compile_options(-Wno-error=enum-constexpr-conversion)
+        include(CheckCXXCompilerFlag)
+        check_cxx_compiler_flag(-Wno-error=enum-constexpr-conversion HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
+        if(HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
+            add_compile_options(-Wno-error=enum-constexpr-conversion)
+        endif()
     endif()
 
     #GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see
@@ -451,9 +453,12 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
         add_compile_options(-Wno-unknown-pragmas)
     endif()
 
-    # Bit of a hack for flatpak building: compress the debug info with zstd to save space in CI
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
-        add_compile_options(-gz=zstd)
+    # Compress the debug info with zstd to save space in Flatpak CI builds
+    if(FLATPAK)
+        if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0) OR
+           ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0))
+            add_compile_options(-gz=zstd)
+        endif()
     endif()
 
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
@@ -487,7 +492,8 @@ if (APPLE)
 endif ()
 
 if(MSVC)
-# 添加编译选项，忽略警告 C4305 （格式转换截断）
+# Ignore truncating casts in initializers & constructors
+# https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4305
 add_compile_options(/wd4305)
 endif()
 

README.md

@@ -4,7 +4,7 @@
   <img alt="OrcaSlicer logo" src="resources/images/OrcaSlicer.png" width="15%" height="15%">
 </picture>
 
-<a href="https://trendshift.io/repositories/952" target="_blank"><img src="https://trendshift.io/api/badge/repositories/952" alt="SoftFever%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<a href="https://trendshift.io/repositories/15552" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15552" alt="OrcaSlicer%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 [![GitHub Repo stars](https://img.shields.io/github/stars/OrcaSlicer/OrcaSlicer)](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [![Build all](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
 
@@ -194,20 +194,16 @@ Thank you! :)
 <a href="https://ko-fi.com/G2G5IP3CP"><img src="https://img.shields.io/badge/Support_me_on_Ko--fi-FF5E5B?style=flat&logo=ko-fi&logoColor=white" height="50"></a>
 <a href="https://paypal.me/softfever3d"><img src="https://img.shields.io/badge/PayPal-003087?style=flat&logo=paypal&logoColor=fff" height="50"></a>
 
-## Some background
+## Some Background
 
-OrcaSlicer was originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+Open-source slicing has always been built on a tradition of collaboration and attribution. [Slic3r](https://github.com/Slic3r/Slic3r), created by Alessandro Ranellucci and the RepRap community, laid the foundation. [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research built on Slic3r and acknowledged that heritage. [Bambu Studio](https://github.com/bambulab/BambuStudio) in turn forked from PrusaSlicer, and [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill extended PrusaSlicer with community-driven enhancements. Each project carried the work of its predecessors forward, crediting those who came before.
 
-[Bambu Studio](https://github.com/bambulab/BambuStudio) is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
-OrcaSlicer incorporates a lot of features from [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill
-OrcaSlicer's logo is designed by community member Justin Levine (@freejstnalxndr).
+OrcaSlicer began in that same spirit, drawing from BambuStudio, PrusaSlicer, and ideas inspired by CuraSlicer and SuperSlicer. But it has since grown far beyond its origins. Through relentless innovation — introducing advanced calibration tools, precise wall and seam control, tree supports, adaptive slicing, and hundreds of other features — OrcaSlicer has become the most widely used and actively developed open-source slicer in the 3D printing community. Many of its innovations have been adopted by other slicers, making it a driving force for the entire industry.
+
+The OrcaSlicer logo was designed by community member Justin Levine (@freejstnalxndr).
 
 # License
-
-- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3. OrcaSlicer is based on Bambu Studio by BambuLab.
-- **Bambu Studio** is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
-- **PrusaSlicer** is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
-- **Slic3r** is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
+- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3.
 - The **GNU Affero General Public License**, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
 - OrcaSlicer includes a **pressure advance calibration pattern test** adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
 - The **Bambu networking plugin** is based on non-free libraries from BambuLab. It is optional to the OrcaSlicer and provides extended functionalities for Bambulab printer users.

build_flatpak.sh

@@ -5,6 +5,7 @@
 # Based on the GitHub Actions workflow in .github/workflows/build_all.yml
 
 set -e
+SECONDS=0
 
 # Colors for output
 RED='\033[0;31m'
@@ -21,6 +22,8 @@ INSTALL_RUNTIME=false
 JOBS=$(nproc)
 FORCE_CLEAN=false
 ENABLE_CCACHE=false
+DISABLE_ROFILES_FUSE=false
+NO_DEBUGINFO=true
 CACHE_DIR=".flatpak-builder"
 
 # Help function
@@ -36,6 +39,8 @@ show_help() {
     echo "  -c, --cleanup          Clean build directory before building"
     echo "  -f, --force-clean      Force clean build (disables caching)"
     echo "  --ccache               Enable ccache for faster rebuilds (requires ccache in SDK)"
+    echo "  --disable-rofiles-fuse Disable rofiles-fuse (workaround for FUSE issues)"
+    echo "  --with-debuginfo       Include debug info (slower builds, needed for Flathub)"
     echo "  --cache-dir DIR        Flatpak builder cache directory [default: $CACHE_DIR]"
     echo "  -i, --install-runtime  Install required Flatpak runtime and SDK"
     echo "  -h, --help             Show this help message"
@@ -75,6 +80,14 @@ while [[ $# -gt 0 ]]; do
             ENABLE_CCACHE=true
             shift
             ;;
+        --disable-rofiles-fuse)
+            DISABLE_ROFILES_FUSE=true
+            shift
+            ;;
+        --with-debuginfo)
+            NO_DEBUGINFO=false
+            shift
+            ;;
         --cache-dir)
             CACHE_DIR="$2"
             shift 2
@@ -186,22 +199,22 @@ echo -e "${GREEN}All required dependencies found${NC}"
 # Install runtime and SDK if requested
 if [[ "$INSTALL_RUNTIME" == true ]]; then
     echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}"
-    flatpak install --user -y flathub org.gnome.Platform//48
-    flatpak install --user -y flathub org.gnome.Sdk//48
+    flatpak install --user -y flathub org.gnome.Platform//49
+    flatpak install --user -y flathub org.gnome.Sdk//49
 fi
 
 # Check if required runtime is available
-if ! flatpak info --user org.gnome.Platform//48 &> /dev/null; then
-    echo -e "${RED}Error: GNOME Platform 48 runtime is not installed.${NC}"
+if ! flatpak info --user org.gnome.Platform//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME Platform 49 runtime is not installed.${NC}"
     echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Platform//48"
+    echo "flatpak install --user flathub org.gnome.Platform//49"
     exit 1
 fi
 
-if ! flatpak info --user org.gnome.Sdk//48 &> /dev/null; then
-    echo -e "${RED}Error: GNOME SDK 48 is not installed.${NC}"
+if ! flatpak info --user org.gnome.Sdk//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME SDK 49 is not installed.${NC}"
     echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Sdk//48"
+    echo "flatpak install --user flathub org.gnome.Sdk//49"
     exit 1
 fi
 
@@ -242,8 +255,8 @@ mkdir -p "$BUILD_DIR"
 rm -rf "$BUILD_DIR/build-dir"
 
 # Check if flatpak manifest exists
-if [[ ! -f "./scripts/flatpak/io.github.softfever.OrcaSlicer.yml" ]]; then
-    echo -e "${RED}Error: Flatpak manifest not found at scripts/flatpak/io.github.softfever.OrcaSlicer.yml${NC}"
+if [[ ! -f "./scripts/flatpak/com.orcaslicer.OrcaSlicer.yml" ]]; then
+    echo -e "${RED}Error: Flatpak manifest not found at scripts/flatpak/com.orcaslicer.OrcaSlicer.yml${NC}"
     exit 1
 fi
 
@@ -279,6 +292,7 @@ BUILDER_ARGS=(
     --verbose
     --state-dir="$CACHE_DIR"
     --jobs="$JOBS"
+    --mirror-screenshots-url=https://dl.flathub.org/media/
 )
 
 # Add force-clean only if explicitly requested (disables caching)
@@ -295,21 +309,40 @@ if [[ "$ENABLE_CCACHE" == true ]]; then
     echo -e "${GREEN}Using ccache for compiler caching${NC}"
 fi
 
+# Disable rofiles-fuse if requested (workaround for FUSE issues)
+if [[ "$DISABLE_ROFILES_FUSE" == true ]]; then
+    BUILDER_ARGS+=(--disable-rofiles-fuse)
+    echo -e "${YELLOW}rofiles-fuse disabled${NC}"
+fi
+
+# Use a temp manifest with no-debuginfo if requested
+MANIFEST="scripts/flatpak/com.orcaslicer.OrcaSlicer.yml"
+if [[ "$NO_DEBUGINFO" == true ]]; then
+    MANIFEST="scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
+    sed '/^build-options:/a\  no-debuginfo: true\n  strip: true' \
+        scripts/flatpak/com.orcaslicer.OrcaSlicer.yml > "$MANIFEST"
+    echo -e "${YELLOW}Debug info disabled (using temp manifest)${NC}"
+fi
+
 if ! flatpak-builder \
     "${BUILDER_ARGS[@]}" \
     "$BUILD_DIR/build-dir" \
-    scripts/flatpak/io.github.softfever.OrcaSlicer.yml; then
+    "$MANIFEST"; then
     echo -e "${RED}Error: flatpak-builder failed${NC}"
     echo -e "${YELLOW}Check the build log above for details${NC}"
+    rm -f "scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
     exit 1
 fi
 
+# Clean up temp manifest
+rm -f "scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
+
 # Create bundle
 echo -e "${YELLOW}Creating Flatpak bundle...${NC}"
 if ! flatpak build-bundle \
     "$BUILD_DIR/repo" \
     "$BUNDLE_NAME" \
-    io.github.softfever.OrcaSlicer \
+    com.orcaslicer.OrcaSlicer \
     --arch="$ARCH"; then
     echo -e "${RED}Error: Failed to create Flatpak bundle${NC}"
     exit 1
@@ -328,10 +361,10 @@ echo -e "${BLUE}To install the Flatpak:${NC}"
 echo -e "flatpak install --user $BUNDLE_NAME"
 echo ""
 echo -e "${BLUE}To run OrcaSlicer:${NC}"
-echo -e "flatpak run io.github.softfever.OrcaSlicer"
+echo -e "flatpak run com.orcaslicer.OrcaSlicer"
 echo ""
 echo -e "${BLUE}To uninstall:${NC}"
-echo -e "flatpak uninstall --user io.github.softfever.OrcaSlicer"
+echo -e "flatpak uninstall --user com.orcaslicer.OrcaSlicer"
 echo ""
 if [[ "$FORCE_CLEAN" != true ]]; then
     echo -e "${BLUE}Cache Management:${NC}"
@@ -339,3 +372,6 @@ if [[ "$FORCE_CLEAN" != true ]]; then
     echo -e "• To force a clean build: $0 -f"
     echo -e "• To clean cache manually: rm -rf $CACHE_DIR"
 fi
+
+elapsed=$SECONDS
+printf "\nBuild completed in %dh %dm %ds\n" $((elapsed/3600)) $((elapsed%3600/60)) $((elapsed%60))

build_linux.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e # Exit immediately if a command exits with a non-zero status.
+SECONDS=0
 
 SCRIPT_NAME=$(basename "$0")
 SCRIPT_PATH=$(dirname "$(readlink -f "${0}")")
@@ -151,6 +152,8 @@ elif [[ "${DISTRIBUTION_LIKE}" == *"debian"* ]] || [[ "${DISTRIBUTION_LIKE}" ==
     DISTRIBUTION="debian"
 elif [[ "${DISTRIBUTION_LIKE}" == *"arch"* ]] ; then
     DISTRIBUTION="arch"
+elif [[ "${DISTRIBUTION_LIKE}" == *"suse"* ]] ; then
+    DISTRIBUTION="suse"
 fi
 
 if [ ! -f "./scripts/linux.d/${DISTRIBUTION}" ] ; then
@@ -266,4 +269,7 @@ if [[ -n "${BUILD_IMAGE}" || -n "${BUILD_ORCA}" ]] ; then
     popd > /dev/null # build
 fi
 
+elapsed=$SECONDS
+printf "\nBuild completed in %dh %dm %ds\n" $((elapsed/3600)) $((elapsed%3600/60)) $((elapsed%60))
+
 popd > /dev/null # ${SCRIPT_PATH}

build_release_macos.sh

@@ -2,8 +2,9 @@
 
 set -e
 set -o pipefail
+SECONDS=0
 
-while getopts ":dpa:snt:xbc:1Th" opt; do
+while getopts ":dpa:snt:xbc:i:1Tuh" opt; do
   case "${opt}" in
     d )
         export BUILD_TARGET="deps"
@@ -34,21 +35,29 @@ while getopts ":dpa:snt:xbc:1Th" opt; do
     c )
         export BUILD_CONFIG="$OPTARG"
         ;;
+    i )
+        export CMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH:+$CMAKE_IGNORE_PREFIX_PATH;}$OPTARG"
+        ;;
     1 )
         export CMAKE_BUILD_PARALLEL_LEVEL=1
         ;;
     T )
         export BUILD_TESTS="1"
         ;;
+    u )
+        export BUILD_TARGET="universal"
+        ;;
     h ) echo "Usage: ./build_release_macos.sh [-d]"
         echo "   -d: Build deps only"
         echo "   -a: Set ARCHITECTURE (arm64 or x86_64 or universal)"
         echo "   -s: Build slicer only"
+        echo "   -u: Build universal app only (requires existing arm64 and x86_64 app bundles)"
         echo "   -n: Nightly build"
         echo "   -t: Specify minimum version of the target platform, default is 11.3"
         echo "   -x: Use Ninja Multi-Config CMake generator, default is Xcode"
         echo "   -b: Build without reconfiguring CMake"
         echo "   -c: Set CMake build configuration, default is Release"
+        echo "   -i: Add a prefix to ignore during CMake dependency discovery (repeatable), defaults to /opt/local:/usr/local:/opt/homebrew"
         echo "   -1: Use single job for building"
         echo "   -T: Build and run tests"
         exit 0
@@ -89,6 +98,10 @@ if [ -z "$OSX_DEPLOYMENT_TARGET" ]; then
   export OSX_DEPLOYMENT_TARGET="11.3"
 fi
 
+if [ -z "$CMAKE_IGNORE_PREFIX_PATH" ]; then
+  export CMAKE_IGNORE_PREFIX_PATH="/opt/local:/usr/local:/opt/homebrew"
+fi
+
 CMAKE_VERSION=$(cmake --version | head -1 | sed 's/[^0-9]*\([0-9]*\).*/\1/')
 if [ "$CMAKE_VERSION" -ge 4 ] 2>/dev/null; then
   export CMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -104,6 +117,7 @@ echo " - BUILD_CONFIG: $BUILD_CONFIG"
 echo " - BUILD_TARGET: $BUILD_TARGET"
 echo " - CMAKE_GENERATOR: $SLICER_CMAKE_GENERATOR for Slicer, $DEPS_CMAKE_GENERATOR for deps"
 echo " - OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
+echo " - CMAKE_IGNORE_PREFIX_PATH: $CMAKE_IGNORE_PREFIX_PATH"
 echo
 
 # if which -s brew; then
@@ -147,6 +161,7 @@ function build_deps() {
                         -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
                         -DCMAKE_OSX_ARCHITECTURES:STRING="${_ARCH}" \
                         -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
+                        -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
                         ${CMAKE_POLICY_COMPAT}
                 fi
                 cmake --build . --config "$BUILD_CONFIG" --target deps
@@ -188,6 +203,7 @@ function build_slicer() {
                     -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
                     -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
                     -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
+                    -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
                     ${CMAKE_POLICY_COMPAT}
             fi
             cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
@@ -249,48 +265,54 @@ function build_slicer() {
     done
 }
 
+function lipo_dir() {
+    local universal_dir="$1"
+    local x86_64_dir="$2"
+
+    # Find all Mach-O files in the universal (arm64-based) copy and lipo them
+    while IFS= read -r -d '' f; do
+        local rel="${f#"$universal_dir"/}"
+        local x86="$x86_64_dir/$rel"
+        if [ -f "$x86" ]; then
+            echo "  lipo: $rel"
+            lipo -create "$f" "$x86" -output "$f.tmp"
+            mv "$f.tmp" "$f"
+        else
+            echo "  warning: no x86_64 counterpart for $rel, keeping arm64 only"
+        fi
+    done < <(find "$universal_dir" -type f -print0 | while IFS= read -r -d '' candidate; do
+        if file "$candidate" | grep -q "Mach-O"; then
+            printf '%s\0' "$candidate"
+        fi
+    done)
+}
+
 function build_universal() {
     echo "Building universal binary..."
 
     PROJECT_BUILD_DIR="$PROJECT_DIR/build/$ARCH"
-    
-    # Create universal binary
-    echo "Creating universal binary..."
-    # PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
+    ARM64_APP="$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app"
+    X86_64_APP="$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer.app"
+
     mkdir -p "$PROJECT_BUILD_DIR/OrcaSlicer"
     UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer.app"
     rm -rf "$UNIVERSAL_APP"
-    cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP"
-    
-    # Get the binary path inside the .app bundle
-    BINARY_PATH="Contents/MacOS/OrcaSlicer"
-    
-    # Create universal binary using lipo
-    lipo -create \
-        "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
-        "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
-        -output "$UNIVERSAL_APP/$BINARY_PATH"
-        
-    echo "Universal binary created at $UNIVERSAL_APP"
-    
+    cp -R "$ARM64_APP" "$UNIVERSAL_APP"
+
+    echo "Creating universal binaries for OrcaSlicer.app..."
+    lipo_dir "$UNIVERSAL_APP" "$X86_64_APP"
+    echo "Universal OrcaSlicer.app created at $UNIVERSAL_APP"
+
     # Create universal binary for profile validator if it exists
-    if [ -f "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ] && \
-       [ -f "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
-        echo "Creating universal binary for OrcaSlicer_profile_validator..."
+    ARM64_VALIDATOR="$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app"
+    X86_64_VALIDATOR="$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app"
+    if [ -d "$ARM64_VALIDATOR" ] && [ -d "$X86_64_VALIDATOR" ]; then
+        echo "Creating universal binaries for OrcaSlicer_profile_validator.app..."
         UNIVERSAL_VALIDATOR_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer_profile_validator.app"
         rm -rf "$UNIVERSAL_VALIDATOR_APP"
-        cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app" "$UNIVERSAL_VALIDATOR_APP"
-        
-        # Get the binary path inside the profile validator .app bundle
-        VALIDATOR_BINARY_PATH="Contents/MacOS/OrcaSlicer_profile_validator"
-        
-        # Create universal binary using lipo
-        lipo -create \
-            "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \
-            "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \
-            -output "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH"
-            
-        echo "Universal binary for OrcaSlicer_profile_validator created at $UNIVERSAL_VALIDATOR_APP"
+        cp -R "$ARM64_VALIDATOR" "$UNIVERSAL_VALIDATOR_APP"
+        lipo_dir "$UNIVERSAL_VALIDATOR_APP" "$X86_64_VALIDATOR"
+        echo "Universal OrcaSlicer_profile_validator.app created at $UNIVERSAL_VALIDATOR_APP"
     fi
 }
 
@@ -305,16 +327,22 @@ case "${BUILD_TARGET}" in
     slicer)
         build_slicer
         ;;
+    universal)
+        build_universal
+        ;;
     *)
-        echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, all."
+        echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, universal, all."
         exit 1
         ;;
 esac
 
-if [ "$ARCH" = "universal" ] && [ "$BUILD_TARGET" != "deps" ]; then
+if [ "$ARCH" = "universal" ] && { [ "$BUILD_TARGET" = "all" ] || [ "$BUILD_TARGET" = "slicer" ]; }; then
     build_universal
 fi
 
 if [ "1." == "$PACK_DEPS". ]; then
     pack_deps
 fi
+
+elapsed=$SECONDS
+printf "\nBuild completed in %dh %dm %ds\n" $((elapsed/3600)) $((elapsed%3600/60)) $((elapsed%60))

build_release_vs.bat

@@ -1,6 +1,7 @@
 @REM OrcaSlicer build script for Windows with VS auto-detect
 @echo off
 set WP=%CD%
+set _START_TIME=%TIME%
 
 @REM Check for Ninja Multi-Config option (-x)
 set USE_NINJA=0
@@ -73,7 +74,7 @@ if "%1"=="pack" (
     echo packing deps: OrcaSlicer_dep_win64_!build_date!_vs!VS_VERSION!.zip
 
     %WP%/tools/7z.exe a OrcaSlicer_dep_win64_!build_date!_vs!VS_VERSION!.zip OrcaSlicer_dep
-    exit /b 0
+    goto :done
 )
 
 set debug=OFF
@@ -120,7 +121,7 @@ if "%USE_NINJA%"=="1" (
 )
 @echo off
 
-if "%1"=="deps" exit /b 0
+if "%1"=="deps" goto :done
 
 :slicer
 echo "building Orca Slicer..."
@@ -142,3 +143,16 @@ cd ..
 call scripts/run_gettext.bat
 cd %build_dir%
 cmake --build . --target install --config %build_type%
+
+:done
+@echo off
+for /f "tokens=1-3 delims=:.," %%a in ("%_START_TIME: =0%") do set /a "_start_s=%%a*3600+%%b*60+%%c"
+for /f "tokens=1-3 delims=:.," %%a in ("%TIME: =0%") do set /a "_end_s=%%a*3600+%%b*60+%%c"
+set /a "_elapsed=_end_s - _start_s"
+if %_elapsed% lss 0 set /a "_elapsed+=86400"
+set /a "_hours=_elapsed / 3600"
+set /a "_remainder=_elapsed - _hours * 3600"
+set /a "_mins=_remainder / 60"
+set /a "_secs=_remainder - _mins * 60"
+echo.
+echo Build completed in %_hours%h %_mins%m %_secs%s

cmake/modules/MacOSXBundleInfo.plist.in

@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.softfever3d.orca-slicer</string>
+	<string>com.orcaslicer.OrcaSlicer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>

deps/Boost/Boost.cmake

@@ -18,6 +18,7 @@ orcaslicer_add_cmake_project(Boost
         -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
         -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
         -DBUILD_TESTING:BOOL=OFF
+        -DBOOST_IOSTREAMS_ENABLE_ZSTD:BOOL=OFF
         "${_context_abi_line}"
         "${_context_arch_line}"
 )

deps/CMakeLists.txt

@@ -185,10 +185,14 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
             -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_IGNORE_PREFIX_PATH:STRING=${CMAKE_IGNORE_PREFIX_PATH}
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
             -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
+            -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
+            -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"
@@ -229,6 +233,7 @@ else()
             -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_IGNORE_PREFIX_PATH:STRING=${CMAKE_IGNORE_PREFIX_PATH}
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"

deps/GLEW/GLEW.cmake

@@ -5,6 +5,8 @@ find_package(OpenGL QUIET REQUIRED)
 orcaslicer_add_cmake_project(
   GLEW
   SOURCE_DIR  ${CMAKE_CURRENT_LIST_DIR}/glew
+  CMAKE_ARGS
+    -DGLEW_USE_EGL=OFF
 )
 
 if (MSVC)

deps/GLEW/glew/CMakeLists.txt

@@ -3,9 +3,17 @@ project(GLEW)
 
 find_package(OpenGL REQUIRED)
 
-if(OpenGL_EGL_FOUND)
-    message(STATUS "building GLEW for EGL (hope that wxWidgets agrees, otherwise you won't have any output!)")
+# Allow parent project to control EGL usage.
+# Default to OFF since OrcaSlicer forces GDK_BACKEND=x11 (using GLX contexts).
+# GLEW must use glXGetProcAddressARB (GLX) to match wxWidgets GL canvas.
+# Using EGL function loading with GLX contexts causes rendering failures.
+option(GLEW_USE_EGL "Use EGL instead of GLX for OpenGL function loading" OFF)
+
+if(GLEW_USE_EGL)
+    message(STATUS "Building GLEW with EGL support")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGLEW_EGL")
+else()
+    message(STATUS "Building GLEW with GLX support")
 endif()
 
 add_library(GLEW src/glew.c)

deps/GMP/GMP.cmake

@@ -65,7 +65,7 @@ else ()
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
         PATCH_COMMAND git apply ${GMP_DIRECTORY_FLAG} --verbose ${CMAKE_CURRENT_LIST_DIR}/0001-GMP_GCC15.patch
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}" ${_gmp_build_tgt}
+        CONFIGURE_COMMAND  env "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}" ${_gmp_build_tgt}
         BUILD_COMMAND     make -j
         INSTALL_COMMAND   make install
     )

deps/MPFR/MPFR.cmake

@@ -31,7 +31,7 @@ else ()
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
         CONFIGURE_COMMAND autoreconf -f -i && 
-                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt}
+                          env "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP

deps/OCCT/OCCT.cmake

@@ -16,6 +16,7 @@ orcaslicer_add_cmake_project(OCCT
     #DEPENDS dep_Boost
     DEPENDS ${FREETYPE_PKG}
     CMAKE_ARGS
+        -DCMAKE_CXX_STANDARD=17
         -DBUILD_LIBRARY_TYPE=${library_build_type}
         -DUSE_TK=OFF
         -DUSE_TBB=OFF

deps/OpenSSL/OpenSSL.cmake

@@ -21,7 +21,7 @@ else()
     if(APPLE)
         set(_conf_cmd export MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} && ./Configure -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
     else()
-        set(_conf_cmd "./config")
+        set(_conf_cmd env "CC=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" "./config")
     endif()
     set(_cross_comp_prefix_line "")
     set(_make_cmd make -j${NPROC})

deps/TBB/TBB.cmake

@@ -1,4 +1,4 @@
-if (FLATPAK)
+if (FLATPAK AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake)
 else()
     set(_patch_command "")

deps/wxWidgets/wxWidgets.cmake

@@ -1,8 +1,6 @@
 set(_wx_toolkit "")
 set(_wx_debug_postfix "")
 set(_wx_shared -DwxBUILD_SHARED=OFF)
-set(_wx_flatpak_patch "")
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_gtk_ver 2)
 
@@ -14,7 +12,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     if (FLATPAK)
         set(_wx_debug_postfix "d")
         set(_wx_shared -DwxBUILD_SHARED=ON -DBUILD_SHARED_LIBS:BOOL=ON)
-        set(_wx_flatpak_patch PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-flatpak.patch)
     endif ()
 endif()
 
@@ -24,22 +21,13 @@ else ()
     set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
 endif ()
 
-set(_wx_opengl_override "")
-if(APPLE AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
-    set(_wx_opengl_override
-        -DOPENGL_gl_LIBRARY="-framework OpenGL"
-        -DOPENGL_glu_LIBRARY="-framework OpenGL"
-    )
-endif()
-
 orcaslicer_add_cmake_project(
     wxWidgets
     GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
+    GIT_TAG v3.3.2
     GIT_SHALLOW ON
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
-    ${_wx_flatpak_patch}
     CMAKE_ARGS
-        ${_wx_opengl_override}
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
         "-DCMAKE_DEBUG_POSTFIX:STRING=${_wx_debug_postfix}"
@@ -48,9 +36,9 @@ orcaslicer_add_cmake_project(
         ${_wx_shared}
         -DwxUSE_MEDIACTRL=ON
         -DwxUSE_DETECT_SM=OFF
-        -DwxUSE_UNICODE=ON
         -DwxUSE_PRIVATE_FONTS=ON
         -DwxUSE_OPENGL=ON
+        -DwxUSE_GLCANVAS_EGL=OFF
         -DwxUSE_WEBREQUEST=ON
         -DwxUSE_WEBVIEW=ON
         ${_wx_edge}
@@ -65,6 +53,29 @@ orcaslicer_add_cmake_project(
         -DwxUSE_LIBJPEG=sys
         -DwxUSE_LIBTIFF=OFF
         -DwxUSE_EXPAT=sys
+        -DwxUSE_NANOSVG=OFF
+)
+
+# wxWidgets 3.3 cmake install doesn't include private headers.
+# OrcaSlicer uses some of the private headers (for accessibility support).
+# Copy the private headers directory after install.
+if(MSVC)
+    set(_wx_inc_dest ${DESTDIR}/include/wx)
+else()
+    set(_wx_inc_dest ${DESTDIR}/include/wx-3.3/wx)
+endif()
+ExternalProject_Add_Step(dep_wxWidgets copy_private_headers
+    DEPENDEES install
+    COMMENT "Copying wxWidgets private headers"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        <SOURCE_DIR>/include/wx/private
+        ${_wx_inc_dest}/private
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        <SOURCE_DIR>/include/wx/generic/private
+        ${_wx_inc_dest}/generic/private
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        <SOURCE_DIR>/include/wx/gtk/private
+        ${_wx_inc_dest}/gtk/private
 )
 
 if (MSVC)

localization/i18n/list.txt

@@ -1,4 +1,3 @@
-src/libslic3r/PresetBundle.cpp
 src/slic3r/GUI/DeviceCore/DevBed.cpp
 src/slic3r/GUI/DeviceCore/DevBed.h
 src/slic3r/GUI/DeviceCore/DevConfig.h
@@ -68,6 +67,7 @@ src/slic3r/GUI/Gizmos/GLGizmoText.hpp
 src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
 src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
+src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
 src/slic3r/GUI/GUI_AuxiliaryList.cpp
@@ -81,6 +81,7 @@ src/slic3r/GUI/GUI_ObjectTable.hpp
 src/slic3r/GUI/GUI_ObjectTableSettings.cpp
 src/slic3r/GUI/GUI_ObjectTableSettings.hpp
 src/slic3r/GUI/GUI_Preview.cpp
+src/slic3r/GUI/2DBed.cpp
 src/slic3r/GUI/HintNotification.cpp
 src/slic3r/GUI/IMSlider.cpp
 src/slic3r/GUI/Widgets/SideTools.cpp
@@ -96,6 +97,7 @@ src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
 src/slic3r/GUI/Jobs/BindJob.cpp
 src/slic3r/GUI/Jobs/PrintJob.cpp
 src/slic3r/GUI/Jobs/SendJob.cpp
+src/slic3r/GUI/Jobs/EmbossJob.cpp
 src/slic3r/GUI/ThermalPreconditioningDialog.cpp
 src/slic3r/GUI/ThermalPreconditioningDialog.hpp
 src/slic3r/GUI/Jobs/SLAImportJob.cpp
@@ -165,7 +167,6 @@ src/slic3r/GUI/Tab.hpp
 src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/Auxiliary.cpp
 src/slic3r/GUI/UpdateDialogs.cpp
-src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/ObjColorDialog.cpp
 src/slic3r/GUI/SyncAmsInfoDialog.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
@@ -178,12 +179,10 @@ src/slic3r/GUI/KBShortcutsDialog.cpp
 src/slic3r/GUI/ReleaseNote.cpp
 src/slic3r/GUI/ReleaseNote.hpp
 src/slic3r/GUI/UpgradePanel.cpp
-src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/Utils/FixModelByWin10.cpp
 src/slic3r/Utils/PresetUpdater.cpp
 src/slic3r/Utils/Http.cpp
 src/slic3r/Utils/Process.cpp
-src/slic3r/GUI/Jobs/PrintJob.cpp
 src/libslic3r/GCode.cpp
 src/libslic3r/GCode/ToolOrdering.cpp
 src/libslic3r/ExtrusionEntity.cpp
@@ -237,7 +236,6 @@ src/slic3r/Utils/Obico.cpp
 src/slic3r/Utils/SimplyPrint.cpp
 src/slic3r/Utils/Flashforge.cpp
 src/slic3r/GUI/Jobs/OAuthJob.cpp
-src/slic3r/GUI/BackgroundSlicingProcess.cpp
 src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
 src/slic3r/GUI/PartSkipDialog.cpp
 src/slic3r/GUI/PartSkipDialog.hpp
@@ -246,4 +244,8 @@ src/slic3r/GUI/SkipPartCanvas.hpp
 src/slic3r/GUI/FilamentBitmapUtils.cpp
 src/slic3r/GUI/FilamentBitmapUtils.hpp
 src/slic3r/GUI/FilamentPickerDialog.cpp
+src/slic3r/GUI/NetworkPluginDialog.cpp
+src/slic3r/GUI/RammingChart.cpp
+src/slic3r/GUI/StepMeshDialog.cpp
 src/slic3r/GUI/FilamentPickerDialog.hpp
+src/libslic3r/PresetBundle.cpp

resources/profiles/Afinia.json

@@ -1,6 +1,6 @@
 {
     "name": "Afinia",
-    "version": "02.03.01.10",
+    "version": "02.03.02.60",
     "force_update": "0",
     "description": "Afinia configurations",
     "machine_model_list": [
@@ -18,6 +18,26 @@
             "name": "fdm_process_afinia_common",
             "sub_path": "process/fdm_process_afinia_common.json"
         },
+        {
+            "name": "fdm_process_afinia_0.18_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.24_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.30_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.36_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6.json"
+        },
+        {
+            "name": "fdm_process_afinia_0.42_nozzle_0.6",
+            "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6.json"
+        },
         {
             "name": "fdm_process_afinia_HS_common",
             "sub_path": "process/fdm_process_afinia_HS_common.json"
@@ -42,26 +62,6 @@
             "name": "0.28mm Extra Draft @Afinia H+1(HS)",
             "sub_path": "process/0.28mm Extra Draft @Afinia H+1(HS).json"
         },
-        {
-            "name": "fdm_process_afinia_0.18_nozzle_0.6",
-            "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6.json"
-        },
-        {
-            "name": "fdm_process_afinia_0.24_nozzle_0.6",
-            "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6.json"
-        },
-        {
-            "name": "fdm_process_afinia_0.30_nozzle_0.6",
-            "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6.json"
-        },
-        {
-            "name": "fdm_process_afinia_0.36_nozzle_0.6",
-            "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6.json"
-        },
-        {
-            "name": "fdm_process_afinia_0.42_nozzle_0.6",
-            "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6.json"
-        },
         {
             "name": "fdm_process_afinia_0.18_nozzle_0.6_HS",
             "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6_HS.json"
@@ -112,26 +112,18 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
+        },
         {
             "name": "fdm_filament_tpu",
             "sub_path": "filament/fdm_filament_tpu.json"
         },
-        {
-            "name": "Afinia PLA",
-            "sub_path": "filament/Afinia PLA.json"
-        },
-        {
-            "name": "Afinia Value PLA",
-            "sub_path": "filament/Afinia Value PLA.json"
-        },
         {
             "name": "Afinia ABS",
             "sub_path": "filament/Afinia ABS.json"
@@ -141,32 +133,40 @@
             "sub_path": "filament/Afinia ABS+.json"
         },
         {
-            "name": "Afinia Value ABS",
-            "sub_path": "filament/Afinia Value ABS.json"
-        },
-        {
-            "name": "Afinia TPU",
-            "sub_path": "filament/Afinia TPU.json"
-        },
-        {
-            "name": "Afinia PLA@HS",
-            "sub_path": "filament/Afinia PLA@HS.json"
-        },
-        {
-            "name": "Afinia Value PLA@HS",
-            "sub_path": "filament/Afinia Value PLA@HS.json"
+            "name": "Afinia ABS+@HS",
+            "sub_path": "filament/Afinia ABS+@HS.json"
         },
         {
             "name": "Afinia ABS@HS",
             "sub_path": "filament/Afinia ABS@HS.json"
         },
+        {
+            "name": "Afinia Value ABS",
+            "sub_path": "filament/Afinia Value ABS.json"
+        },
         {
             "name": "Afinia Value ABS@HS",
             "sub_path": "filament/Afinia Value ABS@HS.json"
         },
         {
-            "name": "Afinia ABS+@HS",
-            "sub_path": "filament/Afinia ABS+@HS.json"
+            "name": "Afinia PLA",
+            "sub_path": "filament/Afinia PLA.json"
+        },
+        {
+            "name": "Afinia PLA@HS",
+            "sub_path": "filament/Afinia PLA@HS.json"
+        },
+        {
+            "name": "Afinia Value PLA",
+            "sub_path": "filament/Afinia Value PLA.json"
+        },
+        {
+            "name": "Afinia Value PLA@HS",
+            "sub_path": "filament/Afinia Value PLA@HS.json"
+        },
+        {
+            "name": "Afinia TPU",
+            "sub_path": "filament/Afinia TPU.json"
         },
         {
             "name": "Afinia TPU@HS",
@@ -191,4 +191,4 @@
             "sub_path": "machine/Afinia H+1(HS) 0.6 nozzle.json"
         }
     ]
-}
+}

resources/profiles/Afinia/process/fdm_process_common.json

@@ -64,7 +64,7 @@
     "top_surface_line_width": "0.42",
     "top_surface_speed": "120",
     "travel_speed": "400",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",
     "xy_contour_compensation": "0",

resources/profiles/Anet/machine/Anet A8 Plus 0.4 nozzle.json

@@ -0,0 +1,237 @@
+{
+    "type": "machine",
+    "name": "Anet A8 Plus 0.4 nozzle",
+    "inherits": "",
+    "from": "User",
+    "adaptive_bed_mesh_margin": "0",
+    "auxiliary_fan": "0",
+    "bbl_use_printhost": "0",
+    "bed_custom_model": "",
+    "bed_custom_texture": "",
+    "bed_exclude_area": [
+        "0x0"
+    ],
+    "bed_mesh_max": "99999,99999",
+    "bed_mesh_min": "-99999,-99999",
+    "bed_mesh_probe_distance": "50,50",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "best_object_pos": "0.5,0.5",
+    "change_extrusion_role_gcode": "",
+    "change_filament_gcode": "M600",
+    "cooling_tube_length": "5",
+    "cooling_tube_retraction": "91.5",
+    "default_bed_type": "",
+    "default_filament_profile": [
+        "Anycubic Generic PLA"
+    ],
+    "default_print_profile": "0.20mm Standard @Anycubic 4MaxPro2",
+    "deretraction_speed": [
+        "25"
+    ],
+    "disable_m73": "0",
+    "emit_machine_limits_to_gcode": "1",
+    "enable_filament_ramming": "1",
+    "enable_long_retraction_when_cut": "0",
+    "extra_loading_move": "-2",
+    "extruder_clearance_height_to_lid": "140",
+    "extruder_clearance_height_to_rod": "36",
+    "extruder_clearance_radius": "65",
+    "extruder_colour": [
+        "#018001"
+    ],
+    "extruder_offset": [
+        "0x0"
+    ],
+    "fan_kickstart": "0",
+    "fan_speedup_overhangs": "1",
+    "fan_speedup_time": "0",
+    "gcode_flavor": "marlin",
+    "head_wrap_detect_zone": [],
+    "high_current_on_filament_swap": "0",
+    "host_type": "octoprint",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "long_retractions_when_cut": [
+        "0"
+    ],
+    "machine_end_gcode": "M104 S0 ; turn off extruder heating\nM140 S0 ; turn off bed heating\nM107 ; turn off fans\nG91 ; relative positioning\nG0 Z+0.5 ; move Z up a tiny bit\nG90 ; absolute positioning\nG0 X135 Y105 F{machine_max_speed_x[0]*60} ; move extruder to center position\nG0 Z190.5 F{machine_max_speed_z[0]*60} ; lower the plattform to Z min\nM84 ; steppers off\nG90 ; absolute positioning\n",
+    "machine_load_filament_time": "0",
+    "machine_max_acceleration_e": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "1250",
+        "1250"
+    ],
+    "machine_max_acceleration_retracting": [
+        "1250",
+        "1250"
+    ],
+    "machine_max_acceleration_travel": [
+        "1500",
+        "1500"
+    ],
+    "machine_max_acceleration_x": [
+        "1000",
+        "900"
+    ],
+    "machine_max_acceleration_y": [
+        "1000",
+        "900"
+    ],
+    "machine_max_acceleration_z": [
+        "1000",
+        "100"
+    ],
+    "machine_max_jerk_e": [
+        "5",
+        "5"
+    ],
+    "machine_max_jerk_x": [
+        "6",
+        "6"
+    ],
+    "machine_max_jerk_y": [
+        "6",
+        "6"
+    ],
+    "machine_max_jerk_z": [
+        "0.2",
+        "0.2"
+    ],
+    "machine_max_junction_deviation": [
+        "0",
+        "0"
+    ],
+    "machine_max_speed_e": [
+        "120",
+        "120"
+    ],
+    "machine_max_speed_x": [
+        "200",
+        "200"
+    ],
+    "machine_max_speed_y": [
+        "200",
+        "200"
+    ],
+    "machine_max_speed_z": [
+        "64",
+        "16"
+    ],
+    "machine_min_extruding_rate": [
+        "0",
+        "0"
+    ],
+    "machine_min_travel_rate": [
+        "0",
+        "0"
+    ],
+    "machine_pause_gcode": "M601",
+    "machine_start_gcode": "G21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 X0 Y0 ; home X and Y\nG28 Z0 ; home Z\nG1 Z30 F{machine_max_speed_z[0]*60} ; move Z a bit down to not blow on the bed edge while heating\nG1 X10 F3900 ; let some space on x to prevent the filament cooling exhaust from beeing blocked by the servo motor\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM106 S80 ; turn on fan to prevent air nozzle melt while heating up\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nM107 ; start with the fan off\nG28 X0 ; goto X home again\nG92 E0 ; zero the extruded length\nG1 Z0.2 F360 ; move plattform upwards\n; extrude material next to the plattform (comment or remove following lines to disable)\nG1 F180 E20 ; extrude some material next to the plattform\nG92 E0 ; zero the extruded length\nG1 E-[retraction_length] F{retraction_speed[0]*60} ; do a filament retract\nG92 E0 ; zero the extruded length again\nG1 X5 F3900 ; move sideways to get rid of that string\nG1 E[retraction_length] F{retraction_speed[0]*60} ; do a filament deretract with retract parameters\nG92 E0 ; zero the extruded length again\n; draw intro line (comment or remove following lines to disable)\nG1 X30 E5 F700 ; draw intro line\nG92 E0 ; zero the extruded length\nG1 E-[retraction_length] F{retraction_speed[0]*60} ; do a filament retract\nG1 X40 Z2.0 ; move away from the introline\nG92 E0 ; zero the extruded length again\nG1 E[retraction_length] F{retraction_speed[0]*60} ; do a filament deretract with retract parameters\n; end of intro line code\nM117 Printing...\nG5",
+    "machine_tool_change_time": "0",
+    "machine_unload_filament_time": "0",
+    "manual_filament_change": "0",
+    "max_layer_height": [
+        "0.3"
+    ],
+    "max_resonance_avoidance_speed": "120",
+    "min_layer_height": [
+        "0.07"
+    ],
+    "min_resonance_avoidance_speed": "70",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "nozzle_height": "2.5",
+    "nozzle_hrc": "0",
+    "nozzle_type": "undefine",
+    "nozzle_volume": "0",
+    "parking_pos_retraction": "92",
+    "pellet_modded_printer": "0",
+    "preferred_orientation": "0",
+    "printable_area": [
+        "0x0",
+        "300x0",
+        "300x300",
+        "0x300"
+    ],
+    "printable_height": "350",
+    "printer_model": "Anet A8 Plus",
+    "printer_notes": "",
+    "printer_settings_id": "Anet A8 Plus 0.4 nozzle",
+    "printer_structure": "undefine",
+    "printer_technology": "FFF",
+    "printer_variant": "0.4",
+    "printhost_authorization_type": "key",
+    "printhost_ssl_ignore_revoke": "0",
+    "printing_by_object_gcode": "",
+    "purge_in_prime_tower": "1",
+    "resonance_avoidance": "0",
+    "retract_before_wipe": [
+        "0%"
+    ],
+    "retract_length_toolchange": [
+        "10"
+    ],
+    "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": [
+        "2.5"
+    ],
+    "retraction_minimum_travel": [
+        "2"
+    ],
+    "retraction_speed": [
+        "35"
+    ],
+    "scan_first_layer": "0",
+    "silent_mode": "0",
+    "single_extruder_multi_material": "1",
+    "support_air_filtration": "1",
+    "support_chamber_temp_control": "1",
+    "support_multi_bed_types": "0",
+    "template_custom_gcode": "",
+    "thumbnails": "48x48/PNG,300x300/PNG",
+    "thumbnails_format": "PNG",
+    "time_cost": "0",
+    "time_lapse_gcode": "",
+    "travel_slope": [
+        "3"
+    ],
+    "upward_compatible_machine": [],
+    "use_firmware_retraction": "0",
+    "use_relative_e_distances": "1",
+    "wipe": [
+        "1"
+    ],
+    "wipe_distance": [
+        "1"
+    ],
+    "z_hop": [
+        "0.4"
+    ],
+    "z_hop_types": [
+        "Normal Lift"
+    ],
+    "z_offset": "0"
+}

resources/profiles/Anker.json

@@ -1,6 +1,6 @@
 {
     "name": "Anker",
-    "version": "02.03.01.20",
+    "version": "02.03.02.60",
     "force_update": "0",
     "description": "Anker configurations",
     "machine_model_list": [

resources/profiles/Anker/process/fdm_process_common.json

@@ -81,7 +81,7 @@
     "skirt_height": "1",
     "brim_width": "5",
     "brim_object_gap": "0.1",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "prime_tower_width": "60",
     "wipe_tower_no_sparse_layers": "0",
     "print_sequence": "by layer",

resources/profiles/Anycubic.json

@@ -1,6 +1,6 @@
 {
     "name": "Anycubic",
-    "version": "02.03.01.10",
+    "version": "02.03.02.60",
     "force_update": "0",
     "description": "Anycubic configurations",
     "machine_model_list": [
@@ -56,6 +56,10 @@
             "name": "Anycubic Kobra S1",
             "sub_path": "machine/Anycubic Kobra S1.json"
         },
+        {
+            "name": "Anycubic Predator",
+            "sub_path": "machine/Anycubic Predator.json"
+        },
         {
             "name": "Anycubic Vyper",
             "sub_path": "machine/Anycubic Vyper.json"
@@ -63,10 +67,6 @@
         {
             "name": "Anycubic i3 Mega S",
             "sub_path": "machine/Anycubic i3 Mega S.json"
-        },
-        {
-            "name": "Anycubic Predator",
-            "sub_path": "machine/Anycubic Predator.json"
         }
     ],
     "process_list": [
@@ -82,14 +82,14 @@
             "name": "0.10mm Detail @Anycubic Kobra 3 0.2 nozzle",
             "sub_path": "process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json"
         },
-        {
-            "name": "0.12mm Detail @Anycubic Kobra 3 0.4 nozzle",
-            "sub_path": "process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json"
-        },
         {
             "name": "0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle",
             "sub_path": "process/0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle.json"
         },
+        {
+            "name": "0.12mm Detail @Anycubic Kobra 3 0.4 nozzle",
+            "sub_path": "process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json"
+        },
         {
             "name": "0.15mm Optimal @Anycubic 4MaxPro2",
             "sub_path": "process/0.15mm Optimal @Anycubic 4MaxPro2.json"
@@ -126,14 +126,14 @@
             "name": "0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle",
             "sub_path": "process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json"
         },
-        {
-            "name": "0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle",
-            "sub_path": "process/0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json"
-        },
         {
             "name": "0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle",
             "sub_path": "process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json"
         },
+        {
+            "name": "0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle",
+            "sub_path": "process/0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json"
+        },
         {
             "name": "0.20mm Standard @Anycubic 4MaxPro",
             "sub_path": "process/0.20mm Standard @Anycubic 4MaxPro.json"
@@ -186,6 +186,10 @@
             "name": "0.20mm Standard @Anycubic KobraPlus",
             "sub_path": "process/0.20mm Standard @Anycubic KobraPlus.json"
         },
+        {
+            "name": "0.20mm Standard @Anycubic Predator",
+            "sub_path": "process/0.20mm Standard @Anycubic Predator.json"
+        },
         {
             "name": "0.20mm Standard @Anycubic Vyper",
             "sub_path": "process/0.20mm Standard @Anycubic Vyper.json"
@@ -202,14 +206,14 @@
             "name": "0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle",
             "sub_path": "process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json"
         },
-        {
-            "name": "0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle",
-            "sub_path": "process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json"
-        },
         {
             "name": "0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle",
             "sub_path": "process/0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json"
         },
+        {
+            "name": "0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle",
+            "sub_path": "process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json"
+        },
         {
             "name": "0.30mm Draft @Anycubic 4MaxPro2",
             "sub_path": "process/0.30mm Draft @Anycubic 4MaxPro2.json"
@@ -249,10 +253,6 @@
         {
             "name": "0.40mm Standard @Anycubic Kobra 3 0.8 nozzle",
             "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json"
-        },
-        {
-            "name": "0.20mm Standard @Anycubic Predator",
-            "sub_path": "process/0.20mm Standard @Anycubic Predator.json"
         }
     ],
     "filament_list": [
@@ -506,6 +506,10 @@
             "name": "Anycubic Kobra S1 0.4 nozzle",
             "sub_path": "machine/Anycubic Kobra S1 0.4 nozzle.json"
         },
+        {
+            "name": "Anycubic Predator 0.4 nozzle",
+            "sub_path": "machine/Anycubic Predator 0.4 nozzle.json"
+        },
         {
             "name": "Anycubic Vyper 0.4 nozzle",
             "sub_path": "machine/Anycubic Vyper 0.4 nozzle.json"
@@ -513,10 +517,6 @@
         {
             "name": "Anycubic i3 Mega S 0.4 nozzle",
             "sub_path": "machine/Anycubic i3 Mega S 0.4 nozzle.json"
-        },
-        {
-            "name": "Anycubic Predator 0.4 nozzle",
-            "sub_path": "machine/Anycubic Predator 0.4 nozzle.json"
         }
     ]
-}
+}

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic 4MaxPro2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "45",
     "travel_speed": "60",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Chiron.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "60",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Kobra.json

@@ -99,7 +99,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "90",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Kobra2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "100",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0.02",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic KobraMax.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic KobraPlus.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Vyper.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic i3MegaS.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "60",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic 4MaxPro2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "45",
     "travel_speed": "60",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Chiron.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "60",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra.json

@@ -99,7 +99,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "90",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "100",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0.02",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic KobraMax.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic KobraPlus.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Vyper.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.20mm Standard @Anycubic i3MegaS.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "60",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic 4MaxPro2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "45",
     "travel_speed": "60",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Chiron.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "85",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Kobra.json

@@ -99,7 +99,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "90",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Kobra2.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "100",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0.02",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic KobraMax.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic KobraPlus.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Vyper.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "70",
     "travel_speed": "120",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/0.30mm Draft @Anycubic i3MegaS.json

@@ -97,7 +97,7 @@
     "gap_infill_speed": "30",
     "sparse_infill_speed": "85",
     "travel_speed": "180",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Anycubic/process/fdm_process_common.json

@@ -83,7 +83,7 @@
     "top_surface_pattern": "monotonicline",
     "top_surface_line_width": "0.4",
     "top_shell_thickness": "0.8",
-    "enable_prime_tower": "0",
+    "enable_prime_tower": "1",
     "wipe_tower_no_sparse_layers": "0",
     "prime_tower_width": "60",
     "xy_hole_compensation": "0",

resources/profiles/Artillery.json

@@ -1,13 +1,9 @@
 {
     "name": "Artillery",
-    "version":  "02.03.02.10",
+    "version": "02.03.02.60",
     "force_update": "0",
     "description": "Artillery configurations",
     "machine_model_list": [
-        {
-            "name": "Artillery Sidewinder X1",
-            "sub_path": "machine/Artillery Sidewinder X1.json"
-        },
         {
             "name": "Artillery Genius",
             "sub_path": "machine/Artillery Genius.json"
@@ -16,43 +12,143 @@
             "name": "Artillery Genius Pro",
             "sub_path": "machine/Artillery Genius Pro.json"
         },
-        {
-            "name": "Artillery Sidewinder X2",
-            "sub_path": "machine/Artillery Sidewinder X2.json"
-        },
         {
             "name": "Artillery Hornet",
             "sub_path": "machine/Artillery Hornet.json"
         },
         {
-            "name": "Artillery Sidewinder X3 Pro",
-            "sub_path": "machine/Artillery Sidewinder X3 Pro.json"
+            "name": "Artillery M1 Pro",
+            "sub_path": "machine/Artillery M1 Pro.json"
+        },
+        {
+            "name": "Artillery Sidewinder X1",
+            "sub_path": "machine/Artillery Sidewinder X1.json"
+        },
+        {
+            "name": "Artillery Sidewinder X2",
+            "sub_path": "machine/Artillery Sidewinder X2.json"
         },
         {
             "name": "Artillery Sidewinder X3 Plus",
             "sub_path": "machine/Artillery Sidewinder X3 Plus.json"
         },
         {
-            "name": "Artillery Sidewinder X4 Pro",
-            "sub_path": "machine/Artillery Sidewinder X4 Pro.json"
+            "name": "Artillery Sidewinder X3 Pro",
+            "sub_path": "machine/Artillery Sidewinder X3 Pro.json"
         },
         {
             "name": "Artillery Sidewinder X4 Plus",
             "sub_path": "machine/Artillery Sidewinder X4 Plus.json"
         },
         {
-            "name": "Artillery M1 Pro",
-            "sub_path": "machine/Artillery M1 Pro.json"
+            "name": "Artillery Sidewinder X4 Pro",
+            "sub_path": "machine/Artillery Sidewinder X4 Pro.json"
         }
     ],
     "process_list": [
+        {
+            "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json"
+        },
         {
             "name": "fdm_process_common",
             "sub_path": "process/fdm_process_common.json"
         },
         {
-            "name": "0.16mm Optimal @Artillery X1",
-            "sub_path": "process/0.16mm Optimal @Artillery X1.json"
+            "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
         },
         {
             "name": "0.15mm Optimal @Artillery Genius",
@@ -62,13 +158,21 @@
             "name": "0.15mm Optimal @Artillery Genius Pro",
             "sub_path": "process/0.15mm Optimal @Artillery Genius Pro.json"
         },
+        {
+            "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
+        },
         {
             "name": "0.16mm Optimal @Artillery Hornet",
             "sub_path": "process/0.16mm Optimal @Artillery Hornet.json"
         },
         {
-            "name": "0.20mm Standard @Artillery X1",
-            "sub_path": "process/0.20mm Standard @Artillery X1.json"
+            "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.16mm Optimal @Artillery X1",
+            "sub_path": "process/0.16mm Optimal @Artillery X1.json"
         },
         {
             "name": "0.20mm Standard @Artillery Genius",
@@ -78,13 +182,49 @@
             "name": "0.20mm Standard @Artillery Genius Pro",
             "sub_path": "process/0.20mm Standard @Artillery Genius Pro.json"
         },
+        {
+            "name": "0.20mm Standard @Artillery Hornet",
+            "sub_path": "process/0.20mm Standard @Artillery Hornet.json"
+        },
+        {
+            "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.20mm Standard @Artillery X1",
+            "sub_path": "process/0.20mm Standard @Artillery X1.json"
+        },
         {
             "name": "0.20mm Standard @Artillery X2",
             "sub_path": "process/0.20mm Standard @Artillery X2.json"
         },
         {
-            "name": "0.20mm Standard @Artillery Hornet",
-            "sub_path": "process/0.20mm Standard @Artillery Hornet.json"
+            "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle",
+            "sub_path": "process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json"
+        },
+        {
+            "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle",
+            "sub_path": "process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle",
+            "sub_path": "process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json"
+        },
+        {
+            "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "0.24mm Draft @Artillery Hornet",
+            "sub_path": "process/0.24mm Draft @Artillery Hornet.json"
+        },
+        {
+            "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json"
         },
         {
             "name": "0.24mm Draft @Artillery X1",
@@ -99,52 +239,8 @@
             "sub_path": "process/0.25mm Draft @Artillery Genius Pro.json"
         },
         {
-            "name": "0.24mm Draft @Artillery Hornet",
-            "sub_path": "process/0.24mm Draft @Artillery Hornet.json"
-        },
-        {
-            "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle",
-            "sub_path": "process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle",
-            "sub_path": "process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json"
+            "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json"
         },
         {
             "name": "0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle",
@@ -183,154 +279,94 @@
             "sub_path": "process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json"
         },
         {
-            "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle",
-            "sub_path": "process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json"
+            "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle",
-            "sub_path": "process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json"
+            "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
+            "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
+            "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+            "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json"
+            "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
+            "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json"
+            "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json"
         },
         {
-            "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json"
+            "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle",
+            "sub_path": "process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json"
         }
     ],
     "filament_list": [
+        {
+            "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json"
+        },
         {
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
         {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
+            "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json"
         },
         {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
+            "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json"
         },
         {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
+            "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json"
         },
         {
             "name": "fdm_filament_abs",
@@ -340,6 +376,30 @@
             "name": "fdm_filament_asa",
             "sub_path": "filament/fdm_filament_asa.json"
         },
+        {
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
+        },
+        {
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
+        },
+        {
+            "name": "Artillery Generic ABS",
+            "sub_path": "filament/Artillery Generic ABS.json"
+        },
+        {
+            "name": "Artillery Generic ASA",
+            "sub_path": "filament/Artillery Generic ASA.json"
+        },
+        {
+            "name": "Artillery Generic PETG",
+            "sub_path": "filament/Artillery Generic PETG.json"
+        },
         {
             "name": "Artillery Generic PLA",
             "sub_path": "filament/Artillery Generic PLA.json"
@@ -348,58 +408,106 @@
             "name": "Artillery Generic PLA-CF",
             "sub_path": "filament/Artillery Generic PLA-CF.json"
         },
-        {
-            "name": "Artillery Generic PETG",
-            "sub_path": "filament/Artillery Generic PETG.json"
-        },
-        {
-            "name": "Artillery Generic ABS",
-            "sub_path": "filament/Artillery Generic ABS.json"
-        },
         {
             "name": "Artillery Generic TPU",
             "sub_path": "filament/Artillery Generic TPU.json"
         },
-        {
-            "name": "Artillery Generic ASA",
-            "sub_path": "filament/Artillery Generic ASA.json"
-        },
-        {
-            "name": "Artillery PLA Basic",
-            "sub_path": "filament/Artillery PLA Basic.json"
-        },
-        {
-            "name": "Artillery PLA Matte",
-            "sub_path": "filament/Artillery PLA Matte.json"
-        },
-        {
-            "name": "Artillery PLA Silk",
-            "sub_path": "filament/Artillery PLA Silk.json"
-        },
-        {
-            "name": "Artillery PLA Tough",
-            "sub_path": "filament/Artillery PLA Tough.json"
-        },
-        {
-            "name": "Artillery PETG",
-            "sub_path": "filament/Artillery PETG.json"
-        },
-        {
-            "name": "Artillery TPU",
-            "sub_path": "filament/Artillery TPU.json"
-        },
         {
             "name": "Artillery ABS",
             "sub_path": "filament/Artillery ABS.json"
         },
-        {
-            "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json"
-        },
         {
             "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle",
             "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json"
         },
+        {
+            "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PETG",
+            "sub_path": "filament/Artillery PETG.json"
+        },
+        {
+            "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Basic",
+            "sub_path": "filament/Artillery PLA Basic.json"
+        },
+        {
+            "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Matte",
+            "sub_path": "filament/Artillery PLA Matte.json"
+        },
+        {
+            "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Silk",
+            "sub_path": "filament/Artillery PLA Silk.json"
+        },
+        {
+            "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PLA Tough",
+            "sub_path": "filament/Artillery PLA Tough.json"
+        },
+        {
+            "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery TPU",
+            "sub_path": "filament/Artillery TPU.json"
+        },
+        {
+            "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json"
+        },
         {
             "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json"
@@ -412,10 +520,6 @@
             "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle",
             "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json"
         },
-        {
-            "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json"
-        },
         {
             "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json"
@@ -428,10 +532,6 @@
             "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle",
             "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json"
         },
-        {
-            "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json"
-        },
         {
             "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json"
@@ -444,10 +544,6 @@
             "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle",
             "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json"
         },
-        {
-            "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json"
-        },
         {
             "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json"
@@ -457,93 +553,21 @@
             "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json"
         },
         {
-            "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json"
+            "name": "Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json"
         },
         {
-            "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json"
+            "name": "Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle",
+            "sub_path": "filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json"
         },
         {
-            "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle",
-            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json"
-        },
-        {
-            "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle",
-            "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json"
+            "name": "Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle",
+            "sub_path": "filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json"
         },
         {
             "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle",
             "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json"
         },
-        {
-            "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json"
-        },
         {
             "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json"
@@ -552,10 +576,6 @@
             "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle",
             "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json"
         },
-        {
-            "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json"
-        },
         {
             "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle",
             "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json"
@@ -570,18 +590,10 @@
             "name": "fdm_machine_common",
             "sub_path": "machine/fdm_machine_common.json"
         },
-        {
-            "name": "Artillery Sidewinder X1 0.4 nozzle",
-            "sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json"
-        },
         {
             "name": "Artillery Genius 0.4 nozzle",
             "sub_path": "machine/Artillery Genius 0.4 nozzle.json"
         },
-        {
-            "name": "Artillery Sidewinder X2 0.4 nozzle",
-            "sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json"
-        },
         {
             "name": "Artillery Genius Pro 0.4 nozzle",
             "sub_path": "machine/Artillery Genius Pro 0.4 nozzle.json"
@@ -591,28 +603,36 @@
             "sub_path": "machine/Artillery Hornet 0.4 nozzle.json"
         },
         {
-            "name": "Artillery Sidewinder X3 Pro 0.4 nozzle",
-            "sub_path": "machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json"
+            "name": "Artillery M1 Pro 0.4 nozzle",
+            "sub_path": "machine/Artillery M1 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery Sidewinder X1 0.4 nozzle",
+            "sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json"
+        },
+        {
+            "name": "Artillery Sidewinder X2 0.4 nozzle",
+            "sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json"
         },
         {
             "name": "Artillery Sidewinder X3 Plus 0.4 nozzle",
             "sub_path": "machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json"
         },
         {
-            "name": "Artillery Sidewinder X4 Pro 0.4 nozzle",
-            "sub_path": "machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json"
+            "name": "Artillery Sidewinder X3 Pro 0.4 nozzle",
+            "sub_path": "machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json"
         },
         {
             "name": "Artillery Sidewinder X4 Plus 0.4 nozzle",
             "sub_path": "machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json"
         },
         {
-            "name": "Artillery M1 Pro 0.2 nozzle",
-            "sub_path": "machine/Artillery M1 Pro 0.2 nozzle.json"
+            "name": "Artillery Sidewinder X4 Pro 0.4 nozzle",
+            "sub_path": "machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json"
         },
         {
-            "name": "Artillery M1 Pro 0.4 nozzle",
-            "sub_path": "machine/Artillery M1 Pro 0.4 nozzle.json"
+            "name": "Artillery M1 Pro 0.2 nozzle",
+            "sub_path": "machine/Artillery M1 Pro 0.2 nozzle.json"
         },
         {
             "name": "Artillery M1 Pro 0.6 nozzle",

resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "260"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
-}
+    ]
+}

resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json

@@ -19,7 +19,6 @@
     "filament_settings_id": [
         "Artillery ABS @Artillery M1 Pro 0.4 nozzle"
     ],
-    "is_custom_defined": "0",
     "slow_down_layer_time": [
         "12"
     ],
@@ -103,7 +102,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.2.2"
-
+    ]
 }

resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "260"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
-}
+    ]
+}

resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "260"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
-}
+    ]
+}

resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "270"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
-}
+    ]
+}

resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json

@@ -40,7 +40,6 @@
     "filament_type": [
         "ASA"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "260"
     ],
@@ -112,7 +111,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.2.2"
-
+    ]
 }

resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "270"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
+    ]
 }

resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json

@@ -220,7 +220,6 @@
     "idle_temperature": [
         "0"
     ],
-    "is_custom_defined": "0",
     "nozzle_temperature": [
         "270"
     ],
@@ -283,6 +282,5 @@
     ],
     "cool_plate_temp_initial_layer": [
         "100"
-    ],
-    "version": "2.1.1.0"
+    ]
 }

resources/profiles/Artillery/filament/Artillery Generic ABS.json

@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Artillery Generic ABS",
-    "inherits": "fdm_filament_abs",
-    "from": "system",
-    "setting_id": "GFSA04",
     "filament_id": "GFB99",
+    "setting_id": "GFSA04",
+    "name": "Artillery Generic ABS",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_abs",
     "filament_flow_ratio": [
         "0.926"
     ],
@@ -13,10 +13,10 @@
         "12"
     ],
     "compatible_printers": [
-        "Artillery Sidewinder X1 0.4 nozzle",
-        "Artillery Genius 0.4 nozzle",
-        "Artillery Sidewinder X2 0.4 nozzle",
-        "Artillery Genius Pro 0.4 nozzle",
-        "Artillery Hornet 0.4 nozzle"
+		"Artillery Sidewinder X1 0.4 nozzle",
+		"Artillery Genius 0.4 nozzle",
+		"Artillery Sidewinder X2 0.4 nozzle",
+		"Artillery Genius Pro 0.4 nozzle",
+		"Artillery Hornet 0.4 nozzle"
     ]
-}
+}

resources/profiles/Artillery/filament/Artillery Generic ASA.json

@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Artillery Generic ASA",
-    "inherits": "fdm_filament_asa",
-    "from": "system",
-    "setting_id": "GFSA04",
     "filament_id": "GFB98",
+    "setting_id": "GFSA04",
+    "name": "Artillery Generic ASA",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_asa",
     "filament_flow_ratio": [
         "0.93"
     ],
@@ -13,10 +13,10 @@
         "12"
     ],
     "compatible_printers": [
-        "Artillery Sidewinder X1 0.4 nozzle",
-        "Artillery Genius 0.4 nozzle",
-        "Artillery Sidewinder X2 0.4 nozzle",
-        "Artillery Genius Pro 0.4 nozzle",
-        "Artillery Hornet 0.4 nozzle"
+		"Artillery Sidewinder X1 0.4 nozzle",
+		"Artillery Genius 0.4 nozzle",
+		"Artillery Sidewinder X2 0.4 nozzle",
+		"Artillery Genius Pro 0.4 nozzle",
+		"Artillery Hornet 0.4 nozzle"
     ]
-}
+}

resources/profiles/Artillery/filament/Artillery Generic PETG.json

@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Artillery Generic PETG",
-    "inherits": "fdm_filament_pet",
-    "from": "system",
-    "setting_id": "GFSA04",
     "filament_id": "GFG99",
+    "setting_id": "GFSA04",
+    "name": "Artillery Generic PETG",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_pet",
     "reduce_fan_stop_start_freq": [
         "1"
     ],
@@ -43,10 +43,10 @@
         "; filament start gcode\n"
     ],
     "compatible_printers": [
-        "Artillery Sidewinder X1 0.4 nozzle",
-        "Artillery Genius 0.4 nozzle",
-        "Artillery Sidewinder X2 0.4 nozzle",
-        "Artillery Genius Pro 0.4 nozzle",
-        "Artillery Hornet 0.4 nozzle"
+		"Artillery Sidewinder X1 0.4 nozzle",
+		"Artillery Genius 0.4 nozzle",
+		"Artillery Sidewinder X2 0.4 nozzle",
+		"Artillery Genius Pro 0.4 nozzle",
+		"Artillery Hornet 0.4 nozzle"
     ]
-}
+}

resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json

@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Artillery Generic PLA-CF",
-    "inherits": "fdm_filament_pla",
-    "from": "system",
-    "setting_id": "GFSA04",
     "filament_id": "GFL98",
+    "setting_id": "GFSA04",
+    "name": "Artillery Generic PLA-CF",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.95"
     ],
@@ -18,10 +18,10 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "hot_plate_temp": [
+    "hot_plate_temp" : [
         "60"
     ],
-    "hot_plate_temp_initial_layer": [
+    "hot_plate_temp_initial_layer" : [
         "60"
     ],
     "nozzle_temperature_initial_layer": [
@@ -31,10 +31,10 @@
         "200"
     ],
     "compatible_printers": [
-        "Artillery Sidewinder X1 0.4 nozzle",
-        "Artillery Genius 0.4 nozzle",
-        "Artillery Sidewinder X2 0.4 nozzle",
-        "Artillery Genius Pro 0.4 nozzle",
-        "Artillery Hornet 0.4 nozzle"
+		"Artillery Sidewinder X1 0.4 nozzle",
+		"Artillery Genius 0.4 nozzle",
+		"Artillery Sidewinder X2 0.4 nozzle",
+		"Artillery Genius Pro 0.4 nozzle",
+		"Artillery Hornet 0.4 nozzle"
     ]
-}
+}

resources/profiles/Artillery/filament/Artillery Generic PLA.json

@@ -1,11 +1,11 @@
 {
     "type": "filament",
-    "name": "Artillery Generic PLA",
-    "inherits": "fdm_filament_pla",
-    "from": "system",
-    "setting_id": "GFSA04",
     "filament_id": "GFL99",
+    "setting_id": "GFSA04",
+    "name": "Artillery Generic PLA",
+    "from": "system",
     "instantiation": "true",
+    "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
@@ -15,10 +15,10 @@
     "slow_down_layer_time": [
         "8"
     ],
-    "hot_plate_temp": [
+    "hot_plate_temp" : [
         "60"
     ],
-    "hot_plate_temp_initial_layer": [
+    "hot_plate_temp_initial_layer" : [
         "60"
     ],
     "nozzle_temperature_initial_layer": [
@@ -28,10 +28,10 @@
         "200"
     ],
     "compatible_printers": [
-        "Artillery Sidewinder X1 0.4 nozzle",
-        "Artillery Genius 0.4 nozzle",
-        "Artillery Sidewinder X2 0.4 nozzle",
-        "Artillery Genius Pro 0.4 nozzle",
-        "Artillery Hornet 0.4 nozzle"
+		"Artillery Sidewinder X1 0.4 nozzle",
+		"Artillery Genius 0.4 nozzle",
+		"Artillery Sidewinder X2 0.4 nozzle",
+		"Artillery Genius Pro 0.4 nozzle",
+		"Artillery Hornet 0.4 nozzle"
     ]
-}
+}