Bump actions/cache from 5 to 6

Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
fix build errors
2026-07-02 08:31:13 +00:00 · 2026-07-01 16:25:05 +00:00 · 2026-07-01 23:51:33 +08:00 · 2026-07-01 23:21:09 +08:00 · 2026-07-01 21:56:31 +08:00 · 2026-07-01 21:56:22 +08:00
718 changed files with 2190 additions and 2244 deletions
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -223,14 +223,14 @@ jobs:
    # 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
+      uses: actions/cache/restore@v6
      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
+      uses: actions/cache@v6
      with:
        path: .flatpak-builder
        key: flatpak-builder-${{ matrix.variant.arch }}-${{ github.sha }}
--- a/.github/workflows/build_check_cache.yml
+++ b/.github/workflows/build_check_cache.yml
@@ -46,7 +46,7 @@ jobs:
            
      - name: load cache
        id: cache_deps
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        with:
          path: ${{ steps.set_outputs.outputs.cache-path }}
          key: ${{ steps.set_outputs.outputs.cache-key }}
--- a/.github/workflows/build_deps.yml
+++ b/.github/workflows/build_deps.yml
@@ -39,7 +39,7 @@ jobs:
          lfs: 'false'

      - name: load cached deps
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        with:
          path: ${{ inputs.cache-path }}
          key: ${{ inputs.cache-key }}
--- a/.github/workflows/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@@ -43,7 +43,7 @@ jobs:

      - name: load cached deps
        if: ${{ !(runner.os == 'macOS' && inputs.macos-combine-only) }}
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        with:
          path: ${{ inputs.cache-path }}
          key: ${{ inputs.cache-key }}
--- a/.github/workflows/check_profiles.yml
+++ b/.github/workflows/check_profiles.yml
@@ -57,6 +57,20 @@ jobs:
          set +e
          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v BBL -f 2>&1 | tee ${{ runner.temp }}/validate_filament_subtypes.log
          exit ${PIPESTATUS[0]}
+      # Flag inherits/compatible_printers/compatible_prints references that point at a deleted or
+      # renamed preset. Opt-in per vendor for now (via -r); enabled for BBL and Qidi until other
+      # vendors' profiles are cleaned up. Runs before the custom-preset injection below.
+      - name: validate preset references for BBL and Qidi profiles
+        id: validate_preset_references
+        continue-on-error: true
+        run: |
+          set +e
+          rc=0
+          for v in BBL Qidi; do
+            ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v "$v" -r 2>&1 | tee -a ${{ runner.temp }}/validate_preset_references.log
+            [ ${PIPESTATUS[0]} -ne 0 ] && rc=1
+          done
+          exit $rc

      - name: validate custom presets
        id: validate_custom
@@ -76,7 +90,7 @@ jobs:
          echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt

      - name: Prepare comment artifact
-        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_preset_references.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
        run: |
          {
            # Marker matched by check_profiles_comment.yml to delete prior comments.
@@ -111,6 +125,15 @@ jobs:
              echo ""
            fi

+            if [ "${{ steps.validate_preset_references.outcome }}" = "failure" ]; then
+              echo "### BBL/Qidi Preset Reference Validation Failed"
+              echo ""
+              echo '```'
+              head -c 30000 ${{ runner.temp }}/validate_preset_references.log || echo "No output captured"
+              echo '```'
+              echo ""
+            fi
+
            if [ "${{ steps.validate_custom.outcome }}" = "failure" ]; then
              echo "### Custom Preset Validation Failed"
              echo ""
@@ -133,7 +156,7 @@ jobs:
          retention-days: 1

      - name: Fail if any check failed
-        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_preset_references.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
        run: |
          echo "One or more profile checks failed. See above for details."
          exit 1
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -21,7 +21,7 @@ jobs:
    steps:
      - name: Cache shellcheck download
        id: cache-shellcheck-v0_11
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        with:
          path: ~/shellcheck
          key: ${{ runner.os }}-shellcheck-v0_11
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -1,6 +1,6 @@
 {
 	"name": "Qidi",
-	"version": "02.04.00.05",
+	"version": "02.04.00.06",
 	"force_update": "0",
 	"description": "Qidi configurations",
 	"machine_model_list": [
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -19,9 +19,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -13,9 +13,6 @@
 		"0.014"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -25,9 +25,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -46,9 +46,6 @@
 		"1"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle",
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -46,9 +46,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -46,9 +46,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -19,9 +19,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -22,9 +22,6 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/Bambu
+++ b/resources/profiles/Qidi/filament/Bambu
@@ -22,9 +22,6 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -19,9 +19,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -13,9 +13,6 @@
 		"0.014"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -25,9 +25,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -46,9 +46,6 @@
 		"1"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle",
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -46,9 +46,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -46,9 +46,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -19,9 +19,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -22,9 +22,6 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/HATCHBOX
+++ b/resources/profiles/Qidi/filament/HATCHBOX
@@ -22,9 +22,6 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -16,9 +16,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -13,9 +13,6 @@
 		"0.018"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -16,9 +16,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -16,9 +16,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -13,9 +13,6 @@
 		"0.017"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/Overture
+++ b/resources/profiles/Qidi/filament/Overture
@@ -13,9 +13,6 @@
 		"0.009"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -16,9 +16,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -13,9 +13,6 @@
 		"0.018"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -16,9 +16,6 @@
 		"10"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -16,9 +16,6 @@
 		"2"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.2 nozzle",
-		"Qidi X-Max 0.2 nozzle",
-		"Qidi X-CF Pro 0.2 nozzle",
 		"Qidi X-Smart 3 0.2 nozzle",
 		"Qidi X-Plus 3 0.2 nozzle",
 		"Qidi X-Max 3 0.2 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -13,9 +13,6 @@
 		"0.017"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.6 nozzle",
-		"Qidi X-Max 0.6 nozzle",
-		"Qidi X-CF Pro 0.6 nozzle",
 		"Qidi X-Smart 3 0.6 nozzle",
 		"Qidi X-Plus 3 0.6 nozzle",
 		"Qidi X-Max 3 0.6 nozzle"
--- a/resources/profiles/Qidi/filament/PolyLite
+++ b/resources/profiles/Qidi/filament/PolyLite
@@ -13,9 +13,6 @@
 		"0.009"
 	],
 	"compatible_printers": [
-		"Qidi X-Plus 0.8 nozzle",
-		"Qidi X-Max 0.8 nozzle",
-		"Qidi X-CF Pro 0.8 nozzle",
 		"Qidi X-Smart 3 0.8 nozzle",
 		"Qidi X-Plus 3 0.8 nozzle",
 		"Qidi X-Max 3 0.8 nozzle"
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -102,4 +102,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
 	"name": "Bambu ABS@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFB99",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -102,4 +102,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "yHD2P97YYI869y1a",
 	"name": "Bambu ABS @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "yHD2P97YYI869y1a",
+	"instantiation": "true",
 	"chamber_temperature": [
 		"0"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "dIUVKJDEofMGqc8C",
 	"name": "Bambu ABS @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "dIUVKJDEofMGqc8C",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.03"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "0leYv1TdNe38wFpf",
 	"name": "Bambu ABS @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "0leYv1TdNe38wFpf",
+	"instantiation": "true",
 	"nozzle_temperature": [
 		"250"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "BvoaoxjqBQLvupeM",
 	"name": "Bambu ABS @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "BvoaoxjqBQLvupeM",
+	"instantiation": "true",
 	"nozzle_temperature": [
 		"250"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -99,4 +99,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFG99",
 	"name": "Bambu PETG@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFG99",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -99,4 +99,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "DR6lPjo6HXfJPRev",
 	"name": "Bambu PETG @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "DR6lPjo6HXfJPRev",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"1"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "abyo9tUNfJ41WD2x",
 	"name": "Bambu PETG @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "abyo9tUNfJ41WD2x",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.056"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "cG6FXCNr8n34Asel",
 	"name": "Bambu PETG @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "cG6FXCNr8n34Asel",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.04"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "3Opgt1lYHnCWi4G6",
 	"name": "Bambu PETG @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "3Opgt1lYHnCWi4G6",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.04"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
 	"name": "Bambu PLA@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFL99",
+	"instantiation": "false",
 	"filament_adhesiveness_category": [
 		"100"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "WIoSfzFsVr63PIJn",
 	"name": "Bambu PLA @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "WIoSfzFsVr63PIJn",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"2"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "6R2VF4VRx4OsEAIr",
 	"name": "Bambu PLA @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "6R2VF4VRx4OsEAIr",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.034"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "4nf4gNkkvFnDbzRa",
 	"name": "Bambu PLA @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "4nf4gNkkvFnDbzRa",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.016"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Bambu
+++ b/resources/profiles/Qidi/filament/Q2/Bambu
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "CHcUut3zMsRJAIcx",
 	"name": "Bambu PLA @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Bambu PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "CHcUut3zMsRJAIcx",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.008"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -105,4 +105,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_11",
 	"name": "Generic ABS@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_11",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -105,4 +105,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "fcId8eFG20nodipB",
 	"name": "Generic ABS @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "fcId8eFG20nodipB",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"2"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "nCmyUKILQpR1nypd",
 	"name": "Generic ABS @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "nCmyUKILQpR1nypd",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.03"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "7wsHMKJwQfUfZ3za",
 	"name": "Generic ABS @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "7wsHMKJwQfUfZ3za",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"24.5"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "XLORH5X2VLIxTozv",
 	"name": "Generic ABS @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "XLORH5X2VLIxTozv",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"24.5"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_23",
 	"name": "Generic PC@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_23",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"65"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "khy9tY2jZWHSlIYt",
 	"name": "Generic PC @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PC@Q2C-Series",
+	"from": "system",
+	"setting_id": "khy9tY2jZWHSlIYt",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.94"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "Wcm3rVsaUpou9xRq",
 	"name": "Generic PC @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PC@Q2C-Series",
+	"from": "system",
+	"setting_id": "Wcm3rVsaUpou9xRq",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "8pHle7WRU4FL2qfo",
 	"name": "Generic PC @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PC@Q2C-Series",
+	"from": "system",
+	"setting_id": "8pHle7WRU4FL2qfo",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "ymIxEf9ioip57TML",
 	"name": "Generic PC @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PC@Q2C-Series",
+	"from": "system",
+	"setting_id": "ymIxEf9ioip57TML",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -102,4 +102,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_41",
 	"name": "Generic PETG@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_41",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -102,4 +102,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "IcynzuX5ojXgX2dk",
 	"name": "Generic PETG @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "IcynzuX5ojXgX2dk",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"1"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "7QauCi8rhighWkri",
 	"name": "Generic PETG @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "7QauCi8rhighWkri",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.056"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "AM1y4FYs7fv4WTTo",
 	"name": "Generic PETG @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "AM1y4FYs7fv4WTTo",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.04"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "b3TpL9kGWf1wSydw",
 	"name": "Generic PETG @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "b3TpL9kGWf1wSydw",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.04"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_1",
 	"name": "Generic PLA@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_1",
+	"instantiation": "false",
 	"additional_cooling_fan_speed": [
 		"100"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "CWSMY19Jhd6LzFUN",
 	"name": "Generic PLA @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "CWSMY19Jhd6LzFUN",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"2"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "kraVpglrBGD9sQyx",
 	"name": "Generic PLA @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "kraVpglrBGD9sQyx",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.034"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "0DL2rwUIpvOFPKE0",
 	"name": "Generic PLA @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "0DL2rwUIpvOFPKE0",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.016"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "wtOTxeDyt3j7HsQD",
 	"name": "Generic PLA @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA@Q2C-Series",
+	"from": "system",
+	"setting_id": "wtOTxeDyt3j7HsQD",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.008"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_4",
 	"name": "Generic PLA Silk@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_4",
+	"instantiation": "false",
 	"additional_cooling_fan_speed": [
 		"100"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "tsr5C6eghwRIitda",
 	"name": "Generic PLA Silk @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA Silk@Q2C-Series",
+	"from": "system",
+	"setting_id": "tsr5C6eghwRIitda",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Qidi Q2C 0.4 nozzle"
 	]
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "5V4coBYC2JEZQSbX",
 	"name": "Generic PLA Silk @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA Silk@Q2C-Series",
+	"from": "system",
+	"setting_id": "5V4coBYC2JEZQSbX",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.014"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
 	"name": "Generic PLA+@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFL99",
+	"instantiation": "false",
 	"additional_cooling_fan_speed": [
 		"100"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "cP5qtEGISpluvrXW",
 	"name": "Generic PLA+ @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA+@Q2C-Series",
+	"from": "system",
+	"setting_id": "cP5qtEGISpluvrXW",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"2"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "INOTrdxOY3ewHs3Z",
 	"name": "Generic PLA+ @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA+@Q2C-Series",
+	"from": "system",
+	"setting_id": "INOTrdxOY3ewHs3Z",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.034"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "QWeloGY9T9GkaFK1",
 	"name": "Generic PLA+ @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA+@Q2C-Series",
+	"from": "system",
+	"setting_id": "QWeloGY9T9GkaFK1",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.016"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "C2oqTFXtdd2clnM3",
 	"name": "Generic PLA+ @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic PLA+@Q2C-Series",
+	"from": "system",
+	"setting_id": "C2oqTFXtdd2clnM3",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.008"
 	],
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -78,4 +78,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"30"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "QD_2_0_50",
 	"name": "Generic TPU 95A@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "QD_2_0_50",
+	"instantiation": "false",
 	"filament_adhesiveness_category": [
 		"600"
 	],
@@ -78,4 +78,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"30"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "HeDaMTs4C6suBJvO",
 	"name": "Generic TPU 95A @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic TPU 95A@Q2C-Series",
+	"from": "system",
+	"setting_id": "HeDaMTs4C6suBJvO",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Qidi Q2C 0.4 nozzle"
 	]
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "TOHG37PMxN9MzVub",
 	"name": "Generic TPU 95A @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic TPU 95A@Q2C-Series",
+	"from": "system",
+	"setting_id": "TOHG37PMxN9MzVub",
+	"instantiation": "true",
 	"compatible_printers": [
 		"Qidi Q2C 0.6 nozzle"
 	]
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "HqURiXvBLRyvLAxP",
 	"name": "Generic TPU 95A @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "Generic TPU 95A@Q2C-Series",
+	"from": "system",
+	"setting_id": "HqURiXvBLRyvLAxP",
+	"instantiation": "true",
 	"nozzle_temperature": [
 		"220"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -102,4 +102,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
 	"name": "HATCHBOX ABS@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFB99",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -99,4 +99,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"80"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "UesqbiCMHRmklDRk",
 	"name": "HATCHBOX ABS @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "UesqbiCMHRmklDRk",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"2"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "mEWH2YlONmNpempZ",
 	"name": "HATCHBOX ABS @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "mEWH2YlONmNpempZ",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.03"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "khy95fONrq7reiSC",
 	"name": "HATCHBOX ABS @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "khy95fONrq7reiSC",
+	"instantiation": "true",
 	"nozzle_temperature": [
 		"250"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "sHLcYLMcJTimp3ru",
 	"name": "HATCHBOX ABS @Qidi Q2C 0.8 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX ABS@Q2C-Series",
+	"from": "system",
+	"setting_id": "sHLcYLMcJTimp3ru",
+	"instantiation": "true",
 	"nozzle_temperature": [
 		"250"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -99,4 +99,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"filament_id": "GFG99",
 	"name": "HATCHBOX PETG@Q2C-Series",
-	"from": "system",
-	"instantiation": "false",
 	"inherits": "fdm_filament_q_common",
+	"from": "system",
+	"filament_id": "GFG99",
+	"instantiation": "false",
 	"box_temperature_range_high": [
 		"45"
 	],
@@ -99,4 +99,4 @@
 	"textured_cool_plate_temp_initial_layer": [
 		"60"
 	]
-}
+}
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "bZMXQWqTu8l3MYJi",
 	"name": "HATCHBOX PETG @Qidi Q2C 0.2 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "bZMXQWqTu8l3MYJi",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"1"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "DekQbcVeKQg9v5Zr",
 	"name": "HATCHBOX PETG @Qidi Q2C 0.4 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "DekQbcVeKQg9v5Zr",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.056"
 	],
--- a/resources/profiles/Qidi/filament/Q2/HATCHBOX
+++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX
@@ -1,10 +1,10 @@
 {
 	"type": "filament",
-	"setting_id": "zVhQ76dkj0h0CQYk",
 	"name": "HATCHBOX PETG @Qidi Q2C 0.6 nozzle",
-	"from": "system",
-	"instantiation": "true",
 	"inherits": "HATCHBOX PETG@Q2C-Series",
+	"from": "system",
+	"setting_id": "zVhQ76dkj0h0CQYk",
+	"instantiation": "true",
 	"pressure_advance": [
 		"0.04"
 	],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	5d85a9c9d5	Bump actions/cache from 5 to 6 Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-07-01 16:25:05 +00:00
SoftFever	395e070a0e	fix build errors	2026-07-01 23:51:33 +08:00
SoftFever	895488048c	Fix issue that Orca keeps asking for re-install Bambu network plugin (#14511 ) # Description There is a bug that if user used to use legacy plugin, the `NetworkAgent::use_legacy_network` will not be properly reset after user install a newer plugin version through the plugin update dialog (ie, not from selecting a plugin version from Preference screen). And in that case Orca will download the legacy plugin but instead installing it with a newer version suffix. So on next start up Orca can't find the plugin because it tries to load using legacy version suffix instead. This PR fixes it by getting rid of that error-prone static variable, instead it always use the version number directly. Fix #14373 Fix #14441 # Screenshots/Recordings/Graphs <!-- > Please attach relevant screenshots to showcase the UI changes. > Please attach images that can help explain the changes. --> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. --> <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)	2026-07-01 23:21:09 +08:00
SoftFever	ff556f2867	fix: treat renamed printer presets as compatible aliases (#14504 ) # Description Fixes user filament presets that reference an old printer preset name in `compatible_printers`, even when the current system printer preset correctly declares that old name in `renamed_from`. ## Core Issue `PresetCollection::find_preset()` was updated to resolve `renamed_from`, but this specific failure does not go through `find_preset()`. For root user filament presets with empty `inherits`, Orca infers `compatible_printers` from the filament name suffix after `@`. For example: ```json "ELEGOO PLA Base @Elegoo Neptune 4 Pro (0.4 nozzle)" ``` loads with: ```json "compatible_printers": ["Elegoo Neptune 4 Pro (0.4 nozzle)"] ``` The current system printer preset is named: ```text Elegoo Neptune 4 Pro 0.4 nozzle ``` and has: ```json "renamed_from": "Elegoo Neptune 4 Pro (0.4 nozzle)" ``` However, filament compatibility was doing a direct string comparison against the active printer name. Since that compatibility path does not call `find_preset()`, the `renamed_from` mapping was never considered. ## Fix Teach printer compatibility checks to treat `active_printer.preset.renamed_from` entries as aliases of the active printer name. This preserves existing user preset JSON and avoids rewriting `compatible_printers`, while allowing old printer suffixes to remain compatible with renamed system printer presets. ## Tests <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)	2026-07-01 21:56:31 +08:00
SoftFever	81546a1b56	Merge branch 'main' into fix/renamed-printer-filament-compat	2026-07-01 21:56:22 +08:00
SoftFever	ec954696b4	fix qidi profiles	2026-07-01 21:55:27 +08:00
SoftFever	f516f47c8e	add profile validator checks	2026-07-01 21:55:19 +08:00
Noisyfox	6b886b04f2	Don't keep a separate `use_legacy_network` which is error-prone. Always infer from installed plugin version. (OrcaSlicer/OrcaSlicer#14441 )	2026-07-01 21:17:11 +08:00
Noisyfox	ac79886c5c	`NetworkAgent::use_legacy_network` is only meant to be an intention of whether user wants to use legacy plugin or not, anything that actually interact with the plugin should use the loaded plugin version instead.	2026-07-01 21:03:53 +08:00
SoftFever	57297d5ab1	keep harmless sla normalize	2026-07-01 17:46:53 +08:00
yw4z	49fe64cb07	Fix: Filament section not foldable on launch for toolchanger / idex printers (#14406 ) * init * Update Plater.cpp	2026-07-01 12:21:40 +03:00
KrishManan	8d84204aeb	Add startup progress bar to loading screen (#14155 ) * Add startup progress bar to splash screen * Move progress bar down and remove percentages * Cleaned up changes * Update GUI_App.cpp --------- Co-authored-by: yw4z <ywsyildiz@gmail.com>	2026-07-01 11:45:25 +03:00
SoftFever	9af07685fd	revert changes in Preset.cpp	2026-07-01 15:25:54 +08:00
SoftFever	e39be23d6d	fix compatible_prints/printers on load instead	2026-07-01 15:25:43 +08:00
Ian Chua	8ba9630e53	fix	2026-07-01 13:00:18 +08:00
Ian Chua	1a89c18ff2	fix: treat renamed printer presets as compatible aliases	2026-07-01 12:58:17 +08:00