Save where the panel was left, and recover a texture the archive lacks

The project carried the layer stack but not the user's place in it: a reopened project landed on slot 0 in Standard, whatever they had been editing. The active layer and Standard/Pro now live on the volume, next to the rest of its options, and come back with it. Docked/undocked goes to the application config instead - it describes the user's window, not the model, so opening someone else's project must not move their panel. A layer whose image_data was empty at save time was written with no texture and came back with none. It now falls back to the file the layer came from, which the importer put in the user's own texture library, so a project reopened on the same machine keeps its pixels. The texture is always stored as .png: the importer converts whatever the user picked, so the extension was being taken from a name that no longer described the bytes. Also adds v2_flip_edges to the cereal field list, which the undo stack was silently dropping.
Fix the build and clang-tidy failures in the persistence change
2026-10-10 01:01:57 +00:00 · 2026-10-09 09:35:35 +02:00 · 2026-10-09 09:05:42 +02:00 · 2026-10-09 09:03:51 +02:00 · 2026-10-09 12:15:16 +08:00 · 2026-10-05 08:36:22 +02:00
205 changed files with 1669 additions and 14401 deletions
@@ -5,6 +5,7 @@ on:
    branches:
     - main
     - release/*
+     - belt-printer
    paths:
     - 'deps/**'
     - 'src/**'
@@ -261,6 +262,9 @@ jobs:
      date:
      ver:
      ver_pure:
+      # Belt-printer nightlies share the main nightly release but carry a `_belt`
+      # suffix so they never overwrite the main assets.
+      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
    steps:
    - name: "Remove unneeded stuff to free disk space"
      run:
@@ -435,13 +439,13 @@ jobs:
        name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
        path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
    - name: Deploy Flatpak to nightly release
-      if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main'
+      if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer')
      uses: WebFreak001/deploy-nightly@v3.2.0
      with:
        upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
        release_id: 137995723
        asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
+        asset_name: OrcaSlicer-Linux-flatpak_nightly${{ env.nightly_suffix }}_${{ 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
    # The asset is /app (the exes link it at runtime) plus the build tree
@@ -33,6 +33,11 @@ jobs:
      ubuntu-ver: '2404'
      ubuntu-ver-str: '_Ubuntu2404'
      ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
+      # Branches whose builds are published to the nightly release. The
+      # belt-printer branch ships alongside main but its assets carry a `_belt`
+      # suffix (nightly_suffix) so they never overwrite the main nightly assets.
+      deploy_nightly: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' }}
+      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}

    steps:
      - name: Checkout
@@ -255,7 +260,7 @@ jobs:

 # 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/')) && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
        timeout-minutes: 30
        working-directory: ${{ github.workspace }}
        env:
@@ -343,7 +348,7 @@ jobs:
          fi

      - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/belt-printer' && runner.os == 'macOS' && inputs.macos-combine-only
        working-directory: ${{ github.workspace }}
        run: |
          # Load the `retry` helper (retries flaky commands such as `hdiutil create`).
@@ -389,13 +394,13 @@ jobs:
          if-no-files-found: ignore

      - name: Deploy Mac release
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'macOS' && inputs.macos-combine-only && !vars.SELF_HOSTED
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
          release_id: 137995723
          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_universal_nightly.dmg
+          asset_name: OrcaSlicer_Mac_universal_nightly${{ env.nightly_suffix }}.dmg
          asset_content_type: application/octet-stream
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

@@ -538,24 +543,24 @@ jobs:
          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' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
          release_id: 137995723
          asset_path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}_portable.zip
-          asset_name: OrcaSlicer_Windows${{ env.ARCH_SUFFIX }}_nightly_portable.zip
+          asset_name: OrcaSlicer_Windows${{ env.ARCH_SUFFIX }}_nightly${{ env.nightly_suffix }}_portable.zip
          asset_content_type: application/x-zip-compressed
          max_releases: 1

      - name: Deploy Windows release installer
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && runner.os == 'Windows' && !vars.SELF_HOSTED
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && env.deploy_nightly == 'true' && runner.os == 'Windows' && !vars.SELF_HOSTED
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
          release_id: 137995723
          asset_path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/OrcaSlicer_Windows_Installer_${{ env.ver }}${{ env.ARCH_SUFFIX }}.exe
-          asset_name: OrcaSlicer_Windows_Installer${{ env.ARCH_SUFFIX }}_nightly.exe
+          asset_name: OrcaSlicer_Windows_Installer${{ env.ARCH_SUFFIX }}_nightly${{ env.nightly_suffix }}.exe
          asset_content_type: application/x-msdownload
          max_releases: 1

@@ -696,13 +701,13 @@ jobs:
          path: './build/src/dev-utils/Release/generate_system_cache'

      - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && env.deploy_nightly == 'true' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
          release_id: 137995723
          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly.AppImage
+          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly${{ env.nightly_suffix }}.AppImage
          asset_content_type: application/octet-stream
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
      - name: Deploy Ubuntu release
@@ -74,26 +74,12 @@ jobs:
          set +e
          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_system.log
          exit ${PIPESTATUS[0]}
-      # The validator above is the nightly build of main, so it cannot slice profiles that use
-      # settings a PR adds to the engine: it reports their placeholders as undefined. A PR that
-      # changes src/ also runs Build all, whose Slice check runs this same sweep with the
-      # validator built from the PR, so the sweep below only runs for the other PRs.
-      - name: Detect engine changes
-        id: engine_changes
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          base=${{ github.event.pull_request.base.sha }}
-          if git fetch --no-tags --depth=1 origin "$base" && ! git diff --quiet "$base" HEAD -- src/; then
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-            echo "::notice::This PR changes src/, so Build all's Slice check slices the profiles with the PR-built validator."
-          fi
      # Slice a two-colour cube through every printer, and through every system process/filament whose
      # templates no printer's own slice reaches, so every custom g-code and filename_format shipped is
      # expanded (names in {if} branches not taken included) - catches undefined-placeholder /
      # invalid-flow bugs the static checks above cannot see.
      - name: validate slice (expand custom g-code)
        id: validate_slice
-        if: ${{ steps.engine_changes.outputs.changed != 'true' }}
        continue-on-error: true
        run: |
          set +e
@@ -68,8 +68,6 @@ If you come across any of these in search results, please <b>report them</b> as
  Regular updates fueled by continuous community contributions.
 - **Wide Printer Compatibility**  
  Supports a broad range of printers: Bambu Lab, Prusa, Creality, Voron, and more.
- **[Belt Printer Support](https://www.orcaslicer.com/wiki/belt_printing)**  
-  Slice for belt / conveyor (infinite-Z) printers, with belt-aware supports and a tilted-bed preview. Contributed by [Joseph Robertson (@HarrierPigeon)](https://github.com/HarrierPigeon).
 - Additional features can be found in the [change notes](https://github.com/OrcaSlicer/OrcaSlicer/releases/).

 # Wiki
@@ -91,6 +89,17 @@ Visit our GitHub Releases page for the latest stable version of OrcaSlicer, reco
 🌙 **[Download the Latest Nightly Build](https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds)**  
 Explore the latest developments in OrcaSlicer with our nightly builds. Feedback on these versions is highly appreciated.

+### Belt Printer Builds
+
+The [nightly release](https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds) ships **two parallel builds**: the standard build and a belt-printer build. Both are attached to the same release — tell them apart by the filename suffix:
+
+- **Standard** — no suffix (e.g. `OrcaSlicer_Windows_Installer_x64_nightly.exe`)
+- **Belt** — `_belt` suffix (e.g. `OrcaSlicer_Windows_Installer_x64_nightly_belt.exe`)
+
+The `_belt` builds add **experimental support for belt / conveyor (infinite-Z) printers**, where the model is sliced against a tilted belt surface instead of a flat horizontal bed. They include ready-to-use belt printer profiles, the full belt slicing pipeline (mesh rotation and G-code transforms), belt-aware support generation, and a tilted-bed preview.
+
+> ⚠️ Belt printer support is under active development and is **not yet merged into `main`** — it currently ships only in these parallel `_belt` builds, produced from the [`belt-printer`](https://github.com/OrcaSlicer/OrcaSlicer/tree/belt-printer) branch. See tracking PR [#14394](https://github.com/OrcaSlicer/OrcaSlicer/pull/14394) and the original documentation in [#12998](https://github.com/OrcaSlicer/OrcaSlicer/pull/12998).
+
 # How to install

 ## Windows
@@ -88,18 +88,6 @@ struct NfpPConfig {
     */
    bool explore_holes = false;

-    /**
-     * @brief Keep the final pile on the bin.
-     *
-     * The final alignment centres the pile on the alignment target. A target
-     * near an edge (a belt printer starts its parts at the leading end of the
-     * belt) would push part of a pile that is larger than the room around that
-     * point off the bed; with this set the pile stops at the edge instead, and a
-     * pile that does not fit along an axis is centred on it. Off by default, so
-     * the alignment of every other printer is unchanged.
-     */
-    bool clamp_to_bin = false;
-
    /**
     * @brief If true, use all CPUs available. Run on a single core otherwise.
     */
@@ -1123,24 +1111,7 @@ private:
        default: ; // DONT_ALIGN
        }

-        auto d = cb - ci;
-
-        // Keep the pile on the bin (see Config::clamp_to_bin). The items' boxes carry
-        // their inflation, which is the margin left at the edge.
-        if (config_.clamp_to_bin) {
-            auto on_bin = [](Coord lo, Coord hi, Coord bin_lo, Coord bin_hi, Coord shift) {
-                if (hi - lo >= bin_hi - bin_lo)
-                    return (bin_lo + bin_hi) / 2 - (lo + hi) / 2;
-                if (lo + shift < bin_lo)
-                    shift = bin_lo - lo;
-                if (hi + shift > bin_hi)
-                    shift = bin_hi - hi;
-                return shift;
-            };
-            setX(d, on_bin(getX(bb.minCorner()), getX(bb.maxCorner()), getX(bbin.minCorner()), getX(bbin.maxCorner()), getX(d)));
-            setY(d, on_bin(getY(bb.minCorner()), getY(bb.maxCorner()), getY(bbin.minCorner()), getY(bbin.maxCorner()), getY(d)));
-            cb = ci + d;
-        }
+        auto d = cb - ci;       

        // BBS make sure the item won't clash with excluded regions
        // do we have wipe tower after arranging?
@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-"""Belt temperature-tower asset generator (discrete-provini design).
-
-A vertical temperature tower cannot be sliced on a belt printer, so lay a row of
-DISCRETE provini (one per temperature) along the belt (designed Y) with a fixed
-surface gap. Each provino is the chevron+arc unit (belt_temp_provino_unit.stl,
-keel-first); its temperature is ENGRAVED upright into the 50 mm face — a raised
-number would be an unsupported overhang on the belt. The C++ calib_temp belt branch
-(Plater.cpp) injects one M104 per zone 70 layers INTO provino i:
-  print_z[i] = i * PITCH * cos(theta) + 70 * layer_height   (theta = 45)
-inside the body, not in the empty inter-provino gap (which has no sliced layers for
-the event to attach to). PITCH below is the shared geometry contract with that code —
-keep them in sync.
-
-Generates one STL per filament temp range used by Temp_Calibration_Dlg.
-"""
-import numpy as np, trimesh, os
-from matplotlib.textpath import TextPath
-from matplotlib.font_manager import FontProperties
-from shapely.geometry import Polygon as ShPoly
-from shapely.ops import unary_union
-
-HERE = os.path.dirname(os.path.abspath(__file__))
-UNIT = os.path.join(HERE, 'belt_temp_provino_unit.stl')   # single provino, keel-first
-SURF_GAP = 25.0            # surface-to-surface gap between provini (mm) — user spec
-TEXT_H = 9.0
-TEXT_DEPTH = 0.8           # engraving depth (numbers are CUT into the face, not raised:
-                          # a raised number is an unsupported Y-overhang on the belt)
-TEXT_OVERSHOOT = 0.6       # extra height poking out of the face for a clean boolean cut
-
-# Temperature ranges (start, end) per filament family, 5 C step. File name encodes them.
-RANGES = [(230,190),(270,230),(250,230),(280,240),(240,210),(320,280)]
-
-unit = trimesh.load(UNIT)
-dY = unit.bounds[1,1] - unit.bounds[0,1]
-PITCH = dY + SURF_GAP                       # designed-Y pitch == C++ contract constant
-print(f"unit dY={dY:.2f}  PITCH={PITCH:.3f}  (C++ contract: print_z[i]=i*{PITCH:.3f}*cos45)")
-
-# 50 mm face normal (0,-1,1)/sqrt2 ; UPRIGHT basis u=+X det(+1) (verified non-mirrored)
-n = np.array([0,-1,1.])/np.sqrt(2)
-u = np.array([1,0,0.]); v = np.array([0,1,1.])/np.sqrt(2)
-R = np.column_stack([u,v,n])
-fn = unit.face_normals; fc = unit.triangles_center; fa = unit.area_faces
-sel = (fn@n) > 0.9
-face_c = (fc[sel]*fa[sel,None]).sum(0)/fa[sel].sum()
-
-def text_mesh(s):
-    tp = TextPath((0,0), s, size=TEXT_H, prop=FontProperties(family='DejaVu Sans'))
-    rings = [ShPoly(p) for p in tp.to_polygons() if len(p)>=3]
-    rings.sort(key=lambda r:r.area, reverse=True)
-    used=[False]*len(rings); parts=[]
-    for i,o in enumerate(rings):
-        if used[i]: continue
-        holes=[]
-        for j in range(i+1,len(rings)):
-            if not used[j] and o.contains(rings[j]): holes.append(rings[j].exterior.coords); used[j]=True
-        parts.append(ShPoly(o.exterior.coords,holes)); used[i]=True
-    poly = unary_union(parts)
-    geoms = list(poly.geoms) if poly.geom_type=='MultiPolygon' else [poly]
-    m = trimesh.util.concatenate([trimesh.creation.extrude_polygon(g,height=TEXT_DEPTH+TEXT_OVERSHOOT) for g in geoms])
-    c = m.bounds.mean(axis=0); m.apply_translation([-c[0],-c[1],0]); return m
-
-for t_start, t_end in RANGES:
-    temps = list(range(t_start, t_end-1, -5))
-    parts=[]
-    for i,T in enumerate(temps):
-        c = unit.copy(); c.apply_translation([0, i*PITCH, 0])
-        t = text_mesh(str(T)); M=np.eye(4); M[:3,:3]=R; t.apply_transform(M)
-        # place the text spanning from TEXT_DEPTH inside the face to TEXT_OVERSHOOT outside,
-        # then CUT it out of the provino (engrave) — no raised material, no Y-overhang.
-        t.apply_translation(face_c - n*TEXT_DEPTH + np.array([0,i*PITCH,0]))
-        c = trimesh.boolean.difference([c, t], engine='manifold')
-        parts.append(c)
-    asset = trimesh.util.concatenate(parts)
-    out = os.path.join(HERE, f"belt_temp_tower_{t_start}_{t_end}.stl")
-    asset.export(out)
-    dims = np.round(asset.bounds[1]-asset.bounds[0],1)
-    wt = all(p.is_watertight for p in parts)
-    print(f"  {t_start}->{t_end}: {len(temps)} zones  bbox={dims}  watertight={wt}  -> {os.path.basename(out)}")
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M5.5,14.5c-1.105,0-2-3.686-2-7s.895-7,2-7" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.67" y1="4.67" x2="14.33" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.33" y1="4.67" x2="8.67" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><path d="M3.5,13.7c-.294.511-.636.8-1,.8-1.1,0-2-3.686-2-7s.9-7,2-7c.365,0,.707.293,1,.805" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.727,4.5c.334-2.208,1-4,1.773-4,.354,0,.686.378.974,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M9.474,13.5c-.288.622-.62,1-.974,1-.77,0-1.439-1.792-1.773-4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
@@ -1,13 +1,9 @@
 {
 	"name": "Custom Printer",
-	"version": "02.04.00.08",
+	"version": "02.04.00.07",
 	"force_update": "0",
 	"description": "My configurations",
 	"machine_model_list": [
-		{
-			"name": "Generic Belt Printer",
-			"sub_path": "machine/MyBeltPrinter.json"
-		},
 		{
 			"name": "Generic Klipper Printer",
 			"sub_path": "machine/MyKlipper.json"
@@ -54,10 +50,6 @@
 			"name": "0.08mm Extra Fine @MyKlipper",
 			"sub_path": "process/0.08mm Extra Fine @MyKlipper.json"
 		},
-		{
-			"name": "0.12mm Fine @MyBeltPrinter",
-			"sub_path": "process/0.12mm Fine @MyBeltPrinter.json"
-		},
 		{
 			"name": "0.12mm Fine @MyKlipper",
 			"sub_path": "process/0.12mm Fine @MyKlipper.json"
@@ -70,10 +62,6 @@
 			"name": "0.16mm Optimal @MyKlipper",
 			"sub_path": "process/0.16mm Optimal @MyKlipper.json"
 		},
-		{
-			"name": "0.20mm Standard @MyBeltPrinter",
-			"sub_path": "process/0.20mm Standard @MyBeltPrinter.json"
-		},
 		{
 			"name": "0.20mm Standard @MyKlipper",
 			"sub_path": "process/0.20mm Standard @MyKlipper.json"
@@ -274,10 +262,6 @@
 			"name": "MyKlipper 0.8 nozzle",
 			"sub_path": "machine/MyKlipper 0.8 nozzle.json"
 		},
-		{
-			"name": "fdm_belt_common",
-			"sub_path": "machine/fdm_belt_common.json"
-		},
 		{
 			"name": "fdm_toolchanger_common",
 			"sub_path": "machine/fdm_toolchanger_common.json"
@@ -290,22 +274,6 @@
 			"name": "MyRRF 0.4 nozzle",
 			"sub_path": "machine/MyRRF 0.4 nozzle.json"
 		},
-		{
-			"name": "MyBeltPrinter 0.2 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.2 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.4 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.4 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.6 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.6 nozzle.json"
-		},
-		{
-			"name": "MyBeltPrinter 0.8 nozzle",
-			"sub_path": "machine/MyBeltPrinter 0.8 nozzle.json"
-		},
 		{
 			"name": "MyToolChanger 0.2 nozzle",
 			"sub_path": "machine/MyToolChanger 0.2 nozzle.json"
@@ -1,27 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.2 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "3w1uyJdmm14QhDnH",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"default_print_profile": "0.12mm Fine @MyBeltPrinter",
-	"nozzle_diameter": [
-		"0.2"
-	],
-	"max_layer_height": [
-		"0.16"
-	],
-	"min_layer_height": [
-		"0.04"
-	],
-	"printer_variant": "0.2",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}
@@ -1,20 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.4 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "6nRHUtvJOUffocbu",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"printer_variant": "0.4",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}
@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.6 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "K0m9HbUNwKT4UCJV",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.6"
-	],
-	"max_layer_height": [
-		"0.4"
-	],
-	"min_layer_height": [
-		"0.12"
-	],
-	"printer_variant": "0.6",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}
@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.8 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "rHAweDz4eNwttPNA",
-	"instantiation": "true",
-	"printer_model": "Generic Belt Printer",
-	"nozzle_diameter": [
-		"0.8"
-	],
-	"max_layer_height": [
-		"0.6"
-	],
-	"min_layer_height": [
-		"0.2"
-	],
-	"printer_variant": "0.8",
-	"printable_area": [
-		"0x0",
-		"350x0",
-		"350x350",
-		"0x350"
-	],
-	"printable_height": "300"
-}
@@ -1,12 +0,0 @@
-{
-	"type": "machine_model",
-	"name": "Generic Belt Printer",
-	"model_id": "my_belt_01",
-	"nozzle_diameter": "0.4;0.2;0.6;0.8",
-	"machine_tech": "FFF",
-	"family": "MyPrinter",
-	"bed_model": "Custom_350_bed.stl",
-	"bed_texture": "orcaslicer_bed_texture.svg",
-	"hotend_model": "",
-	"default_materials": "Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
-}
@@ -1,95 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_belt_common",
-	"inherits": "fdm_klipper_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"single_extruder_multi_material": "0",
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @MyBeltPrinter",
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"long_retractions_when_cut": [
-		"0"
-	],
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"retract_lift_above": [
-		"0"
-	],
-	"retract_lift_below": [
-		"0"
-	],
-	"retract_lift_enforce": [
-		"All Surfaces"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_distances_when_cut": [
-		"18"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"travel_slope": [
-		"3"
-	],
-	"wipe": [
-		"1"
-	],
-	"wipe_distance": [
-		"1"
-	],
-	"z_hop": [
-		"0"
-	],
-	"z_hop_types": [
-		"Normal Lift"
-	],
-	"gcode_remap_x": "rev_x",
-	"gcode_remap_y": "pos_z",
-	"gcode_remap_z": "pos_y",
-	"belt_printer": "1",
-	"belt_slice_rotation": "x",
-	"belt_slice_rotation_angle": "45",
-	"build_plate_tilt_x": "45",
-	"purge_in_prime_tower": "0",
-	"scan_first_layer": "0",
-	"auxiliary_fan": "0"
-}
@@ -1,20 +0,0 @@
-{
-	"type": "process",
-	"name": "0.12mm Fine @MyBeltPrinter",
-	"inherits": "fdm_process_klipper_common",
-	"from": "system",
-	"setting_id": "EugqqdLJ423bgEwN",
-	"instantiation": "true",
-	"layer_height": "0.12",
-	"initial_layer_print_height": "0.12",
-	"bottom_shell_layers": "5",
-	"top_shell_layers": "6",
-	"support_top_z_distance": "0.08",
-	"support_bottom_z_distance": "0.08",
-	"skirt_loops": "0",
-	"skirt_distance": "0",
-	"compatible_printers": [
-		"MyBeltPrinter 0.2 nozzle",
-		"MyBeltPrinter 0.4 nozzle"
-	]
-}
@@ -1,17 +0,0 @@
-{
-	"type": "process",
-	"name": "0.20mm Standard @MyBeltPrinter",
-	"inherits": "fdm_process_klipper_common",
-	"from": "system",
-	"setting_id": "YzCDAgH3uLOM53pF",
-	"instantiation": "true",
-	"layer_height": "0.2",
-	"initial_layer_print_height": "0.2",
-	"skirt_loops": "0",
-	"skirt_distance": "0",
-	"compatible_printers": [
-		"MyBeltPrinter 0.4 nozzle",
-		"MyBeltPrinter 0.6 nozzle",
-		"MyBeltPrinter 0.8 nozzle"
-	]
-}
@@ -1,54 +0,0 @@
-{
-    "name": "IdeaFormer",
-    "version": "02.00.00.06",
-    "force_update": "0",
-    "description": "IdeaFormer belt printer configurations",
-    "machine_model_list": [
-        {
-            "name": "IdeaFormer IR3 V2",
-            "sub_path": "machine/IdeaFormer IR3 V2.json"
-        }
-    ],
-    "process_list": [
-        {
-            "name": "fdm_process_common",
-            "sub_path": "process/fdm_process_common.json"
-        },
-        {
-            "name": "0.20mm Standard @IdeaFormer IR3 V2",
-            "sub_path": "process/0.20mm Standard @IdeaFormer IR3 V2.json"
-        }
-    ],
-    "filament_list": [
-        {
-            "name": "Generic PLA @IdeaFormer IR3 V2",
-            "sub_path": "filament/Generic PLA @IdeaFormer IR3 V2.json"
-        },
-        {
-            "name": "eSUN PLA @IdeaFormer IR3 V2",
-            "sub_path": "filament/eSUN PLA @IdeaFormer IR3 V2.json"
-        },
-        {
-            "name": "Generic PETG @IdeaFormer IR3 V2",
-            "sub_path": "filament/Generic PETG @IdeaFormer IR3 V2.json"
-        }
-    ],
-    "machine_list": [
-        {
-            "name": "fdm_machine_common",
-            "sub_path": "machine/fdm_machine_common.json"
-        },
-        {
-            "name": "fdm_klipper_common",
-            "sub_path": "machine/fdm_klipper_common.json"
-        },
-        {
-            "name": "fdm_belt_common",
-            "sub_path": "machine/fdm_belt_common.json"
-        },
-        {
-            "name": "IdeaFormer IR3 V2 0.4 nozzle",
-            "sub_path": "machine/IdeaFormer IR3 V2 0.4 nozzle.json"
-        }
-    ]
-}
@@ -1,77 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PETG @IdeaFormer IR3 V2",
-	"inherits": "Generic PETG @System",
-	"from": "system",
-	"setting_id": "n4zaXcUUzTqAxq5f",
-	"instantiation": "true",
-	"filament_extruder_variant": [
-		"Direct Drive Standard"
-	],
-	"compatible_printers": [
-		"IdeaFormer IR3 V2 0.4 nozzle"
-	],
-	"filament_type": [
-		"PETG"
-	],
-	"filament_vendor": [
-		"Generic"
-	],
-	"filament_settings_id": [
-		"Generic PETG @IdeaFormer IR3 V2"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_cost": [
-		"25"
-	],
-	"nozzle_temperature": [
-		"240"
-	],
-	"nozzle_temperature_initial_layer": [
-		"245"
-	],
-	"cool_plate_temp": [
-		"80"
-	],
-	"cool_plate_temp_initial_layer": [
-		"80"
-	],
-	"fan_min_speed": [
-		"40"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"overhang_fan_threshold": [
-		"25%"
-	],
-	"overhang_fan_speed": [
-		"80"
-	],
-	"full_fan_speed_layer": [
-		"8"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"slow_down_layer_time": [
-		"4"
-	],
-	"fan_cooling_layer_time": [
-		"100"
-	],
-	"filament_retraction_length": [
-		"2"
-	],
-	"filament_retraction_speed": [
-		"40"
-	],
-	"filament_deretraction_speed": [
-		"40"
-	],
-	"filament_start_gcode": [
-		"; Generic PETG @IdeaFormer IR3 V2 — belt PETG, bed 80C"
-	]
-}
@@ -1,65 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PLA @IdeaFormer IR3 V2",
-	"inherits": "Generic PLA @System",
-	"from": "system",
-	"setting_id": "1xjycsEAFh6KQIhp",
-	"instantiation": "true",
-	"filament_extruder_variant": [
-		"Direct Drive Standard"
-	],
-	"compatible_printers": [
-		"IdeaFormer IR3 V2 0.4 nozzle"
-	],
-	"filament_type": [
-		"PLA"
-	],
-	"filament_vendor": [
-		"Generic"
-	],
-	"filament_settings_id": [
-		"Generic PLA @IdeaFormer IR3 V2"
-	],
-	"nozzle_temperature": [
-		"215"
-	],
-	"hot_plate_temp": [
-		"75"
-	],
-	"hot_plate_temp_initial_layer": [
-		"75"
-	],
-	"cool_plate_temp": [
-		"75"
-	],
-	"cool_plate_temp_initial_layer": [
-		"75"
-	],
-	"textured_plate_temp": [
-		"75"
-	],
-	"textured_plate_temp_initial_layer": [
-		"75"
-	],
-	"close_fan_the_first_x_layers": [
-		"3"
-	],
-	"full_fan_speed_layer": [
-		"8"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"filament_retraction_length": [
-		"1.5"
-	],
-	"filament_retraction_speed": [
-		"35"
-	],
-	"filament_deretraction_speed": [
-		"30"
-	],
-	"filament_start_gcode": [
-		"; Generic PLA @IdeaFormer IR3 V2 — belt PLA, bed 75C"
-	]
-}
@@ -1,36 +0,0 @@
-{
-	"type": "filament",
-	"name": "eSUN PLA @IdeaFormer IR3 V2",
-	"inherits": "Generic PLA @IdeaFormer IR3 V2",
-	"from": "system",
-	"setting_id": "XqkviBmFHEglXueX",
-	"filament_id": "OFkrxQC4",
-	"instantiation": "true",
-	"compatible_printers": [
-		"IdeaFormer IR3 V2 0.4 nozzle"
-	],
-	"filament_type": [
-		"PLA"
-	],
-	"filament_vendor": [
-		"eSUN"
-	],
-	"filament_settings_id": [
-		"eSUN PLA @IdeaFormer IR3 V2"
-	],
-	"nozzle_temperature_initial_layer": [
-		"200"
-	],
-	"nozzle_temperature": [
-		"200"
-	],
-	"enable_pressure_advance": [
-		"1"
-	],
-	"pressure_advance": [
-		"0.12"
-	],
-	"filament_max_volumetric_speed": [
-		"20"
-	]
-}
@@ -1,98 +0,0 @@
-{
-	"type": "machine",
-	"name": "IdeaFormer IR3 V2 0.4 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "MDQZgwRgg72lmjtu",
-	"instantiation": "true",
-	"printer_model": "IdeaFormer IR3 V2",
-	"printer_variant": "0.4",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"printable_area": [
-		"0x0",
-		"250x0",
-		"250x2000",
-		"0x2000"
-	],
-	"printable_height": "250",
-	"belt_printer_infinite_y": "1",
-	"thumbnails": [
-		"48x48/PNG",
-		"300x300/PNG"
-	],
-	"default_filament_profile": [
-		"Generic PLA @IdeaFormer IR3 V2"
-	],
-	"default_print_profile": "0.20mm Standard @IdeaFormer IR3 V2",
-	"use_relative_e_distances": "1",
-	"machine_max_acceleration_extruding": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_retracting": [
-		"1000",
-		"1000"
-	],
-	"machine_max_acceleration_travel": [
-		"9000",
-		"9000"
-	],
-	"machine_max_acceleration_x": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_y": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_z": [
-		"100",
-		"100"
-	],
-	"machine_max_jerk_x": [
-		"10",
-		"10"
-	],
-	"machine_max_jerk_y": [
-		"10",
-		"10"
-	],
-	"machine_max_jerk_z": [
-		"0.4",
-		"0.4"
-	],
-	"machine_max_speed_e": [
-		"60",
-		"60"
-	],
-	"machine_max_speed_x": [
-		"500",
-		"500"
-	],
-	"machine_max_speed_y": [
-		"500",
-		"500"
-	],
-	"machine_max_speed_z": [
-		"20",
-		"20"
-	],
-	"retraction_length": [
-		"2"
-	],
-	"retraction_speed": [
-		"40"
-	],
-	"deretraction_speed": [
-		"40"
-	],
-	"retract_lift_below": [
-		"300"
-	],
-	"machine_start_gcode": "; === IdeaFormer IR3 V2 Belt Printer Start ===\n; Axes: X=lateral, Y=gantry height (probe), Z=belt\nG90 ; absolute positioning\nM82 ; absolute extruder\nG21 ; millimeters\nG28 ; home all axes\nG1 Y20 F500 ; lift nozzle 20mm from belt\n; Bed + hotend temps come from the active filament profile. Belt PLA requires 75 C bed — use Generic/eSun PLA @IdeaFormer IR3 V2 filament presets to get it automatically.\nM140 S[hot_plate_temp_initial_layer] ; set bed temp\nM104 S[nozzle_temperature_initial_layer] ; hotend temp\nM109 S[nozzle_temperature_initial_layer] ; wait hotend\nM190 S[hot_plate_temp_initial_layer] ; wait bed\n; --- Purge blob ---\nG92 E0 ; zero extruder\nG1 Y.1 ; nozzle 0.1mm above belt\nG1 E15 F1000 ; purge 15mm blob\nG1 Z20 E25 F800 ; belt advance 20mm + extrude\nG1 E23 ; retract 2mm\nG28 Y ; re-probe belt surface\nG1 E25 ; de-retract\n; --- Prime lines (full 250mm bed width) ---\nFMS_on ; filament motion sensor\nG1 X250 E50 F2000 ; prime line 1\nG92 Z0 ; reset belt origin\nG1 Z.4 ; belt advance 0.4mm\nG1 X0 E75 ; prime line 2\nG1 F1000 ; default feedrate\nG92 E0 Z0 ; zero extruder + belt = print origin\n",
-	"machine_end_gcode": "; === IdeaFormer IR3 V2 Belt Printer End ===\nM400 ; wait for moves to finish\nM104 S0 ; heater off\nM140 S0 ; bed off\nG92 E0 ; zero extruder\nG1 E-5 F300 ; retract 5mm\nG4 P5000 ; wait for ooze\nG91 ; relative mode - keep every end move relative on a belt\nG1 Y20 F1000 ; raise gantry 20mm for clearance over the part\nG1 Z676 F3000 ; advance belt one full machine-depth to eject the part and clean the belt\nG90 ; back to absolute\nG28 X ; home X only - NEVER 'G28' all: that homes Z/belt and reverses the whole print back into the gantry\nFMS_off ; filament motion sensor off\nBED_MESH_CLEAR\nM84 ; disable motors\n",
-	"machine_pause_gcode": "PAUSE",
-	"layer_change_gcode": "G92 E0 ; belt: reset extruder at layer change (relative E)"
-}
@@ -1,12 +0,0 @@
-{
-	"type": "machine_model",
-	"name": "IdeaFormer IR3 V2",
-	"model_id": "IdeaFormer_IR3_V2",
-	"nozzle_diameter": "0.4",
-	"machine_tech": "FFF",
-	"family": "IdeaFormer",
-	"bed_model": "",
-	"bed_texture": "",
-	"hotend_model": "",
-	"default_materials": "Generic PLA @IdeaFormer IR3 V2;Generic PETG @IdeaFormer IR3 V2"
-}
@@ -1,98 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_belt_common",
-	"inherits": "fdm_klipper_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"single_extruder_multi_material": "0",
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @IdeaFormer IR3 V2",
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"long_retractions_when_cut": [
-		"0"
-	],
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"retract_lift_above": [
-		"0"
-	],
-	"retract_lift_below": [
-		"0"
-	],
-	"retract_lift_enforce": [
-		"All Surfaces"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_distances_when_cut": [
-		"18"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"travel_slope": [
-		"3"
-	],
-	"wipe": [
-		"1"
-	],
-	"wipe_distance": [
-		"1"
-	],
-	"z_hop": [
-		"0"
-	],
-	"z_hop_types": [
-		"Normal Lift"
-	],
-	"gcode_remap_x": "rev_x",
-	"gcode_remap_y": "pos_z",
-	"gcode_remap_z": "pos_y",
-	"printer_extruder_id": [
-		"1"
-	],
-	"belt_printer": "1",
-	"belt_slice_rotation": "x",
-	"belt_slice_rotation_angle": "45",
-	"build_plate_tilt_x": "45",
-	"purge_in_prime_tower": "0",
-	"scan_first_layer": "0",
-	"auxiliary_fan": "0"
-}
@@ -1,140 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_klipper_common",
-	"inherits": "fdm_machine_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"machine_max_acceleration_e": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_extruding": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_retracting": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_travel": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_x": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_y": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_z": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_e": [
-		"25",
-		"25"
-	],
-	"machine_max_speed_x": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_y": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_z": [
-		"12",
-		"12"
-	],
-	"machine_max_jerk_e": [
-		"2.5",
-		"2.5"
-	],
-	"machine_max_jerk_x": [
-		"9",
-		"9"
-	],
-	"machine_max_jerk_y": [
-		"9",
-		"9"
-	],
-	"machine_max_jerk_z": [
-		"0.2",
-		"0.4"
-	],
-	"machine_min_extruding_rate": [
-		"0",
-		"0"
-	],
-	"machine_min_travel_rate": [
-		"0",
-		"0"
-	],
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"printable_height": "250",
-	"extruder_clearance_radius": "65",
-	"extruder_clearance_height_to_rod": "36",
-	"extruder_clearance_height_to_lid": "140",
-	"printer_settings_id": "",
-	"printer_technology": "FFF",
-	"printer_variant": "0.4",
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"z_hop": [
-		"0.4"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"z_hop_types": "Normal Lift",
-	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
-	"wipe": [
-		"1"
-	],
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @MyKlipper",
-	"bed_exclude_area": [
-		"0x0"
-	],
-	"machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",
-	"machine_end_gcode": "PRINT_END",
-	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-	"machine_pause_gcode": "PAUSE",
-	"scan_first_layer": "0",
-	"nozzle_type": "undefine",
-	"auxiliary_fan": "0"
-}
@@ -1,118 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_machine_common",
-	"from": "system",
-	"instantiation": "false",
-	"printer_technology": "FFF",
-	"deretraction_speed": [
-		"40"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"gcode_flavor": "marlin",
-	"machine_max_acceleration_e": [
-		"5000"
-	],
-	"machine_max_acceleration_extruding": [
-		"10000"
-	],
-	"machine_max_acceleration_retracting": [
-		"1000"
-	],
-	"machine_max_acceleration_x": [
-		"10000"
-	],
-	"machine_max_acceleration_y": [
-		"10000"
-	],
-	"machine_max_acceleration_z": [
-		"500"
-	],
-	"machine_max_speed_e": [
-		"60"
-	],
-	"machine_max_speed_x": [
-		"500"
-	],
-	"machine_max_speed_y": [
-		"500"
-	],
-	"machine_max_speed_z": [
-		"10"
-	],
-	"machine_max_jerk_e": [
-		"5"
-	],
-	"machine_max_jerk_x": [
-		"8"
-	],
-	"machine_max_jerk_y": [
-		"8"
-	],
-	"machine_max_jerk_z": [
-		"0.4"
-	],
-	"machine_min_extruding_rate": [
-		"0"
-	],
-	"machine_min_travel_rate": [
-		"0"
-	],
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"printable_height": "250",
-	"extruder_clearance_radius": "65",
-	"extruder_clearance_height_to_rod": "36",
-	"extruder_clearance_height_to_lid": "140",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"printer_settings_id": "",
-	"printer_variant": "0.4",
-	"retraction_minimum_travel": [
-		"2"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_length": [
-		"1"
-	],
-	"retract_length_toolchange": [
-		"1"
-	],
-	"z_hop": [
-		"0"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retraction_speed": [
-		"60"
-	],
-	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
-	"wipe": [
-		"1"
-	],
-	"default_print_profile": "",
-	"machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
-	"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end",
-	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-	"machine_pause_gcode": "M601"
-}
@@ -1,23 +0,0 @@
-{
-	"type": "process",
-	"name": "0.20mm Standard @IdeaFormer IR3 V2",
-	"inherits": "fdm_process_common",
-	"from": "system",
-	"setting_id": "91atcIwv5728phqX",
-	"instantiation": "true",
-	"layer_height": "0.2",
-	"initial_layer_print_height": "0.2",
-	"initial_layer_line_width": "0.42",
-	"wall_loops": "2",
-	"reduce_infill_retraction": "1",
-	"detect_overhang_wall": "1",
-	"skirt_loops": "0",
-	"skirt_distance": "0",
-	"sparse_infill_pattern": "grid",
-	"sparse_infill_speed": "200",
-	"support_base_pattern": "rectilinear",
-	"support_interface_pattern": "rectilinear",
-	"compatible_printers": [
-		"IdeaFormer IR3 V2 0.4 nozzle"
-	]
-}
@@ -1,106 +0,0 @@
-{
-	"type": "process",
-	"name": "fdm_process_common",
-	"from": "system",
-	"instantiation": "false",
-	"reduce_crossing_wall": "0",
-	"max_travel_detour_distance": "0",
-	"bottom_surface_pattern": "monotonic",
-	"bottom_shell_thickness": "0",
-	"bridge_speed": "50",
-	"brim_width": "5",
-	"brim_object_gap": "0.1",
-	"compatible_printers": [],
-	"compatible_printers_condition": "",
-	"print_sequence": "by layer",
-	"default_acceleration": "1000",
-	"initial_layer_acceleration": "500",
-	"top_surface_acceleration": "1000",
-	"travel_acceleration": "1000",
-	"inner_wall_acceleration": "1000",
-	"outer_wall_acceleration": "700",
-	"bridge_no_support": "0",
-	"draft_shield": "disabled",
-	"elefant_foot_compensation": "0",
-	"enable_arc_fitting": "0",
-	"wall_infill_order": "inner wall/outer wall/infill",
-	"infill_direction": "45",
-	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "crosshatch",
-	"initial_layer_print_height": "0.2",
-	"infill_combination": "0",
-	"infill_wall_overlap": "25%",
-	"interface_shells": "0",
-	"ironing_flow": "10%",
-	"ironing_spacing": "0.15",
-	"ironing_speed": "30",
-	"ironing_type": "no ironing",
-	"reduce_infill_retraction": "1",
-	"filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode",
-	"detect_overhang_wall": "1",
-	"slowdown_for_curled_perimeters": "1",
-	"overhang_1_4_speed": "0",
-	"overhang_2_4_speed": "50",
-	"overhang_3_4_speed": "30",
-	"overhang_4_4_speed": "10",
-	"line_width": "110%",
-	"inner_wall_line_width": "110%",
-	"outer_wall_line_width": "100%",
-	"top_surface_line_width": "93.75%",
-	"sparse_infill_line_width": "110%",
-	"initial_layer_line_width": "120%",
-	"internal_solid_infill_line_width": "120%",
-	"support_line_width": "96%",
-	"wall_loops": "3",
-	"print_settings_id": "",
-	"raft_layers": "0",
-	"seam_position": "aligned",
-	"skirt_distance": "2",
-	"skirt_height": "3",
-	"min_skirt_length": "4",
-	"skirt_loops": "0",
-	"minimum_sparse_infill_area": "15",
-	"spiral_mode": "0",
-	"standby_temperature_delta": "-5",
-	"enable_support": "0",
-	"resolution": "0.012",
-	"support_type": "normal(auto)",
-	"support_on_build_plate_only": "0",
-	"support_top_z_distance": "0.2",
-	"support_bottom_z_distance": "0.2",
-	"support_filament": "0",
-	"support_interface_loop_pattern": "0",
-	"support_interface_filament": "0",
-	"support_interface_top_layers": "2",
-	"support_interface_bottom_layers": "2",
-	"support_interface_spacing": "0.5",
-	"support_interface_speed": "80",
-	"support_base_pattern": "default",
-	"support_base_pattern_spacing": "2.5",
-	"support_speed": "150",
-	"support_threshold_angle": "30",
-	"support_object_xy_distance": "0.35",
-	"tree_support_branch_angle": "30",
-	"tree_support_wall_count": "0",
-	"detect_thin_wall": "0",
-	"top_surface_pattern": "monotonicline",
-	"top_shell_thickness": "0.8",
-	"enable_prime_tower": "1",
-	"wipe_tower_no_sparse_layers": "0",
-	"prime_tower_width": "60",
-	"xy_hole_compensation": "0",
-	"xy_contour_compensation": "0",
-	"layer_height": "0.2",
-	"bottom_shell_layers": "3",
-	"top_shell_layers": "4",
-	"bridge_flow": "1",
-	"initial_layer_speed": "45",
-	"initial_layer_infill_speed": "45",
-	"outer_wall_speed": "45",
-	"inner_wall_speed": "80",
-	"sparse_infill_speed": "150",
-	"internal_solid_infill_speed": "150",
-	"top_surface_speed": "50",
-	"gap_infill_speed": "30",
-	"travel_speed": "200"
-}
@@ -1,54 +0,0 @@
-{
-	"name": "Printcepts",
-	"version": "01.00.00.04",
-	"force_update": "0",
-	"description": "Printcepts belt printer configurations",
-	"machine_model_list": [
-		{
-			"name": "BabyBelt Pro",
-			"sub_path": "machine/BabyBelt Pro.json"
-		}
-	],
-	"process_list": [
-		{
-			"name": "fdm_process_common",
-			"sub_path": "process/fdm_process_common.json"
-		},
-		{
-			"name": "0.20mm Standard @BabyBelt Pro",
-			"sub_path": "process/0.20mm Standard @BabyBelt Pro.json"
-		}
-	],
-	"filament_list": [
-		{
-			"name": "Generic PLA @BabyBelt Pro",
-			"sub_path": "filament/Generic PLA @BabyBelt Pro.json"
-		},
-		{
-			"name": "eSUN PLA @BabyBelt Pro",
-			"sub_path": "filament/eSUN PLA @BabyBelt Pro.json"
-		},
-		{
-			"name": "Generic PETG @BabyBelt Pro",
-			"sub_path": "filament/Generic PETG @BabyBelt Pro.json"
-		}
-	],
-	"machine_list": [
-		{
-			"name": "fdm_machine_common",
-			"sub_path": "machine/fdm_machine_common.json"
-		},
-		{
-			"name": "fdm_klipper_common",
-			"sub_path": "machine/fdm_klipper_common.json"
-		},
-		{
-			"name": "fdm_belt_common",
-			"sub_path": "machine/fdm_belt_common.json"
-		},
-		{
-			"name": "BabyBelt Pro 0.4 nozzle",
-			"sub_path": "machine/BabyBelt Pro 0.4 nozzle.json"
-		}
-	]
-}
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="95.0mm" height="500.0mm" viewBox="0 0 95.0 500.0" preserveAspectRatio="xMidYMid meet">
-  <!-- Printcepts BabyBelt Pro bed texture: 95 x 500 mm belt plate. -->
-  <!-- Transparent plate; green (#195F30) BabyBelt Pro logo centered along X, near the bottom edge. -->
-  <rect x="0" y="0" width="95.0" height="500.0" fill="none"/>
-  <g transform="translate(14.2500,436.3488) scale(0.067538)">
-    <g transform="translate(-11.000000,692.938562) scale(0.100000,-0.100000)"
-fill="#195F30" stroke="none">
-<path d="M1963 5604 l-1423 -1324 0 -2050 0 -2050 443 0 c244 0 741 3 1105 7
-l662 6 0 746 c-1 575 -4 768 -14 841 -47 324 -179 486 -473 581 -40 12 -73 26
-73 30 0 4 32 17 72 29 212 64 333 166 378 320 35 121 38 191 32 868 l-5 662
-629 0 c-395 0 -628 4 -628 10 0 5 635 601 1410 1325 776 724 1410 1318 1410
-1321 0 2 -190 4 -422 3 l-423 0 -1422 -1325z m-334 -2029 c143 -16 174 -96
-173 -446 -2 -411 -24 -458 -224 -462 l-93 -2 -3 450 c-1 248 0 456 3 463 3 9
-18 12 47 8 24 -3 67 -8 97 -11z m-4 -1556 c160 -29 173 -62 182 -469 9 -455
-14 -593 -108 -641 -39 -19 -193 -44 -210 -33 -10 6 -13 1147 -3 1157 6 6 45
-2 139 -14z"/>
-<path d="M3464 5979 c-142 -132 -263 -245 -268 -250 -6 -5 69 -9 190 -9 l199
-1 268 249 267 250 -198 0 -198 0 -260 -241z"/>
-<path d="M3650 5649 c-135 -126 -254 -238 -265 -249 -19 -20 -18 -20 177 -20
-l197 0 228 211 c125 116 246 229 268 250 l40 39 -200 -1 -200 0 -245 -230z"/>
-<path d="M2537 5089 c-101 -24 -204 -105 -251 -197 -96 -190 -19 -420 172
-514 l67 -33 2670 0 2670 0 57 27 c74 34 146 107 184 183 43 88 43 230 0 322
-35 76 -113 153 -193 191 l-58 27 -2640 2 c-1513 0 -2656 -3 -2678 -8z m5063
-77 c-57 -37 -118 -111 -140 -168 -31 -82 -25 -206 12 -279 26 -49 93 -121
-133 -143 15 -8 -640 -11 -2410 -11 l-2430 0 30 21 c200 146 201 425 1 569
-l-39 29 2434 -1 c2263 0 2432 -1 2409 -17z m-4890 -43 c270 -122 185 -526
-109 -522 -257 2 -370 324 -170 485 74 60 194 76 279 37z m5201 -12 c94 -55
-140 -135 140 -242 0 -285 -393 -374 -517 -117 -26 54 -30 162 -9 219 28 74 97
-139 173 164 53 17 166 4 213 -24z"/>
-<path d="M2917 3973 c-4 -174 -7 -550 -7 -835 l0 -518 326 0 326 0 -7 150 -7
-150 110 0 110 0 11 -32 c5 -18 26 -86 46 -150 l36 -118 325 0 c179 0 323 4
-320 9 -3 4 -155 374 -337 822 -182 448 -333 820 -336 827 -4 9 -105 12 -457
-12 l-453 0 -6 -317z m773 -745 c0 -5 -47 -8 -104 -8 l-103 0 -7 92 c-3 50 -6
-202 -5 337 l1 246 109 -330 c60 -181 109 -333 109 -337z"/>
-<path d="M4680 3455 l0 -835 448 0 c693 1 885 16 985 80 99 63 126 132 134
-340 12 327 -44 405 -342 476 -28 7 -27 8 25 19 199 42 255 95 267 248 11 146
-32 285 -110 353 -145 126 -329 153 -1049 154 l-358 0 0 -835z m846 520 c36
-23 44 -54 44 -162 0 -152 -29 -183 -170 -183 l-40 0 0 186 0 187 71 -6 c39
-3 82 -13 95 -22z m4 -625 c33 -18 40 -52 40 -208 0 -200 -9 -214 -143 -228
-l-67 -7 0 233 0 233 74 -6 c41 -3 84 -10 96 -17z"/>
-<path d="M6150 4286 c0 -3 131 -242 290 -531 l290 -526 0 -304 0 -305 385 0
-385 0 0 299 0 299 305 533 305 534 -377 3 c-207 1 -381 -2 -385 -6 -16 -16
-110 -258 -172 -444 l-62 -187 -18 77 c-18 75 -139 450 -171 525 l-15 37 -380
-0 c-209 0 -380 -2 -380 -4z"/>
-<path d="M2910 1355 l0 -1185 830 0 830 0 0 240 0 240 -350 0 -350 0 0 255 0
-255 300 0 300 0 0 230 0 230 -300 0 -300 0 0 220 0 220 320 0 320 0 0 240 0
-240 -800 0 -800 0 0 -1185z"/>
-<path d="M4680 1355 l0 -1185 775 0 775 0 0 240 0 240 -295 0 -295 0 0 945 0
-945 -480 0 -480 0 0 -1185z"/>
-<path d="M5800 2300 l0 -240 280 0 280 0 0 -945 0 -945 480 0 480 0 0 945 0
-945 285 0 285 0 0 240 0 240 -1045 0 -1045 0 0 -240z"/>
-<path d="M8032 1358 l-2 -1188 1008 1 c621 1 971 5 912 10 -309 27 -631 139
-885 306 -593 391 -984 1122 -1025 1918 -4 77 -8 -394 -8 -1047z"/>
-<path d="M7441 1934 c-43 -36 -59 -70 -70 -148 -18 -124 16 -252 76 -291 32
-21 226 -33 328 -20 114 14 161 97 153 269 -5 96 -24 151 -68 191 -20 18 -39
-20 -205 23 l-182 3 -32 -27z m389 -199 c7 -8 10 -22 6 -30 -4 -13 -34 -15
-186 -15 -189 0 -202 3 -186 45 8 22 348 22 366 0z"/>
-<path d="M7450 1267 c-14 -6 -35 -32 -47 -57 -21 -41 -23 -58 -23 -222 l0
-178 270 0 270 0 0 105 0 105 -121 0 -120 0 3 28 3 27 118 3 117 3 0 99 0 100
-113 0 c-121 0 -138 -7 -162 -65 -8 -19 -9 -19 -12 2 -10 55 -116 84 -183 50z
-m134 -203 c15 -38 8 -44 -54 -44 -62 0 -69 6 -54 44 9 23 99 23 108 0z"/>
-<path d="M466 1193 l-29 -43 -163 0 -164 0 0 -235 0 -235 165 0 165 0 27 -42
-28 -42 3 163 c1 89 1 233 0 319 l-3 157 -29 -42z"/>
-<path d="M7443 620 c-48 -20 -58 -60 -61 -262 l-4 -188 271 0 271 0 0 110 0
-110 -110 0 -110 0 0 70 c0 76 -21 145 -51 160 -22 12 -176 12 -206 0z m161
-186 c15 -39 8 -44 -64 -44 -72 0 -79 5 -64 44 9 23 119 23 128 0z"/>
-</g>
-  </g>
-</svg>
@@ -1,77 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PETG @BabyBelt Pro",
-	"inherits": "Generic PETG @System",
-	"from": "system",
-	"setting_id": "gCzHpDNgVwQR6tgk",
-	"instantiation": "true",
-	"filament_extruder_variant": [
-		"Direct Drive Standard"
-	],
-	"compatible_printers": [
-		"BabyBelt Pro 0.4 nozzle"
-	],
-	"filament_type": [
-		"PETG"
-	],
-	"filament_vendor": [
-		"Generic"
-	],
-	"filament_settings_id": [
-		"Generic PETG @BabyBelt Pro"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_cost": [
-		"25"
-	],
-	"nozzle_temperature": [
-		"240"
-	],
-	"nozzle_temperature_initial_layer": [
-		"245"
-	],
-	"cool_plate_temp": [
-		"80"
-	],
-	"cool_plate_temp_initial_layer": [
-		"80"
-	],
-	"fan_min_speed": [
-		"40"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"overhang_fan_threshold": [
-		"25%"
-	],
-	"overhang_fan_speed": [
-		"80"
-	],
-	"full_fan_speed_layer": [
-		"8"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"slow_down_layer_time": [
-		"4"
-	],
-	"fan_cooling_layer_time": [
-		"100"
-	],
-	"filament_retraction_length": [
-		"2"
-	],
-	"filament_retraction_speed": [
-		"40"
-	],
-	"filament_deretraction_speed": [
-		"40"
-	],
-	"filament_start_gcode": [
-		"; Generic PETG @BabyBelt Pro — belt PETG, bed 80C"
-	]
-}
@@ -1,65 +0,0 @@
-{
-	"type": "filament",
-	"name": "Generic PLA @BabyBelt Pro",
-	"inherits": "Generic PLA @System",
-	"from": "system",
-	"setting_id": "24PpcnhVx9v5f4fD",
-	"instantiation": "true",
-	"filament_extruder_variant": [
-		"Direct Drive Standard"
-	],
-	"compatible_printers": [
-		"BabyBelt Pro 0.4 nozzle"
-	],
-	"filament_type": [
-		"PLA"
-	],
-	"filament_vendor": [
-		"Generic"
-	],
-	"filament_settings_id": [
-		"Generic PLA @BabyBelt Pro"
-	],
-	"nozzle_temperature": [
-		"215"
-	],
-	"hot_plate_temp": [
-		"75"
-	],
-	"hot_plate_temp_initial_layer": [
-		"75"
-	],
-	"cool_plate_temp": [
-		"75"
-	],
-	"cool_plate_temp_initial_layer": [
-		"75"
-	],
-	"textured_plate_temp": [
-		"75"
-	],
-	"textured_plate_temp_initial_layer": [
-		"75"
-	],
-	"close_fan_the_first_x_layers": [
-		"3"
-	],
-	"full_fan_speed_layer": [
-		"8"
-	],
-	"slow_down_min_speed": [
-		"20"
-	],
-	"filament_retraction_length": [
-		"1.5"
-	],
-	"filament_retraction_speed": [
-		"35"
-	],
-	"filament_deretraction_speed": [
-		"30"
-	],
-	"filament_start_gcode": [
-		"; Generic PLA @BabyBelt Pro — belt PLA, bed 75C"
-	]
-}
@@ -1,36 +0,0 @@
-{
-	"type": "filament",
-	"name": "eSUN PLA @BabyBelt Pro",
-	"inherits": "Generic PLA @BabyBelt Pro",
-	"from": "system",
-	"setting_id": "EH3X7oE0DU5tSpjW",
-	"filament_id": "OFkrxQC4",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BabyBelt Pro 0.4 nozzle"
-	],
-	"filament_type": [
-		"PLA"
-	],
-	"filament_vendor": [
-		"eSUN"
-	],
-	"filament_settings_id": [
-		"eSUN PLA @BabyBelt Pro"
-	],
-	"nozzle_temperature_initial_layer": [
-		"200"
-	],
-	"nozzle_temperature": [
-		"200"
-	],
-	"enable_pressure_advance": [
-		"1"
-	],
-	"pressure_advance": [
-		"0.12"
-	],
-	"filament_max_volumetric_speed": [
-		"20"
-	]
-}
@@ -1,88 +0,0 @@
-{
-	"type": "machine",
-	"name": "BabyBelt Pro 0.4 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "34OWINlJpJgA9DwQ",
-	"instantiation": "true",
-	"printer_model": "BabyBelt Pro",
-	"printer_variant": "0.4",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"default_filament_profile": [
-		"Generic PLA @BabyBelt Pro"
-	],
-	"default_print_profile": "0.20mm Standard @BabyBelt Pro",
-	"printable_area": [
-		"0x0",
-		"95x0",
-		"95x500",
-		"0x500"
-	],
-	"printable_height": "100",
-	"best_object_pos": "0.5,0.05",
-	"nozzle_type": [
-		"hardened_steel"
-	],
-	"printer_extruder_id": [
-		"1"
-	],
-	"printer_extruder_variant": [
-		"Direct Drive Standard"
-	],
-	"thumbnails": [
-		"48x48/PNG",
-		"300x300/PNG"
-	],
-	"machine_max_acceleration_e": [
-		"500",
-		"5000"
-	],
-	"machine_max_acceleration_extruding": [
-		"500",
-		"20000"
-	],
-	"machine_max_acceleration_retracting": [
-		"500",
-		"5000"
-	],
-	"machine_max_acceleration_x": [
-		"500",
-		"20000"
-	],
-	"machine_max_acceleration_y": [
-		"500",
-		"20000"
-	],
-	"machine_max_junction_deviation": [
-		"0.01",
-		"0.01"
-	],
-	"machine_max_speed_x": [
-		"50",
-		"200"
-	],
-	"machine_max_speed_y": [
-		"50",
-		"200"
-	],
-	"machine_max_speed_z": [
-		"5",
-		"12"
-	],
-	"retraction_length": [
-		"1.5"
-	],
-	"retraction_speed": [
-		"20"
-	],
-	"deretraction_speed": [
-		"25"
-	],
-	"retract_lift_enforce": [
-		"Top and Bottom"
-	],
-	"support_chamber_temp_control": "0",
-	"machine_start_gcode": ";Start GCode\nPRINT_START ANGLE=[belt_slice_rotation_angle] EXTRUDER=[nozzle_temperature_initial_layer] BED=[hot_plate_temp_initial_layer] MATERIAL=[filament_type]\n"
-}
@@ -1,12 +0,0 @@
-{
-	"type": "machine_model",
-	"name": "BabyBelt Pro",
-	"model_id": "Printcepts_BabyBelt_Pro",
-	"nozzle_diameter": "0.4",
-	"machine_tech": "FFF",
-	"family": "Printcepts",
-	"bed_model": "",
-	"bed_texture": "BabyBelt Pro_bed_texture.svg",
-	"hotend_model": "",
-	"default_materials": "Generic PLA @BabyBelt Pro;Generic PETG @BabyBelt Pro"
-}
@@ -1,98 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_belt_common",
-	"inherits": "fdm_klipper_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"single_extruder_multi_material": "0",
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @BabyBelt Pro",
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"long_retractions_when_cut": [
-		"0"
-	],
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"retract_lift_above": [
-		"0"
-	],
-	"retract_lift_below": [
-		"0"
-	],
-	"retract_lift_enforce": [
-		"All Surfaces"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_distances_when_cut": [
-		"18"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"travel_slope": [
-		"3"
-	],
-	"wipe": [
-		"1"
-	],
-	"wipe_distance": [
-		"1"
-	],
-	"z_hop": [
-		"0"
-	],
-	"z_hop_types": [
-		"Normal Lift"
-	],
-	"gcode_remap_x": "rev_x",
-	"gcode_remap_y": "pos_z",
-	"gcode_remap_z": "pos_y",
-	"printer_extruder_id": [
-		"1"
-	],
-	"belt_printer": "1",
-	"belt_slice_rotation": "x",
-	"belt_slice_rotation_angle": "45",
-	"build_plate_tilt_x": "45",
-	"purge_in_prime_tower": "0",
-	"scan_first_layer": "0",
-	"auxiliary_fan": "0"
-}
@@ -1,140 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_klipper_common",
-	"inherits": "fdm_machine_common",
-	"from": "system",
-	"instantiation": "false",
-	"gcode_flavor": "klipper",
-	"machine_max_acceleration_e": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_extruding": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_retracting": [
-		"5000",
-		"5000"
-	],
-	"machine_max_acceleration_travel": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_x": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_y": [
-		"20000",
-		"20000"
-	],
-	"machine_max_acceleration_z": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_e": [
-		"25",
-		"25"
-	],
-	"machine_max_speed_x": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_y": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_z": [
-		"12",
-		"12"
-	],
-	"machine_max_jerk_e": [
-		"2.5",
-		"2.5"
-	],
-	"machine_max_jerk_x": [
-		"9",
-		"9"
-	],
-	"machine_max_jerk_y": [
-		"9",
-		"9"
-	],
-	"machine_max_jerk_z": [
-		"0.2",
-		"0.4"
-	],
-	"machine_min_extruding_rate": [
-		"0",
-		"0"
-	],
-	"machine_min_travel_rate": [
-		"0",
-		"0"
-	],
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"printable_height": "250",
-	"extruder_clearance_radius": "65",
-	"extruder_clearance_height_to_rod": "36",
-	"extruder_clearance_height_to_lid": "140",
-	"printer_settings_id": "",
-	"printer_technology": "FFF",
-	"printer_variant": "0.4",
-	"retraction_minimum_travel": [
-		"1"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_length": [
-		"0.8"
-	],
-	"retract_length_toolchange": [
-		"2"
-	],
-	"z_hop": [
-		"0.4"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retraction_speed": [
-		"30"
-	],
-	"deretraction_speed": [
-		"30"
-	],
-	"z_hop_types": "Normal Lift",
-	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
-	"wipe": [
-		"1"
-	],
-	"default_filament_profile": [
-		"Generic PLA @System"
-	],
-	"default_print_profile": "0.20mm Standard @MyKlipper",
-	"bed_exclude_area": [
-		"0x0"
-	],
-	"machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",
-	"machine_end_gcode": "PRINT_END",
-	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-	"machine_pause_gcode": "PAUSE",
-	"scan_first_layer": "0",
-	"nozzle_type": "undefine",
-	"auxiliary_fan": "0"
-}
@@ -1,118 +0,0 @@
-{
-	"type": "machine",
-	"name": "fdm_machine_common",
-	"from": "system",
-	"instantiation": "false",
-	"printer_technology": "FFF",
-	"deretraction_speed": [
-		"40"
-	],
-	"extruder_colour": [
-		"#FCE94F"
-	],
-	"extruder_offset": [
-		"0x0"
-	],
-	"gcode_flavor": "marlin",
-	"machine_max_acceleration_e": [
-		"5000"
-	],
-	"machine_max_acceleration_extruding": [
-		"10000"
-	],
-	"machine_max_acceleration_retracting": [
-		"1000"
-	],
-	"machine_max_acceleration_x": [
-		"10000"
-	],
-	"machine_max_acceleration_y": [
-		"10000"
-	],
-	"machine_max_acceleration_z": [
-		"500"
-	],
-	"machine_max_speed_e": [
-		"60"
-	],
-	"machine_max_speed_x": [
-		"500"
-	],
-	"machine_max_speed_y": [
-		"500"
-	],
-	"machine_max_speed_z": [
-		"10"
-	],
-	"machine_max_jerk_e": [
-		"5"
-	],
-	"machine_max_jerk_x": [
-		"8"
-	],
-	"machine_max_jerk_y": [
-		"8"
-	],
-	"machine_max_jerk_z": [
-		"0.4"
-	],
-	"machine_min_extruding_rate": [
-		"0"
-	],
-	"machine_min_travel_rate": [
-		"0"
-	],
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"printable_height": "250",
-	"extruder_clearance_radius": "65",
-	"extruder_clearance_height_to_rod": "36",
-	"extruder_clearance_height_to_lid": "140",
-	"nozzle_diameter": [
-		"0.4"
-	],
-	"printer_settings_id": "",
-	"printer_variant": "0.4",
-	"retraction_minimum_travel": [
-		"2"
-	],
-	"retract_before_wipe": [
-		"70%"
-	],
-	"retract_when_changing_layer": [
-		"1"
-	],
-	"retraction_length": [
-		"1"
-	],
-	"retract_length_toolchange": [
-		"1"
-	],
-	"z_hop": [
-		"0"
-	],
-	"retract_restart_extra": [
-		"0"
-	],
-	"retract_restart_extra_toolchange": [
-		"0"
-	],
-	"retraction_speed": [
-		"60"
-	],
-	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
-	"wipe": [
-		"1"
-	],
-	"default_print_profile": "",
-	"machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
-	"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end",
-	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-	"machine_pause_gcode": "M601"
-}
@@ -1,23 +0,0 @@
-{
-	"type": "process",
-	"name": "0.20mm Standard @BabyBelt Pro",
-	"inherits": "fdm_process_common",
-	"from": "system",
-	"setting_id": "JGfGtqX6CWjCt437",
-	"instantiation": "true",
-	"layer_height": "0.2",
-	"initial_layer_print_height": "0.2",
-	"initial_layer_line_width": "0.42",
-	"wall_loops": "2",
-	"reduce_infill_retraction": "1",
-	"detect_overhang_wall": "1",
-	"skirt_loops": "0",
-	"skirt_distance": "0",
-	"sparse_infill_pattern": "grid",
-	"sparse_infill_speed": "200",
-	"support_base_pattern": "rectilinear",
-	"support_interface_pattern": "rectilinear",
-	"compatible_printers": [
-		"BabyBelt Pro 0.4 nozzle"
-	]
-}
@@ -1,106 +0,0 @@
-{
-	"type": "process",
-	"name": "fdm_process_common",
-	"from": "system",
-	"instantiation": "false",
-	"reduce_crossing_wall": "0",
-	"max_travel_detour_distance": "0",
-	"bottom_surface_pattern": "monotonic",
-	"bottom_shell_thickness": "0",
-	"bridge_speed": "50",
-	"brim_width": "5",
-	"brim_object_gap": "0.1",
-	"compatible_printers": [],
-	"compatible_printers_condition": "",
-	"print_sequence": "by layer",
-	"default_acceleration": "1000",
-	"initial_layer_acceleration": "500",
-	"top_surface_acceleration": "1000",
-	"travel_acceleration": "1000",
-	"inner_wall_acceleration": "1000",
-	"outer_wall_acceleration": "700",
-	"bridge_no_support": "0",
-	"draft_shield": "disabled",
-	"elefant_foot_compensation": "0",
-	"enable_arc_fitting": "0",
-	"wall_infill_order": "inner wall/outer wall/infill",
-	"infill_direction": "45",
-	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "crosshatch",
-	"initial_layer_print_height": "0.2",
-	"infill_combination": "0",
-	"infill_wall_overlap": "25%",
-	"interface_shells": "0",
-	"ironing_flow": "10%",
-	"ironing_spacing": "0.15",
-	"ironing_speed": "30",
-	"ironing_type": "no ironing",
-	"reduce_infill_retraction": "1",
-	"filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode",
-	"detect_overhang_wall": "1",
-	"slowdown_for_curled_perimeters": "1",
-	"overhang_1_4_speed": "0",
-	"overhang_2_4_speed": "50",
-	"overhang_3_4_speed": "30",
-	"overhang_4_4_speed": "10",
-	"line_width": "110%",
-	"inner_wall_line_width": "110%",
-	"outer_wall_line_width": "100%",
-	"top_surface_line_width": "93.75%",
-	"sparse_infill_line_width": "110%",
-	"initial_layer_line_width": "120%",
-	"internal_solid_infill_line_width": "120%",
-	"support_line_width": "96%",
-	"wall_loops": "3",
-	"print_settings_id": "",
-	"raft_layers": "0",
-	"seam_position": "aligned",
-	"skirt_distance": "2",
-	"skirt_height": "3",
-	"min_skirt_length": "4",
-	"skirt_loops": "0",
-	"minimum_sparse_infill_area": "15",
-	"spiral_mode": "0",
-	"standby_temperature_delta": "-5",
-	"enable_support": "0",
-	"resolution": "0.012",
-	"support_type": "normal(auto)",
-	"support_on_build_plate_only": "0",
-	"support_top_z_distance": "0.2",
-	"support_bottom_z_distance": "0.2",
-	"support_filament": "0",
-	"support_interface_loop_pattern": "0",
-	"support_interface_filament": "0",
-	"support_interface_top_layers": "2",
-	"support_interface_bottom_layers": "2",
-	"support_interface_spacing": "0.5",
-	"support_interface_speed": "80",
-	"support_base_pattern": "default",
-	"support_base_pattern_spacing": "2.5",
-	"support_speed": "150",
-	"support_threshold_angle": "30",
-	"support_object_xy_distance": "0.35",
-	"tree_support_branch_angle": "30",
-	"tree_support_wall_count": "0",
-	"detect_thin_wall": "0",
-	"top_surface_pattern": "monotonicline",
-	"top_shell_thickness": "0.8",
-	"enable_prime_tower": "1",
-	"wipe_tower_no_sparse_layers": "0",
-	"prime_tower_width": "60",
-	"xy_hole_compensation": "0",
-	"xy_contour_compensation": "0",
-	"layer_height": "0.2",
-	"bottom_shell_layers": "3",
-	"top_shell_layers": "4",
-	"bridge_flow": "1",
-	"initial_layer_speed": "45",
-	"initial_layer_infill_speed": "45",
-	"outer_wall_speed": "45",
-	"inner_wall_speed": "80",
-	"sparse_infill_speed": "150",
-	"internal_solid_infill_speed": "150",
-	"top_surface_speed": "50",
-	"gap_infill_speed": "30",
-	"travel_speed": "200"
-}
@@ -26,7 +26,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform vec4 uniform_color;
@@ -23,7 +23,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform mat4 view_model_matrix;
@@ -78,8 +77,8 @@ void main()
    // Point in homogenous coordinates.
    world_pos = volume_world_matrix * vec4(v_position, 1.0);

-    // dot product of world normal with up direction, used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    // z component of normal vector in world coordinate used for slope shading
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;

    gl_Position = projection_matrix * position;
    if (is_outline) {
@@ -37,7 +37,6 @@ struct SlopeDetection
    bool actived;
 	 float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;

@@ -86,7 +85,7 @@ void main()
              color = LightBlue;
              alpha = 1.0;
         }
-         else if( dot(transformed_normal, slope.up_direction) < slope.normal_z - EPSILON)
+         else if( transformed_normal.z < slope.normal_z - EPSILON)
        {
            color = color * 0.5 + LightRed * 0.5;
            alpha = 1.0;
@@ -24,7 +24,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;
 void main()
@@ -41,7 +41,6 @@ struct SlopeDetection
    bool actived;
    float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform vec4 uniform_color;
@@ -7,7 +7,6 @@ struct SlopeDetection
    bool actived;
    float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform mat4 view_model_matrix;
@@ -47,8 +46,8 @@ void main()
    // Point in homogenous coordinates.
    world_pos = volume_world_matrix * vec4(v_position, 1.0);

-    // dot product of world normal with up direction, used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    // z component of normal vector in world coordinate used for slope shading
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;

    gl_Position = projection_matrix * position;
    if (is_outline) {
@@ -29,11 +29,19 @@ uniform vec3      palette_lab[64];
 uniform vec3      palette_rgb[64];
 uniform int       palette_count;
 uniform bool      pure_only;      // match against single filaments only (flat-colour image)
-// The entry's two filaments, equal for a single filament - only so a mix can be told apart. An entry's
-// palette_rgb is already the colour it prints in (for a mix, its mixed filament slot's).
+// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
+// num parts of a in every den, and the print shows that interleave rather than the entry's average
+// colour. The fragment resolves it exactly as GLGizmoTextureDisplacement::make_mix_resolver() does
+// per triangle on the CPU, so the preview shows the pattern the bake will print.
 uniform int       palette_a[64];
 uniform int       palette_b[64];
-uniform float     prefer_pure_de; // PREFER_PURE_DE: how much better than a single filament a mix must be
+uniform int       palette_num[64];
+uniform int       palette_den[64];
+uniform vec3      filament_rgb[16];
+uniform int       filament_count;
+uniform int       mix_mode;     // ColorMixMode: 0 Z bands, 1 XY dither, 2 auto
+uniform float     layer_height; // mm; one Z band per print layer
+uniform float     dither_cell;  // mm; one XY dither cell
 uniform sampler2D color_tex;     // the layer's colour image, sampled at the same uv as the height
 uniform bool      has_color_tex;
 uniform bool volume_mirrored;
@@ -208,16 +216,78 @@ int nearest_palette_entry(vec3 rgb)
            best = i;
        }
    }
-    // The same bias make_palette_quantizer() applies: a mix is an interleave, so it is only worth taking
-    // when it beats the nearest single filament by a visible step - otherwise the preview shows mixes
-    // where the bake prints a single filament. Compared on the distances rather than their squares, so
-    // the margin means the same thing as it does on the CPU (up to CIE76 against CIEDE2000, the
-    // approximation already noted above).
-    if (best_pure >= 0 && palette_a[best] != palette_b[best] && sqrt(bd_pure) - sqrt(bd) < prefer_pure_de)
+    // The same bias make_palette_quantizer() applies (PREFER_PURE_DE = 10): a mix is an interleave, so
+    // it is only worth taking when it beats the nearest single filament by a visible step. Without it
+    // this picked a mix for almost every fragment - with four filaments the palette is 4 pure entries
+    // against 30 mixes - while the bake picked a single filament for most of them, so the preview
+    // interleaved the whole wall where the bake interleaves only patches. Compared on the distances
+    // rather than their squares, so the threshold means the same thing as it does on the CPU (up to
+    // CIE76 against CIEDE2000, the approximation already noted above).
+    if (best_pure >= 0 && palette_a[best] != palette_b[best] && sqrt(bd_pure) - sqrt(bd) < 10.0)
        best = best_pure;
    return best;
 }

+// One 2x2 Bayer cell, {0, 2; 3, 1}, for x and y in {0, 1}.
+float bayer2(float x, float y) { return 2.0 * x + 3.0 * y - 4.0 * x * y; }
+
+// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
+// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
+// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
+// mod(), which wraps negative coordinates the way the CPU's ((v % n) + n) % n does and needs no
+// integer % (not available on every GLSL 1.10 target).
+vec3 printed_color(int index, vec3 pos, vec3 normal, vec3 footprint)
+{
+    int a = palette_a[index];
+    int b = palette_b[index];
+    if (a < 0 || a >= filament_count || b < 0 || b >= filament_count)
+        return palette_rgb[index]; // no filament to resolve to: the entry's own colour
+    if (a == b)
+        return filament_rgb[a];
+    float num = float(palette_num[index]);
+    float den = float(palette_den[index]);
+    // Auto: bands where the surface is steeper than ~45 degrees, the dominant filament elsewhere.
+    if (mix_mode == 2 && abs(normal.z) >= 0.7)
+        return filament_rgb[(num * 2.0 >= den) ? a : b];
+
+    // Pre-filter. The interleave is an ordered dither the eye is meant to blend away, and no dither
+    // blends when it is drawn at less than a few pixels per period - it aliases, which is what turned
+    // every upright wall into horizontal streaks: the Z band cycle is den * layer_height (around a
+    // millimetre), and every pixel of a row on a vertical wall shares one z, so each row came out as a
+    // 1-bit threshold of the image at that row's phase. `footprint` is mm of world position per pixel,
+    // so this is zoom- and resolution-correct rather than a tuned constant: where the print's own
+    // pattern is finer than this view can resolve, show what the print looks like from here, which is
+    // the entry's perceptual average. The Normal view remains where the per-facet truth lives.
+    float period = (mix_mode == 1) ? 2.0 * max(dither_cell, 0.01) : den * max(layer_height, 0.01);
+    float px     = (mix_mode == 1) ? max(footprint.x, footprint.y) : footprint.z;
+    float sharp  = clamp(period / max(4.0 * px, 1e-6) - 0.5, 0.0, 1.0);
+    if (sharp <= 0.0)
+        return palette_rgb[index];
+
+    vec3 picked;
+    if (mix_mode == 1) {
+        // Ordered 4x4 Bayer over floor(x / cell), floor(y / cell). The CPU's table
+        //     0  8  2 10
+        //    12  4 14  6
+        //     3 11  1  9
+        //    15  7 13  5
+        // is 4 * bayer2(x % 2, y % 2) + bayer2(x / 2, y / 2), which needs no array (GLSL 1.10 has
+        // no constant arrays).
+        float cell  = max(dither_cell, 0.01);
+        float gx    = mod(floor(pos.x / cell), 4.0);
+        float gy    = mod(floor(pos.y / cell), 4.0);
+        float bayer = 4.0 * bayer2(mod(gx, 2.0), mod(gy, 2.0)) + bayer2(floor(gx / 2.0), floor(gy / 2.0));
+        picked = filament_rgb[(num / den > (bayer + 0.5) / 16.0) ? a : b];
+    } else {
+        // Z bands: one per band height, the band's phase in the a/b cycle picks the filament. Both
+        // operands are integer-valued, so the half keeps "phase < num" exact under float rounding.
+        float slot  = floor(pos.z / max(layer_height, 0.01));
+        float phase = mod(slot, den);
+        picked = filament_rgb[(phase < num - 0.5) ? a : b];
+    }
+    return mix(palette_rgb[index], picked, sharp);
+}
+
 void main()
 {
    if (any(lessThan(clipping_planes_dots, ZERO)))
@@ -226,6 +296,9 @@ void main()
    // World millimetres throughout, like the bake - see the 140 variant.
    vec3 triangle_normal = normalize(cross(dFdx(world_pos.xyz), dFdy(world_pos.xyz)));
    vec3 tex_pos = world_pos.xyz - tex_anchor; // the frame the texture is projected in, as the bake does
+    // World mm per pixel, for pre-filtering the interleave in printed_color(). Taken here because the
+    // albedo branch at the end of main() is non-uniform control flow, where derivatives are undefined.
+    vec3 pos_fwidth = fwidth(world_pos.xyz);
    if (volume_mirrored)
        triangle_normal = -triangle_normal;

@@ -337,11 +410,16 @@ void main()
    NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0);
    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;

-    // Diffuse albedo: the image's colour at this fragment, snapped to the nearest printable colour.
+    // Diffuse albedo: the image's colour at this fragment, snapped to the nearest printable colour -
+    // and, where that is a mix, the filament the interleave puts here, so the pattern that prints shows.
    // Only the albedo - the specular term (intensity.y) stays white - so a coloured fragment reads as
    // the same material under the same light, and the relief this preview exists to show is unaffected.
    vec3 albedo = uniform_color.rgb;
    if (palette_count > 0 && has_color_tex && have_uv && weight > 0.0)
-        albedo = palette_rgb[nearest_palette_entry(texture2D(color_tex, color_uv).rgb)];
+        // tex_pos, not world_pos: the bake resolves the interleave in the bake frame (world
+        // orientation and scale about the volume's origin, see texture_displacement_bake_frame()), so
+        // measuring z from the bed instead shifted the band phase by the volume origin's height - a
+        // different filament in the same place than the bake produces.
+        albedo = printed_color(nearest_palette_entry(texture2D(color_tex, color_uv).rgb), tex_pos, triangle_normal, pos_fwidth);
    gl_FragColor = vec4(vec3(intensity.y) + albedo * intensity.x, uniform_color.a);
 }
@@ -29,7 +29,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform vec4 uniform_color;
@@ -23,7 +23,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform mat4 view_model_matrix;
@@ -78,8 +77,8 @@ void main()
    // Point in homogenous coordinates.
    world_pos = volume_world_matrix * vec4(v_position, 1.0);

-    // dot product of world normal with up direction, used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    // z component of normal vector in world coordinate used for slope shading
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;

    gl_Position = projection_matrix * position;
    if (is_outline) {
@@ -37,7 +37,6 @@ struct SlopeDetection
    bool actived;
 	 float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;

@@ -88,7 +87,7 @@ void main()
              color = LightBlue;
              alpha = 1.0;
         }
-         else if( dot(transformed_normal, slope.up_direction) < slope.normal_z - EPSILON)
+         else if( transformed_normal.z < slope.normal_z - EPSILON)
        {
            color = color * 0.5 + LightRed * 0.5;
            alpha = 1.0;
@@ -24,7 +24,6 @@ struct SlopeDetection
    bool actived;
 	float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;
 void main()
@@ -44,7 +44,6 @@ struct SlopeDetection
    bool actived;
    float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform vec4 uniform_color;
@@ -7,7 +7,6 @@ struct SlopeDetection
    bool actived;
    float normal_z;
    mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };

 uniform mat4 view_model_matrix;
@@ -47,8 +46,8 @@ void main()
    // Point in homogenous coordinates.
    world_pos = volume_world_matrix * vec4(v_position, 1.0);

-    // dot product of world normal with up direction, used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    // z component of normal vector in world coordinate used for slope shading
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;

    gl_Position = projection_matrix * position;
    if (is_outline) {
@@ -88,11 +88,19 @@ uniform vec3      palette_lab[64];
 uniform vec3      palette_rgb[64];
 uniform int       palette_count;
 uniform bool      pure_only;      // match against single filaments only (flat-colour image)
-// The entry's two filaments, equal for a single filament - only so a mix can be told apart. An entry's
-// palette_rgb is already the colour it prints in (for a mix, its mixed filament slot's).
+// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
+// num parts of a in every den, and the print shows that interleave rather than the entry's average
+// colour. The fragment resolves it exactly as GLGizmoTextureDisplacement::make_mix_resolver() does
+// per triangle on the CPU, so the preview shows the pattern the bake will print.
 uniform int       palette_a[64];
 uniform int       palette_b[64];
-uniform float     prefer_pure_de; // PREFER_PURE_DE: how much better than a single filament a mix must be
+uniform int       palette_num[64];
+uniform int       palette_den[64];
+uniform vec3      filament_rgb[16];
+uniform int       filament_count;
+uniform int       mix_mode;     // ColorMixMode: 0 Z bands, 1 XY dither, 2 auto
+uniform float     layer_height; // mm; one Z band per print layer
+uniform float     dither_cell;  // mm; one XY dither cell
 uniform sampler2D color_tex;     // the layer's colour image, sampled at the same uv as the height
 uniform bool      has_color_tex;
 uniform bool volume_mirrored;
@@ -274,16 +282,78 @@ int nearest_palette_entry(vec3 rgb)
            best = i;
        }
    }
-    // The same bias make_palette_quantizer() applies: a mix is an interleave, so it is only worth taking
-    // when it beats the nearest single filament by a visible step - otherwise the preview shows mixes
-    // where the bake prints a single filament. Compared on the distances rather than their squares, so
-    // the margin means the same thing as it does on the CPU (up to CIE76 against CIEDE2000, the
-    // approximation already noted above).
-    if (best_pure >= 0 && palette_a[best] != palette_b[best] && sqrt(bd_pure) - sqrt(bd) < prefer_pure_de)
+    // The same bias make_palette_quantizer() applies (PREFER_PURE_DE = 10): a mix is an interleave, so
+    // it is only worth taking when it beats the nearest single filament by a visible step. Without it
+    // this picked a mix for almost every fragment - with four filaments the palette is 4 pure entries
+    // against 30 mixes - while the bake picked a single filament for most of them, so the preview
+    // interleaved the whole wall where the bake interleaves only patches. Compared on the distances
+    // rather than their squares, so the threshold means the same thing as it does on the CPU (up to
+    // CIE76 against CIEDE2000, the approximation already noted above).
+    if (best_pure >= 0 && palette_a[best] != palette_b[best] && sqrt(bd_pure) - sqrt(bd) < 10.0)
        best = best_pure;
    return best;
 }

+// One 2x2 Bayer cell, {0, 2; 3, 1}, for x and y in {0, 1}.
+float bayer2(float x, float y) { return 2.0 * x + 3.0 * y - 4.0 * x * y; }
+
+// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
+// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
+// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
+// mod(), which wraps negative coordinates the way the CPU's ((v % n) + n) % n does and needs no
+// integer % (not available on every GLSL 1.10 target).
+vec3 printed_color(int index, vec3 pos, vec3 normal, vec3 footprint)
+{
+    int a = palette_a[index];
+    int b = palette_b[index];
+    if (a < 0 || a >= filament_count || b < 0 || b >= filament_count)
+        return palette_rgb[index]; // no filament to resolve to: the entry's own colour
+    if (a == b)
+        return filament_rgb[a];
+    float num = float(palette_num[index]);
+    float den = float(palette_den[index]);
+    // Auto: bands where the surface is steeper than ~45 degrees, the dominant filament elsewhere.
+    if (mix_mode == 2 && abs(normal.z) >= 0.7)
+        return filament_rgb[(num * 2.0 >= den) ? a : b];
+
+    // Pre-filter. The interleave is an ordered dither the eye is meant to blend away, and no dither
+    // blends when it is drawn at less than a few pixels per period - it aliases, which is what turned
+    // every upright wall into horizontal streaks: the Z band cycle is den * layer_height (around a
+    // millimetre), and every pixel of a row on a vertical wall shares one z, so each row came out as a
+    // 1-bit threshold of the image at that row's phase. `footprint` is mm of world position per pixel,
+    // so this is zoom- and resolution-correct rather than a tuned constant: where the print's own
+    // pattern is finer than this view can resolve, show what the print looks like from here, which is
+    // the entry's perceptual average. The Normal view remains where the per-facet truth lives.
+    float period = (mix_mode == 1) ? 2.0 * max(dither_cell, 0.01) : den * max(layer_height, 0.01);
+    float px     = (mix_mode == 1) ? max(footprint.x, footprint.y) : footprint.z;
+    float sharp  = clamp(period / max(4.0 * px, 1e-6) - 0.5, 0.0, 1.0);
+    if (sharp <= 0.0)
+        return palette_rgb[index];
+
+    vec3 picked;
+    if (mix_mode == 1) {
+        // Ordered 4x4 Bayer over floor(x / cell), floor(y / cell). The CPU's table
+        //     0  8  2 10
+        //    12  4 14  6
+        //     3 11  1  9
+        //    15  7 13  5
+        // is 4 * bayer2(x % 2, y % 2) + bayer2(x / 2, y / 2), which needs no array (GLSL 1.10 has
+        // no constant arrays).
+        float cell  = max(dither_cell, 0.01);
+        float gx    = mod(floor(pos.x / cell), 4.0);
+        float gy    = mod(floor(pos.y / cell), 4.0);
+        float bayer = 4.0 * bayer2(mod(gx, 2.0), mod(gy, 2.0)) + bayer2(floor(gx / 2.0), floor(gy / 2.0));
+        picked = filament_rgb[(num / den > (bayer + 0.5) / 16.0) ? a : b];
+    } else {
+        // Z bands: one per band height, the band's phase in the a/b cycle picks the filament. Both
+        // operands are integer-valued, so the half keeps "phase < num" exact under float rounding.
+        float slot  = floor(pos.z / max(layer_height, 0.01));
+        float phase = mod(slot, den);
+        picked = filament_rgb[(phase < num - 0.5) ? a : b];
+    }
+    return mix(palette_rgb[index], picked, sharp);
+}
+
 void main()
 {
    if (any(lessThan(clipping_planes_dots, ZERO)))
@@ -294,6 +364,9 @@ void main()
    // world position and perturb the world normal.
    vec3 triangle_normal = normalize(cross(dFdx(world_pos.xyz), dFdy(world_pos.xyz)));
    vec3 tex_pos = world_pos.xyz - tex_anchor; // the frame the texture is projected in, as the bake does
+    // World mm per pixel, for pre-filtering the interleave in printed_color(). Taken here because the
+    // albedo branch at the end of main() is non-uniform control flow, where derivatives are undefined.
+    vec3 pos_fwidth = fwidth(world_pos.xyz);
    if (volume_mirrored)
        triangle_normal = -triangle_normal;

@@ -425,11 +498,16 @@ void main()
    NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0);
    intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;

-    // Diffuse albedo: the image's colour at this fragment, snapped to the nearest printable colour.
+    // Diffuse albedo: the image's colour at this fragment, snapped to the nearest printable colour -
+    // and, where that is a mix, the filament the interleave puts here, so the pattern that prints shows.
    // Only the albedo - the specular term (intensity.y) stays white - so a coloured fragment reads as
    // the same material under the same light, and the relief this preview exists to show is unaffected.
    vec3 albedo = uniform_color.rgb;
    if (palette_count > 0 && has_color_tex && have_uv && weight > 0.0)
-        albedo = palette_rgb[nearest_palette_entry(texture(color_tex, color_uv).rgb)];
+        // tex_pos, not world_pos: the bake resolves the interleave in the bake frame (world
+        // orientation and scale about the volume's origin, see texture_displacement_bake_frame()), so
+        // measuring z from the bed instead shifted the band phase by the volume origin's height - a
+        // different filament in the same place than the bake produces.
+        albedo = printed_color(nearest_palette_entry(texture(color_tex, color_uv).rgb), tex_pos, triangle_normal, pos_fwidth);
    out_color = vec4(vec3(intensity.y) + albedo * intensity.x, uniform_color.a);
 }
@@ -167,11 +167,6 @@ OBSOLETE_KEYS = {
    "filament_load_time", "filament_unload_time", "smooth_coefficient",
    "overhang_totally_speed", "silent_mode", "overhang_speed_classic",
    "anisotropic_surfaces",
-    # Belt printer options retired before the feature shipped (#16236).
-    "belt_slice_rotation_global", "preslice_remap_x", "preslice_remap_y", "preslice_remap_z",
-    "preslice_remap_global", "belt_support_z_offset_mode", "first_layer_plane",
-    "first_layer_plane_offset", "belt_preslice_global", "gcode_back_transform",
-    "belt_support_floor_mode", "first_layer_plane_thickness",
 }

 # Keys renamed at some point, whose old and new spellings must never co-exist:
@@ -91,12 +91,6 @@ if (SLIC3R_GUI)
 #    list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)

    find_package(wxInspector REQUIRED)
-    # wxInspector 1.0.0 installs its headers but accidentally declares the
-    # INSTALL_INTERFACE include directory PRIVATE, so its imported target does
-    # not expose them to consumers. Restore the package prefix include path until
-    # the upstream export is fixed.
-    get_filename_component(WXINSPECTOR_PREFIX "${wxInspector_DIR}/../../.." ABSOLUTE)
-    target_include_directories(wxInspector::wxInspector INTERFACE "${WXINSPECTOR_PREFIX}/include")

    # wxInspector's exported interface names the release wxWidgets import
    # libraries, which a Debug build cannot link. wx is linked above instead.
@@ -192,7 +186,7 @@ endif ()
 # Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
 if (SLIC3R_GUI)
 #    target_link_libraries(OrcaSlicer ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
-target_link_libraries(OrcaSlicer libslic3r_gui wxInspector::wxInspector)
+target_link_libraries(OrcaSlicer libslic3r_gui)
    if (MSVC)
        # Generate debug symbols even in release mode.
        target_link_options(OrcaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
@@ -3435,14 +3435,9 @@ int CLI::run(int argc, char **argv)
                max_self_index = std::max(max_self_index, v);
                min_self_index = std::min(min_self_index, v);
            }
-            // And a project saved with FEWER filaments than are now loaded (a
-            // one-filament project sliced with two --load-filaments) leaves the tables half filled:
-            // the variant matching below then reads past filament_extruder_variant and
-            // set_with_restore_2 throws an uncaught size error. Regenerate in that case too.
-            if (max_self_index > filament_count || min_self_index < 1 || max_self_index < filament_count
-                || (int) filament_self_index_opt->values.size() < filament_count) {
-                BOOST_LOG_TRIVIAL(warning) << boost::format("filament_self_index range [%1%, %2%] (size %4%) is invalid for filament_count %3%, regenerating")
-                        % min_self_index % max_self_index % filament_count % filament_self_index_opt->values.size();
+            if (max_self_index > filament_count || min_self_index < 1) {
+                BOOST_LOG_TRIVIAL(warning) << boost::format("filament_self_index range [%1%, %2%] is invalid for filament_count %3%, regenerating")
+                        % min_self_index % max_self_index % filament_count;
                need_regenerate_self_index = true;
            }
        }
@@ -3533,10 +3528,6 @@ int CLI::run(int argc, char **argv)
                std::vector<std::string>& filament_variants = curr_variant_opt->values;
                filament_variants.resize(filament_count, get_extruder_variant_string(etDirectDrive, nvtStandard));
            }
-            // See the filament_self_index note above: one variant per filament for
-            // the filaments the project did not know about.
-            if ((int) curr_variant_opt->values.size() < filament_count)
-                curr_variant_opt->values.resize(filament_count, get_extruder_variant_string(etDirectDrive, nvtStandard));
            const ConfigOptionStrings *new_variant_opt = dynamic_cast<const ConfigOptionStrings*>(config.option("filament_extruder_variant", true));

            std::vector<int> new_variant_indice;
@@ -3545,7 +3536,7 @@ int CLI::run(int argc, char **argv)

            for (int i = 0; i < new_variant_count; i++)
            {
-                for (int j = old_start_indice[filament_index - 1]; j < old_start_indice[filament_index - 1] + old_variant_count && j < (int) curr_variant_opt->values.size(); j++)
+                for (int j = old_start_indice[filament_index - 1]; j < old_start_indice[filament_index - 1] + old_variant_count; j++)
                {
                    if (curr_variant_opt->values[j] == new_variant_opt->values[i]) {
                        new_variant_indice[i] = j;
@@ -3597,18 +3588,7 @@ int CLI::run(int argc, char **argv)
                                ConfigOptionVectorBase* opt_vec_dst = static_cast<ConfigOptionVectorBase*>(opt);
                                const ConfigOptionVectorBase* opt_vec_src = static_cast<const ConfigOptionVectorBase*>(source_opt);
                                //set with index
-                                try {
-                                    // A project with fewer filaments than are loaded: grow the
-                                    // destination to the filament's slot first (set_with_restore_2 only restores).
-                                    if (opt_vec_src->size() > 0 && opt_vec_dst->size() < size_t(old_start_indice[filament_index - 1] + old_variant_count))
-                                        opt_vec_dst->resize(size_t(old_start_indice[filament_index - 1] + old_variant_count), opt_vec_src);
-                                    opt_vec_dst->set_with_restore_2(opt_vec_src, new_variant_indice, old_start_indice[filament_index - 1], old_variant_count);
-                                } catch (const std::exception &ex) {   // Was an uncaught abort
-                                    BOOST_LOG_TRIVIAL(error) << boost::format("filament %1%: option %2% could not be applied: %3%") % filament_index % opt_key % ex.what();
-                                    boost::nowide::cerr << "filament " << filament_index << ": option " << opt_key << " could not be applied: " << ex.what() << std::endl;
-                                    record_exit_reson(outfile_dir, CLI_CONFIG_FILE_ERROR, 0, cli_errors[CLI_CONFIG_FILE_ERROR], sliced_info);
-                                    flush_and_exit(CLI_CONFIG_FILE_ERROR);
-                                }
+                                opt_vec_dst->set_with_restore_2(opt_vec_src, new_variant_indice, old_start_indice[filament_index - 1], old_variant_count);
                            }

                            continue;
@@ -3657,16 +3637,7 @@ int CLI::run(int argc, char **argv)
                    if (filament_options_with_variant.find(opt_key) != filament_options_with_variant.end()) {
                        std::vector<int> temp_variant_indice;
                        temp_variant_indice.resize(new_variant_count, -1);
-                        try {
-                            if (opt_vec_src->size() > 0 && opt_vec_dst->size() < size_t(old_start_indice[filament_index - 1] + old_variant_count))   // See above
-                                opt_vec_dst->resize(size_t(old_start_indice[filament_index - 1] + old_variant_count), opt_vec_src);
-                            opt_vec_dst->set_with_restore_2(opt_vec_src, temp_variant_indice, old_start_indice[filament_index - 1], old_variant_count, true);
-                        } catch (const std::exception &ex) {   // Was an uncaught abort
-                            BOOST_LOG_TRIVIAL(error) << boost::format("filament %1%: option %2% could not be applied: %3%") % filament_index % opt_key % ex.what();
-                            boost::nowide::cerr << "filament " << filament_index << ": option " << opt_key << " could not be applied: " << ex.what() << std::endl;
-                            record_exit_reson(outfile_dir, CLI_CONFIG_FILE_ERROR, 0, cli_errors[CLI_CONFIG_FILE_ERROR], sliced_info);
-                            flush_and_exit(CLI_CONFIG_FILE_ERROR);
-                        }
+                        opt_vec_dst->set_with_restore_2(opt_vec_src, temp_variant_indice, old_start_indice[filament_index - 1], old_variant_count, true);

                        if (opt_key == "filament_extruder_variant")
                            new_variant_counts[filament_index - 1] = opt_vec_src->size();
@@ -4182,10 +4153,6 @@ int CLI::run(int argc, char **argv)
        BOOST_LOG_TRIVIAL(info) << boost::format("%1%, set disable_wipe_tower_after_mapping back to false due to wrapping detect")%__LINE__;
    }

-    // Belt printers never get the classic wipe tower (see Print::has_wipe_tower()), so reserve no space for it.
-    const ConfigOptionBool* belt_printer_opt = m_print_config.option<ConfigOptionBool>("belt_printer");
-    const bool is_belt_printer = belt_printer_opt && belt_printer_opt->value;
-
    auto timelapse_type_opt = m_print_config.option("timelapse_type");
    bool is_smooth_timelapse = false;
    if (enable_timelapse && timelapse_type_opt && (timelapse_type_opt->getInt() == TimelapseType::tlSmooth))
@@ -4423,11 +4390,11 @@ int CLI::run(int argc, char **argv)
        }
    };

-    auto check_plate_wipe_tower = [get_print_sequence, is_smooth_timelapse, is_belt_printer](Slic3r::GUI::PartPlate* plate, int plate_index, DynamicPrintConfig& print_config, plate_obj_size_info_t &plate_obj_size_info) {
+    auto check_plate_wipe_tower = [get_print_sequence, is_smooth_timelapse](Slic3r::GUI::PartPlate* plate, int plate_index, DynamicPrintConfig& print_config, plate_obj_size_info_t &plate_obj_size_info) {
        plate_obj_size_info.obj_bbox= plate->get_objects_bounding_box();
        BOOST_LOG_TRIVIAL(info) << boost::format("plate %1%, object bbox: min {%2%, %3%, %4%} - max {%5%, %6%, %7%}")
                    %(plate_index+1) %plate_obj_size_info.obj_bbox.min.x() % plate_obj_size_info.obj_bbox.min.y() % plate_obj_size_info.obj_bbox.min.z() %plate_obj_size_info.obj_bbox.max.x() % plate_obj_size_info.obj_bbox.max.y() % plate_obj_size_info.obj_bbox.max.z();
-        if (is_belt_printer || !print_config.has("wipe_tower_x")) {
+        if (!print_config.has("wipe_tower_x")) {
            plate_obj_size_info.has_wipe_tower = false;
            BOOST_LOG_TRIVIAL(info) << boost::format("can not found wipe_tower_x in config, set to no wipe tower");
            return;
@@ -5298,7 +5265,7 @@ int CLI::run(int argc, char **argv)
                    }
                }

-                if (!is_belt_printer && ((!arrange_cfg.is_seq_print && (assemble_plate.filaments_count > 1)) || (enable_wrapping_detect && !current_wrapping_exclude_area.empty())))
+                if ((!arrange_cfg.is_seq_print && (assemble_plate.filaments_count > 1))||(enable_wrapping_detect && !current_wrapping_exclude_area.empty()))
                {
                    //prepare the wipe tower
                    int plate_count = partplate_list.get_plate_count();
@@ -5450,7 +5417,7 @@ int CLI::run(int argc, char **argv)
                bool is_seq_print = false;
                get_print_sequence(cur_plate, m_print_config, is_seq_print);

-                if (!is_belt_printer && !is_seq_print && (assemble_plate.filaments_count > 1) && !has_wipe_tower_position)
+                if (!is_seq_print && (assemble_plate.filaments_count > 1) && !has_wipe_tower_position)
                {
                    //prepare the wipe tower
                    auto printer_structure_opt = m_print_config.option<ConfigOptionEnum<PrinterStructure>>("printer_structure");
@@ -5618,7 +5585,7 @@ int CLI::run(int argc, char **argv)
                    };
                    const int max_filament_count = plate_count > 0 ? *std::max_element(plate_filament_counts.begin(), plate_filament_counts.end()) : 0;

-                    if (!is_belt_printer && plate_needs_wipe_tower(max_filament_count))
+                    if (plate_needs_wipe_tower(max_filament_count))
                    {
                        //prepare the wipe tower
                        auto printer_structure_opt = m_print_config.option<ConfigOptionEnum<PrinterStructure>>("printer_structure");
@@ -5725,7 +5692,7 @@ int CLI::run(int argc, char **argv)
                        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": found single object mode");
                    }

-                    if (!is_belt_printer && m_print_config.has("wipe_tower_x") && (is_smooth_timelapse || !arrange_cfg.is_seq_print || (selected.size() <= 1))) {
+                    if (m_print_config.has("wipe_tower_x") && (is_smooth_timelapse || !arrange_cfg.is_seq_print || (selected.size() <= 1))) {
                        float x;
                        float y;
                        if (duplicate_count > 0) {
@@ -6350,7 +6317,7 @@ int CLI::run(int argc, char **argv)
                // The stored (or default) tower position may not fit the tower these plates
                // need, and no CLI placement site runs on a plain slice - mirror the GUI's
                // reload clamp and fit every plate's tower into the printable area first.
-                if (!is_belt_printer && m_print_config.option<ConfigOptionBool>("enable_prime_tower", true)->value) {
+                if (m_print_config.option<ConfigOptionBool>("enable_prime_tower", true)->value) {
                    for (int index = 0; index < partplate_list.get_plate_count(); index++) {
                        if ((plate_to_slice != 0) && (plate_to_slice != (index + 1)))
                            continue;
@@ -202,7 +202,6 @@ Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
 std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl, bool by_object)
 {
    const Vec2d        center = printable_area_center(cfg);
-    const bool         belt   = cfg.opt_bool("belt_printer");
    std::vector<Vec2d> cube_mins;
    if (by_object) {
        // By-object printing fires the hook only without a wipe tower, and rules out clumping detection and
@@ -213,12 +212,6 @@ std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl,
        cfg.set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
        cfg.set_key_value("skirt_loops", new ConfigOptionInt(0));
        cube_mins = {center + Vec2d(-20., -5.), center + Vec2d(10., -5.)};
-    } else if (belt) {
-        // A belt object's slicing Z starts at the belt below its leading end, well below its first
-        // printed layer, so a height range in slicing Z does not map onto the part. Two cubes one
-        // behind the other along the belt, the second on filament 2, give the one filament change
-        // instead (the purge prism is an object the GUI adds, so there is no tower to place).
-        cube_mins = {center - Vec2d(5., 15.), center + Vec2d(-5., 5.)};
    } else {
        // Clumping detection changes the tower footprint, so turn it on before placing the tower.
        if (!cfg.opt_string("wrapping_detection_gcode").empty())
@@ -236,20 +229,14 @@ std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl,
        obj->name = "cube"; // populates [input_filename_base] the way a loaded model does
        obj->add_volume(m);
        obj->add_instance();
-        if (belt && !by_object) {
-            // The second cube along the belt is on filament 2 (see cube_mins above).
-            if (&cube_min == &cube_mins.back())
-                obj->config.set_key_value("extruder", new ConfigOptionInt(2));
-        } else {
-            // Filament 2 is used only above z=4, so the upper layers carry a single filament change.
-            DynamicPrintConfig range_config;
-            range_config.set_key_value("extruder",     new ConfigOptionInt(2));
-            // Every range must carry a layer_height; use the process's own so a fine nozzle (e.g. 0.15 mm
-            // printing ~0.1 mm layers) isn't forced to a height its extrusion width can't support - that
-            // trips Flow::with_spacing.
-            range_config.set_key_value("layer_height", new ConfigOptionFloat(cfg.opt_float("layer_height")));
-            obj->layer_config_ranges[{4.0, 10.0}].assign_config(std::move(range_config));
-        }
+        // Filament 2 is used only above z=4, so the upper layers carry a single filament change.
+        DynamicPrintConfig range_config;
+        range_config.set_key_value("extruder",     new ConfigOptionInt(2));
+        // Every range must carry a layer_height; use the process's own so a fine nozzle (e.g. 0.15 mm
+        // printing ~0.1 mm layers) isn't forced to a height its extrusion width can't support - that
+        // trips Flow::with_spacing.
+        range_config.set_key_value("layer_height", new ConfigOptionFloat(cfg.opt_float("layer_height")));
+        obj->layer_config_ranges[{4.0, 10.0}].assign_config(std::move(range_config));
        obj->ensure_on_bed();
        print.auto_assign_extruders(obj);
    }
@@ -534,16 +521,11 @@ int slice_all_printers(const std::string &vendor, const std::string &outdir)
        const std::string filament_name = bundle.filaments.get_selected_preset_name();
        const std::string what          = "Printer \"" + printer + "\"";
        const std::string file_base     = sanitize_filename(vendor_name) + "__" + sanitize_filename(printer);
-        // A belt printer has no wipe tower (it purges into a prism object on the belt), so its
-        // filament change is the plain tool change set_extruder() emits rather than the tower's block.
-        const bool        belt   = bundle.printers.get_selected_preset().config.opt_bool("belt_printer");
-        const std::string marker = belt ? "\nT1\n" : "CP TOOLCHANGE START";
        if (const std::string out = slice_selection(bundle, what, false, outdir, file_base); out.empty())
            ++failures;
-        else if (out.find(marker) == std::string::npos) {
-            // The filament change never fired, so change_filament_gcode was not exercised.
-            BOOST_LOG_TRIVIAL(error) << what << " sliced but the filament change never fired (no "
-                                     << (belt ? "T1" : "CP TOOLCHANGE START") << ")";
+        else if (out.find("CP TOOLCHANGE START") == std::string::npos) {
+            // The filament change never rode the tower, so change_filament_gcode was not exercised.
+            BOOST_LOG_TRIVIAL(error) << what << " sliced but the filament change never fired (no CP TOOLCHANGE START)";
            ++failures;
        }
        cover(bundle.prints.get_selected_preset());
@@ -299,15 +299,7 @@ Points get_shrink_bedpts(const DynamicPrintConfig* print_cfg, const ArrangeParam
 template<class PConf>
 void fill_config(PConf& pcfg, const ArrangeParams &params) {

-        if (params.is_belt) {
-            // Pack from the end of the belt that prints first, and keep the pile on the
-            // bed when it is larger than the room around that end.
-            pcfg.starting_point = !params.belt_reversed    ? PConf::Alignment::BOTTOM_LEFT :
-                                  params.belt_axis == 1    ? PConf::Alignment::TOP_LEFT :
-                                                             PConf::Alignment::BOTTOM_RIGHT;
-            pcfg.clamp_to_bin = true;
-        }
-        else if (params.is_seq_print) {
+        if (params.is_seq_print) {
            // Start placing the items from the center of the print bed
            pcfg.starting_point = PConf::Alignment::BOTTOM_LEFT;
        }
@@ -452,50 +444,6 @@ protected:
        return bindist;
    }

-    // Belt printers pack from the end of the belt that prints first, and a corner
-    // packer's checks (pile inside the bin, pack origin) apply to them as well.
-    bool corner_packing() const { return params.is_belt || m_pconf.starting_point == PConfig::Alignment::BOTTOM_LEFT; }
-
-    static double at(const Box::PointType &pt, int i) { return double(i == 0 ? getX(pt) : getY(pt)); }
-
-    // Position along the belt in print order: increasing from the end that prints first.
-    double belt_pos(const Box::PointType &pt) const { return params.belt_reversed ? -at(pt, params.belt_axis) : at(pt, params.belt_axis); }
-    double belt_start(const Box &bb) const { return belt_pos(params.belt_reversed ? bb.maxCorner() : bb.minCorner()); }
-    double belt_end(const Box &bb) const { return belt_pos(params.belt_reversed ? bb.minCorner() : bb.maxCorner()); }
-
-    // The corner of the bin the belt pile grows from.
-    Box::PointType belt_origin() const
-    {
-        const Box bb = sl::boundingBox(m_bin);
-        auto o = bb.minCorner();
-        if (params.belt_reversed) {
-            if (params.belt_axis == 0) setX(o, getX(bb.maxCorner()));
-            else                       setY(o, getY(bb.maxCorner()));
-        }
-        return o;
-    }
-
-    // An item's far edge in print order is what it costs (so a row fills across the
-    // belt before the pile advances), with a slight pull toward the near lateral
-    // edge and the same penalty as the bottom-left heuristic for sitting outside
-    // the corner.
-    double dist_along_belt(const Box &ibb)
-    {
-        const Box    bin = sl::boundingBox(m_bin);
-        const int    l   = 1 - params.belt_axis;
-        const double lat = at(ibb.minCorner(), l) - at(bin.minCorner(), l);
-        double       d   = belt_end(ibb) - belt_start(bin);
-        d += lat < 0 ? 10 * -lat : 0.1 * lat;
-        if (double behind = belt_start(ibb) - belt_start(bin); behind < 0)
-            d += 10 * -behind;
-        return norm(d);
-    }
-
-    double corner_bindist(const Box &ibb, const Slic3r::Point &origin_pack)
-    {
-        return params.is_belt ? dist_along_belt(ibb) : dist_for_BOTTOM_LEFT(ibb, origin_pack);
-    }
-
    double dist_to_bin(const Box& ibb, const Slic3r::Point& origin_pack, typename Packer::PlacementConfig::Alignment starting_point_alignment)
    {
        double bindist = 0;
@@ -585,8 +533,8 @@ protected:

            // The smalles distance from the arranged pile center:
            double dist = norm(*(std::min_element(dists.begin(), dists.end())));
-            if (corner_packing()) {
-                double bindist = corner_bindist(ibb, origin_pack);
+            if (m_pconf.starting_point == PConfig::Alignment::BOTTOM_LEFT) {
+                double bindist = dist_for_BOTTOM_LEFT(ibb, origin_pack);
                score = 0.2 * dist + 0.8 * bindist;
            }
            else {
@@ -643,8 +591,8 @@ protected:
            break;
        }
        case LAST_BIG_ITEM: {
-            if (corner_packing()) {
-                score = corner_bindist(ibb, origin_pack);
+            if (m_pconf.starting_point == PConfig::Alignment::BOTTOM_LEFT) {
+                score = dist_for_BOTTOM_LEFT(ibb, origin_pack);
            }
            else {
                if (m_pilebb.defined)
@@ -659,8 +607,8 @@ protected:
            // already processed bigger items.
            // No need to play around with the anchor points, the center will be
            // just fine for small items
-            if (corner_packing())
-                score = corner_bindist(ibb, origin_pack);
+            if (m_pconf.starting_point == PConfig::Alignment::BOTTOM_LEFT)
+                score = dist_for_BOTTOM_LEFT(ibb, origin_pack);
            else {
                // Align mainly around existing items
                score = 0.8 * norm(pl::distance(ibb.center(), bigbb.center()))+ 0.2*norm(pl::distance(ibb.center(), origin_pack));
@@ -761,28 +709,6 @@ protected:
            score += 1 * (new_extruder_cnt-last_extruder_cnt);
        }

-        // On a belt the parts print in belt order, so every colour change between
-        // parts is a filament change. Items arrive sorted by extruder and the pile
-        // grows from the leading end; keep each colour's run contiguous by charging
-        // an item for every packed item of another colour it does not fully follow,
-        // counting the tilted layers that reach belt_tilt_slope * height past that
-        // item's far edge.
-        if (params.is_belt && !params.is_seq_print) {
-            const std::set<int> item_colours(item.extrude_ids.begin(), item.extrude_ids.end());
-            const double        item_start = belt_start(ibb);
-            for (Item &p : m_items) {
-                if (p.is_virt_object)
-                    continue;
-                const std::set<int> p_colours(p.extrude_ids.begin(), p.extrude_ids.end());
-                const bool same_colour = std::includes(item_colours.begin(), item_colours.end(), p_colours.begin(), p_colours.end())
-                                      || std::includes(p_colours.begin(), p_colours.end(), item_colours.begin(), item_colours.end());
-                if (same_colour)
-                    continue;
-                if (item_start < belt_end(p.boundingBox()) + scaled(p.height * params.belt_tilt_slope))
-                    score += 10.;
-            }
-        }
-
        return std::make_tuple(score, fullbb);
    }

@@ -859,8 +785,7 @@ public:

            auto binbb = sl::boundingBox(m_bin);

-            auto starting_point = this->params.is_belt ? belt_origin() :
-                cfg.starting_point == PConfig::Alignment::BOTTOM_LEFT ? binbb.minCorner() : binbb.center();
+            auto starting_point = cfg.starting_point == PConfig::Alignment::BOTTOM_LEFT ? binbb.minCorner() : binbb.center();
            // if we have wipe tower, items should be arranged around wipe tower
            for (Item itm : items) {
                if (itm.is_wipe_tower) {
@@ -1011,7 +936,7 @@ std::function<double(const Item &, const ItemGroup&)> AutoArranger<ExPolygon>::g
        auto mp = m_merged_pile;
        mp.emplace_back(itm.transformedShape());
        auto chull = sl::convexHull(mp);
-        if (corner_packing())
+        if (m_pconf.starting_point == PConfig::Alignment::BOTTOM_LEFT)
        {
            if (!sl::isInside(chull, m_bin))
                score += LARGE_COST_TO_REJECT;
@@ -146,13 +146,6 @@ struct ArrangeParams {
    float nozzle_height = 0;
    float printable_height = 256.0;
    Vec2d align_center{ 0.5,0.5 };
-    // Belt printer: items print in the order they lie along the belt axis, from
-    // its low end unless belt_reversed, and a part's top prints
-    // belt_tilt_slope * height further along it than its base.
-    bool  is_belt         = false;
-    int   belt_axis       = 1;   // 0 = X, 1 = Y
-    bool  belt_reversed   = false;
-    float belt_tilt_slope = 1.f; // cot(belt tilt angle), 0 when the belt is not tilted

    ArrangePolygons excluded_regions;   // regions cant't be used
    ArrangePolygons nonprefered_regions; // regions can be used but not prefered
@@ -1,562 +0,0 @@
-#include <limits>
-#include "BeltBrim.hpp"
-
-#include "ClipperUtils.hpp"
-#include "Flow.hpp"
-#include "Layer.hpp"
-#include "Polygon.hpp"
-#include "Print.hpp"
-#include "ShortestPath.hpp"
-#include "Support/BeltFloorContext.hpp"
-#include "BoundingBox.hpp"
-#include "ExPolygon.hpp"
-#include "ExtrusionEntity.hpp"
-#include "ExtrusionEntityCollection.hpp"
-#include "Point.hpp"
-#include "Polyline.hpp"
-#include "PrintConfig.hpp"
-#include "libslic3r.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <utility>
-#include <vector>
-
-namespace Slic3r {
-
-// ---------------------------------------------------------------- scaling
-
-static inline Point scale_u_point(const Point &p, int from_axis, double factor)
-{
-    // llround, not a cast: casting truncates toward zero, so a round trip would
-    // walk every vertex toward the origin by up to one unit per pass.
-    return from_axis == 0 ?
-        Point(coord_t(std::llround(double(p.x()) * factor)), p.y()) :
-        Point(p.x(), coord_t(std::llround(double(p.y()) * factor)));
-}
-
-static inline void scale_u_polygon(Polygon &poly, int from_axis, double factor)
-{
-    for (Point &p : poly.points)
-        p = scale_u_point(p, from_axis, factor);
-}
-
-ExPolygons belt_scale_u(const ExPolygons &src, const BeltBrimFrame &frame, double factor)
-{
-    ExPolygons out = src;
-    for (ExPolygon &ex : out) {
-        scale_u_polygon(ex.contour, frame.from_axis, factor);
-        for (Polygon &hole : ex.holes)
-            scale_u_polygon(hole, frame.from_axis, factor);
-    }
-    return out;
-}
-
-Polylines belt_scale_u(const Polylines &src, const BeltBrimFrame &frame, double factor)
-{
-    Polylines out = src;
-    for (Polyline &pl : out)
-        for (Point &p : pl.points)
-            p = scale_u_point(p, frame.from_axis, factor);
-    return out;
-}
-
-// ---------------------------------------------------------------- sweep
-
-ExPolygons sweep_ex(const ExPolygons &src, const Point &t)
-{
-    if (src.empty())
-        return {};
-    if (t == Point(0, 0))
-        return src;
-
-    // One parallelogram per boundary edge.  Together with P and P + t these
-    // cover the Minkowski sum exactly: for any q = p + s*t with p in P and
-    // s in [0, 1], let s* be the smallest lambda >= 0 with q - lambda*t in P.
-    // Either s* == 0 (so q is in P) or q - s* * t lies on some boundary edge e,
-    // putting q in that edge's parallelogram.  Hole edges must be included, or
-    // holes narrower than t along t would wrongly survive the sweep.
-    Polygons quads;
-    for (const ExPolygon &ex : src)
-        for (size_t c = 0; c < ex.num_contours(); ++ c)
-            for (const Line &e : ex.contour_or_hole(c).lines()) {
-                if (e.a == e.b)
-                    continue;
-                Polygon q;
-                q.points = { e.a, e.b, e.b + t, e.a + t };
-                // The non-zero fill rule counts a clockwise ring as -1, which
-                // would punch a hole instead of adding material.  Edges parallel
-                // to t give a zero-area quad; Clipper discards those harmlessly.
-                if (q.is_clockwise())
-                    q.reverse();
-                quads.emplace_back(std::move(q));
-            }
-
-    ExPolygons shifted = src;
-    for (ExPolygon &ex : shifted)
-        ex.translate(t);
-
-    // union_ex(ExPolygons, Polygons) uses pftNonZero, which is the fill rule the
-    // argument above relies on.
-    return union_ex(union_ex(src, shifted), quads);
-}
-
-// ---------------------------------------------------------------- brim region
-
-ExPolygons belt_brim_region(const ExPolygons    &footprint_flat,
-                            bool                 has_outer,
-                            bool                 has_inner,
-                            coord_t              brim_width,
-                            coord_t              object_gap,
-                            coord_t              leading,
-                            coord_t              lateral,
-                            const BeltBrimFrame &frame)
-{
-    if (footprint_flat.empty() || (! has_outer && ! has_inner))
-        return {};
-
-    ExPolygons out;
-
-    if (has_outer) {
-        // Offset the outer ring from the contours only, so a hole cannot punch
-        // through it.  Same reasoning as the plate brim in Brim.cpp.
-        Polygons contours;
-        contours.reserve(footprint_flat.size());
-        for (const ExPolygon &ex : footprint_flat)
-            contours.emplace_back(ex.contour);
-
-        // Inner and outer boundary offset from the same polygon, to avoid
-        // round-off mismatch between them.
-        ExPolygons inner = offset_ex(contours, float(object_gap), jtRound, SCALED_RESOLUTION);
-
-        // Close the interior before offsetting outwards.  A belt contact patch is often a
-        // narrow, broken-up strip, and the offset rings of two islands less than
-        // 2 x brim_width apart merge and fill the space between them - space that lies
-        // UNDER the part, which is not what "outer brim" means.  Closing also swallows
-        // holes in the patch for the same reason.  Concavity-filling only, so an apron or
-        // any other outward protrusion is untouched.
-        ExPolygons envelope = brim_width > 0 ? closing_ex(inner, float(brim_width)) : inner;
-
-        ExPolygons base  = envelope;
-        if (leading > 0) {
-            // Sweep downhill from the gapped keep-out, so the apron is contiguous with
-            // the ring instead of starting inside the gap.
-            const Point t = frame.from_axis == 0 ?
-                Point(frame.downhill_sign() * leading, 0) :
-                Point(0, frame.downhill_sign() * leading);
-            base = union_ex(base, sweep_ex(envelope, t));
-        }
-        if (lateral > 0) {
-            // Across the belt, both ways.  Swept from `base` so the apron is widened
-            // too, and in the flattened frame the cross-belt axis is unscaled, so this
-            // distance is already a true on-belt distance.
-            const Point t = frame.from_axis == 0 ? Point(0, lateral) : Point(lateral, 0);
-            ExPolygons widened = union_ex(sweep_ex(base, t), sweep_ex(base, Point(-t.x(), -t.y())));
-            base = union_ex(base, to_polygons(widened));
-        }
-        ExPolygons outer = offset_ex(base, float(brim_width), jtRound, SCALED_RESOLUTION);
-        expolygons_append(out, diff_ex(outer, envelope));
-    }
-
-    if (has_inner) {
-        // Holes reversed so a negative offset grows inward, mirroring Brim.cpp.
-        // No apron here: an apron growing into a hole interior is never useful.
-        Polygons holes;
-        for (const ExPolygon &ex : footprint_flat)
-            polygons_append(holes, ex.holes);
-        polygons_reverse(holes);
-        if (! holes.empty()) {
-            ExPolygons hole_inner = offset_ex(holes, - float(brim_width + object_gap));
-            ExPolygons hole_outer = offset_ex(holes, - float(object_gap));
-            expolygons_append(out, intersection_ex(diff_ex(hole_outer, hole_inner), holes));
-        }
-    }
-
-    return union_ex(out);
-}
-
-// ---------------------------------------------------------------- line lattice
-
-std::vector<coord_t> belt_brim_line_positions(coord_t u_lo,
-                                              coord_t u_hi,
-                                              coord_t pitch_u,
-                                              coord_t u_anchor)
-{
-    std::vector<coord_t> out;
-    if (pitch_u <= 0 || u_hi <= u_lo)
-        return out;
-
-    // Walk the lattice from just below u_lo.  Integer arithmetic throughout, so
-    // the half-open interval needs no epsilon: a point landing exactly on u_hi
-    // belongs to the next band.
-    int64_t k = int64_t(std::floor(double(u_lo - u_anchor) / double(pitch_u))) - 1;
-    while (u_anchor + coord_t(k) * pitch_u < u_lo)
-        ++ k;
-    for (;; ++ k) {
-        const coord_t u = u_anchor + coord_t(k) * pitch_u;
-        if (u >= u_hi)
-            break;
-        out.emplace_back(u);
-    }
-    return out;
-}
-
-// ---------------------------------------------------------------- pipeline
-
-// A band of the belt surface as an explicit box, clamped to `bounds` along the
-// shear axis.  Deliberately not BeltFloorContext::surface_polygon(): those
-// half-planes span +-1000 mm, which is wasteful to clip against and dangerous to
-// feed through the flattening scale.
-static Polygon band_box(const BoundingBox &bounds, int from_axis, coordf_t u_lo, coordf_t u_hi)
-{
-    coord_t lo = scale_(u_lo);
-    coord_t hi = scale_(u_hi);
-    const coord_t bmin = from_axis == 0 ? bounds.min.x() : bounds.min.y();
-    const coord_t bmax = from_axis == 0 ? bounds.max.x() : bounds.max.y();
-    lo = std::max(lo, bmin);
-    hi = std::min(hi, bmax);
-    Polygon poly;
-    if (hi <= lo)
-        return poly;
-    if (from_axis == 0)
-        poly.points = { Point(lo, bounds.min.y()), Point(hi, bounds.min.y()),
-                        Point(hi, bounds.max.y()), Point(lo, bounds.max.y()) };
-    else
-        poly.points = { Point(bounds.min.x(), lo), Point(bounds.max.x(), lo),
-                        Point(bounds.max.x(), hi), Point(bounds.min.x(), hi) };
-    return poly;
-}
-
-ExPolygons belt_brim_clip_leading_edge(const ExPolygons &region, const BeltBrimFrame &frame, coordf_t u_cut)
-{
-    if (region.empty())
-        return region;
-    BoundingBox keep_bb = get_extents(region);
-    keep_bb.offset(scale_(1.));
-    const bool    low_side = frame.downhill_sign() < 0;   // downhill is -u
-    const Polygon keep = band_box(keep_bb, frame.from_axis,
-        low_side ? unscale<double>(frame.from_axis == 0 ? keep_bb.min.x() : keep_bb.min.y()) : u_cut,
-        low_side ? u_cut : unscale<double>(frame.from_axis == 0 ? keep_bb.max.x() : keep_bb.max.y()));
-    return keep.empty() ? ExPolygons{} : intersection_ex(region, Polygons{ keep });
-}
-
-// Everything the per-band line generator needs, gathered once per object.
-struct BeltBrimContext
-{
-    BeltFloorContext ctx;
-    BeltBrimFrame    frame;
-    ExPolygons       region;      // brim region, object-local slicing XY
-    BoundingBox      region_bbox;
-    Flow             brim_flow;
-    coord_t          pitch_u   = 0;
-    coord_t          u_anchor  = 0;
-    double           in_plane_pitch = 0.;   // mm
-};
-
-// Emit the cross-belt brim lines that belong to the band [print_z - height, print_z].
-static void belt_brim_band_paths(const BeltBrimContext      &bc,
-                                 coordf_t                    print_z,
-                                 coordf_t                    height,
-                                 const Polygons             &obstacles,
-                                 ExtrusionEntityCollection  &out,
-                                 ExPolygons                 &areas_out)
-{
-    coordf_t u_lo = bc.ctx.cutoff_u(print_z - height);
-    coordf_t u_hi = bc.ctx.cutoff_u(print_z);
-    if (u_lo > u_hi)
-        std::swap(u_lo, u_hi);
-
-    // How wide this band is measured ON the belt, versus one nominal bead.
-    const double band_in_plane = (u_hi - u_lo) * bc.frame.u_stretch();
-
-    // Fraction of the layer height at which a line sits above the belt.  Toward the
-    // downhill edge, so the sheet is reasonably thick while the nozzle stays clear of
-    // the belt itself.
-    static constexpr double BAND_CLEARANCE_FRACTION = 0.75;
-
-    std::vector<coord_t> us;
-    double uniform_clearance = 0.;   // 0 => derive per line from its own position
-    double line_pitch        = bc.in_plane_pitch;
-    // One line also serves a band up to half a bead wider than the nominal pitch (a 0.3 mm
-    // first layer at 45 degrees): its flow is matched to the band, so the bead is that much
-    // wider. Two lattice lines in such a band would land almost on top of each other.
-    if (band_in_plane <= 1.5 * bc.in_plane_pitch + EPSILON) {
-        // Steep belt, which is the normal case: the band is narrower than one bead, so
-        // exactly one line fits.  Place it at a FIXED fraction of the band rather than
-        // on a nominal-spacing lattice.  On a lattice each line lands at an arbitrary
-        // point in its band, the clearance sweeps [0, height] from band to band, and the
-        // bead width therefore varies by 2x - visible as ragged, uneven brim lines.
-        // Anchoring to the band makes the clearance identical everywhere, so every bead
-        // is the same width.
-        //
-        // The spacing is then whatever the bands give (height / sin(tilt) on the belt)
-        // rather than the nominal bead spacing, so the flow below is matched to THAT
-        // pitch.  Matched flow at the real pitch is what keeps the sheet uniform and
-        // gap-free; using nominal flow at band spacing would over-feed it.
-        us.push_back(scale_(bc.ctx.cutoff_u(print_z - BAND_CLEARANCE_FRACTION * height)));
-        uniform_clearance = BAND_CLEARANCE_FRACTION * height;
-        line_pitch        = band_in_plane;
-    } else {
-        // Shallow belt: the band is wider than a bead, so it takes several lines and they
-        // have to sit on the nominal lattice.  Their clearances then differ, and so do
-        // their widths - unavoidable here, but shallow belts are the rare case.
-        us = belt_brim_line_positions(scale_(u_lo), scale_(u_hi), bc.pitch_u, bc.u_anchor);
-    }
-    if (us.empty())
-        return;
-
-    const Polygons region_polys = to_polygons(bc.region);
-
-    // One lattice line at a time: the clearance - and therefore the extrusion
-    // volume - is a property of the line's u, so the pieces of different lines
-    // must not be pooled before the flow is resolved.
-    // Overshoot the region so the clip, not the line's ends, decides the extent.
-    const coord_t margin = coord_t(SCALED_EPSILON) + 1;
-    coord_t       u_prev = std::numeric_limits<coord_t>::min();
-    for (coord_t u : us) {
-        // Nozzle-to-belt clearance for this line.  Constant along the line, because the
-        // belt height depends only on the shear-axis coordinate.  Band-anchored lines
-        // share one clearance by construction; lattice lines (shallow belts, or a first
-        // layer thick enough that the band is wider than a bead) each get their own.
-        //
-        // A lattice line can fall where the belt is only a hair below the band's print_z.
-        // The bead there would be laid scraping the belt while its flow is sized for a
-        // taller cell, so it is moved uphill to the same fraction of the band the
-        // single-line case uses.  (The clearance is along slice Z; the real gap under the
-        // nozzle is clearance x cos(tilt), 0.53 h at 45 degrees for the 0.75 fraction.)
-        double clearance = uniform_clearance;
-        if (clearance <= 0.) {
-            const Point probe = bc.frame.from_axis == 0 ? Point(u, 0) : Point(0, u);
-            clearance = print_z - bc.ctx.floor_print_z(probe);
-            if (clearance < BAND_CLEARANCE_FRACTION * height) {
-                clearance = BAND_CLEARANCE_FRACTION * height;
-                u         = scale_(bc.ctx.cutoff_u(print_z - clearance));
-            }
-            clearance = std::min(clearance, height);
-        }
-        // A line moved uphill can land on, or almost on, its neighbour; two beads closer
-        // than half a pitch would be laid into the same cell.
-        if (u_prev != std::numeric_limits<coord_t>::min() && std::abs(u - u_prev) < bc.pitch_u / 2)
-            continue;
-        u_prev = u;
-
-        Polyline line;
-        if (bc.frame.from_axis == 0)
-            line.points = { Point(u, coord_t(bc.region_bbox.min.y() - margin)),
-                            Point(u, coord_t(bc.region_bbox.max.y() + margin)) };
-        else
-            line.points = { Point(coord_t(bc.region_bbox.min.x() - margin), u),
-                            Point(coord_t(bc.region_bbox.max.x() + margin), u) };
-
-        Polylines pieces = intersection_pl(Polylines{ line }, region_polys);
-        if (! obstacles.empty())
-            pieces = diff_pl(pieces, obstacles);
-        if (pieces.empty())
-            continue;
-
-        // with_cross_section, not with_height: it reaches the prescribed volume while
-        // KEEPING the extrusion spacing, so the bead is sized to fill exactly one
-        // pitch x clearance cell of the sheet.
-        const Flow f = bc.brim_flow.with_cross_section(float(line_pitch * clearance));
-
-        // Footprint of these beads, for the first-layer convex hull and bbox.
-        for (const Polygon &p : offset(pieces, 0.5f * float(f.scaled_width())))
-            areas_out.emplace_back(ExPolygon(p));
-
-        extrusion_entities_append_paths(out.entities, chain_polylines(std::move(pieces)),
-                                        erBrim, f.mm3_per_mm(), f.width(), float(clearance));
-    }
-}
-
-// Union of everything extruded at `print_z` that the brim must keep clear of, expressed
-// in `self`'s local slicing frame.  Includes `self` itself: its slice at this Z can
-// overhang outside the belt footprint and land in the brim ring, which the flattened
-// brim_object_gap - a belt-plane separation - does not cover.
-//
-// SEQUENCING: this reads every object's layers and this object's own support layers.
-// Another object's support step shifts that object's layer Z into the object frame for
-// the duration of the run (PrintObject::_generate_support_material()), so the brims must
-// not overlap with the parallel support step: Print::process() generates them one object
-// after the other once that step is over (PrintObject::generate_belt_brim()), and an
-// object that arrives on or leaves the plate invalidates the other brim owners' support
-// step (PrintApply.cpp) so their brims are clipped against what is there now.  Only this
-// object's supports are dodged; another object's support at the same Z is not.
-// `region_bbox` bounds the brim; anything outside it cannot clip a brim line, so whole
-// objects are skipped without materialising their polygons.  On a typical plate the
-// objects do not overlap and every foreign object drops out here, which matters because
-// this runs once per band - hundreds of times per object.
-static Polygons belt_brim_obstacles(const Print &print, const PrintObject &self,
-                                    const BoundingBox &region_bbox, coordf_t print_z, coordf_t tol)
-{
-    const Point shift_self = self.instances().empty() ? Point(0, 0)
-                                                      : self.instances().front().shift_without_plate_offset();
-    Polygons out;
-    for (const PrintObject *o : print.objects()) {
-        const bool is_self = (o == &self);
-        for (const PrintInstance &inst : o->instances()) {
-            const Point delta = inst.shift_without_plate_offset() - shift_self;
-            if (const Layer *l = o->get_layer_at_printz(print_z, tol)) {
-                BoundingBox lb = get_extents(l->lslices);
-                lb.translate(delta.x(), delta.y());
-                if (lb.overlap(region_bbox)) {
-                    Polygons ps = to_polygons(l->lslices);
-                    for (Polygon &p : ps)
-                        p.translate(delta);
-                    polygons_append(out, std::move(ps));
-                }
-            }
-            if (! is_self)
-                continue;
-            if (const SupportLayer *sl = o->get_support_layer_at_printz(print_z, tol)) {
-                Polygons ps = sl->support_fills.polygons_covered_by_spacing();
-                for (Polygon &p : ps)
-                    p.translate(delta);
-                polygons_append(out, std::move(ps));
-            }
-        }
-    }
-    if (out.size() < 2)
-        return out;   // union_() of 0 or 1 polygons is pure overhead
-    return union_(out);
-}
-
-void make_belt_brim(PrintObject &object)
-{
-    object.clear_belt_brim();
-    if (! object.has_belt_brim())
-        return;
-
-    const Print &print = *object.print();
-    BeltBrimContext bc;
-    if (! bc.ctx.init(object.slicing_parameters(), print.config()))
-        return;
-    bc.frame = BeltBrimFrame{ bc.ctx.shear_factor(), bc.ctx.from_axis() };
-
-    const size_t nlayers = object.layers().size();
-    if (nlayers == 0)
-        return;
-
-    // 1. Belt footprint: the union of each layer's slice clipped to that layer's
-    //    own contact band.  This is the object's bottom face, which on a belt is
-    //    spread over every layer instead of sitting in layer 0.
-    ExPolygons footprint_acc;
-    // The first layer that touches the belt: where the leading-edge brim is cut.
-    const Layer *first_contact = nullptr;
-    for (size_t i = 0; i < nlayers; ++ i) {
-        const Layer &layer = *object.layers()[i];
-        if (layer.lslices.empty())
-            continue;
-        // print_z - height, not the previous layer's print_z: variable layer
-        // heights make the latter wrong.
-        coordf_t u_lo = bc.ctx.cutoff_u(layer.print_z - layer.height);
-        coordf_t u_hi = bc.ctx.cutoff_u(layer.print_z);
-        if (u_lo > u_hi)
-            std::swap(u_lo, u_hi);
-        BoundingBox bb = get_extents(layer.lslices);
-        bb.offset(scale_(1.));
-        const Polygon band = band_box(bb, bc.frame.from_axis, u_lo, u_hi);
-        if (band.empty())
-            continue;
-        ExPolygons contact = intersection_ex(layer.lslices, Polygons{ band });
-        if (contact.empty())
-            continue;
-        if (first_contact == nullptr)
-            first_contact = &layer;
-        expolygons_append(footprint_acc, std::move(contact));
-    }
-    const ExPolygons footprint = union_ex(footprint_acc);
-    if (footprint.empty())
-        return;
-
-    // 2. Brim region, offset in the flattened (true on-belt) metric.
-    const PrintObjectConfig &cfg = object.config();
-    bc.brim_flow = print.brim_flow();
-    const double  flow_w = bc.brim_flow.scaled_spacing() * SCALING_FACTOR;
-    // Quantize to an even number of lines, as the plate brim does.
-    const coord_t width   = scale_(std::floor(cfg.brim_width.value / flow_w / 2) * flow_w * 2);
-    const coord_t leading = scale_(cfg.leading_brim_length.value);
-    const coord_t lateral = scale_(cfg.extra_brim_width.value);
-    const coord_t gap     = scale_(cfg.brim_object_gap.value);
-
-    // Belt printers collapse Auto / Mouse ear / Painted to outer-only: the auto width
-    // heuristic and flat ear discs have no meaning on a tilted plane.  Leading-edge-only
-    // is an outer brim too; it is narrowed down to the first contact below.
-    const BrimType bt = cfg.brim_type.value;
-    const bool has_outer = bt == btOuterOnly || bt == btOuterAndInner
-                        || bt == btAutoBrim  || bt == btEar || bt == btPainted
-                        || bt == btLeadingEdgeOnly;
-    const bool has_inner = bt == btInnerOnly || bt == btOuterAndInner;
-
-    bc.region = belt_unflatten(
-        belt_brim_region(belt_flatten(footprint, bc.frame), has_outer, has_inner,
-                         width, gap, leading, lateral, bc.frame),
-        bc.frame);
-
-    if (bt == btLeadingEdgeOnly && first_contact != nullptr && ! bc.region.empty())
-        // The cut is the uphill edge of the first contact's band: everything past it
-        // belongs to later contacts.  The first contact is the first layer that touches
-        // the belt (step 1), neither layers().front(), an empty lead-in layer, nor the
-        // first layer with geometry, which is an overhang's tip when the part overhangs
-        // its leading end: both lie ahead of the part.
-        bc.region = belt_brim_clip_leading_edge(bc.region, bc.frame, bc.ctx.cutoff_u(first_contact->print_z));
-
-    if (bc.region.empty())
-        return;
-    bc.region_bbox = get_extents(bc.region);
-
-    // 3. Line lattice.  Fixed pitch in the flattened metric, anchored at the
-    //    footprint's leading-most edge so lines stay collinear across
-    //    disconnected islands and across the apron prologue.
-    bc.pitch_u = std::max<coord_t>(1, coord_t(bc.brim_flow.scaled_spacing() * bc.frame.cos_tilt()));
-    bc.in_plane_pitch = unscale<double>(bc.pitch_u) * bc.frame.u_stretch();
-    {
-        const BoundingBox fbb = get_extents(footprint);
-        const bool low_side = bc.frame.shear > 0.;
-        bc.u_anchor = bc.frame.from_axis == 0 ? (low_side ? fbb.min.x() : fbb.max.x())
-                                              : (low_side ? fbb.min.y() : fbb.max.y());
-    }
-
-    // 4. Bands coincident with an object layer.
-    std::vector<ExtrusionEntityCollection> by_layer(nlayers);
-    std::vector<ExPolygons>                areas_by_layer(nlayers);
-    for (size_t i = 0; i < nlayers; ++ i) {
-        const Layer &layer = *object.layers()[i];
-        const Polygons obstacles = belt_brim_obstacles(print, object, bc.region_bbox, layer.print_z, 0.5 * layer.height);
-        belt_brim_band_paths(bc, layer.print_z, layer.height, obstacles, by_layer[i], areas_by_layer[i]);
-    }
-
-    // 5. Apron prologue: the part of the region downhill of the object's first
-    //    layer, which has no object layer to ride on.
-    std::vector<BeltBrimBand> prologue;
-    {
-        const Layer   &first  = *object.layers().front();
-        const coordf_t h      = first.height;
-        const bool     low_side = bc.frame.shear > 0.;
-        const coord_t  u_lead_s = bc.frame.from_axis == 0
-            ? (low_side ? bc.region_bbox.min.x() : bc.region_bbox.max.x())
-            : (low_side ? bc.region_bbox.min.y() : bc.region_bbox.max.y());
-        const coordf_t u_lead  = unscale<double>(u_lead_s);
-        // print_z at which the belt surface crosses the region's leading edge.
-        const coordf_t z_lead  = bc.ctx.shear_factor() * u_lead
-                               + bc.ctx.floor_offset() + bc.ctx.z_shift();
-        if (h > EPSILON)
-            for (coordf_t z = first.print_z - h; z > z_lead - h; z -= h) {
-                const Polygons obstacles = belt_brim_obstacles(print, object, bc.region_bbox, z, 0.5 * h);
-                BeltBrimBand band;
-                band.print_z = z;
-                band.height  = h;
-                belt_brim_band_paths(bc, z, h, obstacles, band.fills, band.areas);
-                if (! band.fills.empty())
-                    prologue.emplace_back(std::move(band));
-            }
-        // Lowest Z first, so collect_layers_to_print sees them in print order.
-        std::reverse(prologue.begin(), prologue.end());
-    }
-
-    object.set_belt_brim(std::move(by_layer), std::move(areas_by_layer), std::move(prologue));
-}
-
-} // namespace Slic3r
@@ -1,178 +0,0 @@
-#ifndef slic3r_BeltBrim_hpp_
-#define slic3r_BeltBrim_hpp_
-
-#include "ExPolygon.hpp"
-#include "ExtrusionEntityCollection.hpp"
-#include "Point.hpp"
-#include "Polyline.hpp"
-#include "libslic3r.h"
-
-#include <cmath>
-#include <vector>
-
-// Belt-printer brim geometry.
-//
-// A belt printer slices in a ROTATED frame, so the belt surface is not the
-// Z=0 bed plane but a tilted plane in slicing space:
-//
-//     z_slicing(u) = shear * u + floor_offset + z_shift,   u = X or Y
-//
-// where `shear == tan(tilt)` (SlicingParameters::belt_floor_shear_factor) and
-// the axis is selected by SlicingParameters::belt_floor_from_axis.  See
-// Support/BeltFloorContext.hpp for the canonical accessors.
-//
-// Consequences that drive everything in this file:
-//
-//   * A horizontal slicing layer touches the belt only along a narrow strip at
-//     its leading edge, `layer_height / shear` wide (~0.2 mm at 45 degrees).
-//     The object's belt footprint - its bottom face - is therefore spread over
-//     every layer, not contained in layer 0.
-//   * Distances measured in slicing XY are NOT on-belt distances: moving `du`
-//     along the shear axis travels `du / cos(tilt)` across the belt.  So brim
-//     offsets have to be taken in a "flattened" space where the shear axis is
-//     stretched by `1 / cos(tilt)`, then mapped back.
-//   * Brim ahead of the part (downhill) lies at slicing Z BELOW the object's
-//     first layer, because the object's layer 0 is precisely its leading
-//     contact with the belt.
-//
-// Everything here is pure geometry on ExPolygons/Polylines so it can be unit
-// tested without a Print.  Keep user-visible strings out of this file: it is
-// not listed in localization/i18n/list.txt.
-
-namespace Slic3r {
-
-// Tilt window within which the BELT plane, not the bed plane, is the adhesion
-// surface.  Below ~1 degree a belt is a flat bed as far as adhesion goes, and the
-// contact band would be layer_height/sin(tilt) - tens of millimetres - so the
-// ordinary plate brim is both correct and cheaper.  Above ~85 degrees the whole
-// brim compresses into a sliver and is not worth generating.
-inline constexpr double BELT_BRIM_MIN_TILT_DEG = 1.;
-inline constexpr double BELT_BRIM_MAX_TILT_DEG = 85.;
-
-// Description of the tilted belt plane, reduced to what the brim geometry needs.
-struct BeltBrimFrame
-{
-    // tan(tilt).  Sign selects which way is downhill.
-    double shear     = 0.;
-    // 0 = X, 1 = Y.  Matches BeltFloorContext::from_axis().
-    int    from_axis = 1;
-
-    // 1 / cos(tilt).  Stretch factor that turns a projected distance along
-    // `from_axis` into the true distance travelled across the belt.
-    double u_stretch() const { return std::sqrt(1. + shear * shear); }
-    // cos(tilt).  The inverse mapping.
-    double cos_tilt()  const { return 1. / this->u_stretch(); }
-    // Downhill is where the belt surface is lower, i.e. printed earlier, i.e.
-    // the leading edge of the part.  For shear > 0 that is -u.
-    int    downhill_sign() const { return shear > 0. ? -1 : +1; }
-};
-
-// Scale only the `from_axis` component by `factor`, rounding to nearest.
-//
-// Deliberately not MultiPoint::scale(fx, fy) / ExPolygon::scale(fx, fy): those
-// truncate toward zero, which is asymmetric about the origin and loses up to a
-// full coordinate unit per vertex on every round trip.
-ExPolygons belt_scale_u(const ExPolygons &src, const BeltBrimFrame &frame, double factor);
-Polylines  belt_scale_u(const Polylines  &src, const BeltBrimFrame &frame, double factor);
-
-// Into / out of the space where Euclidean offsets equal true on-belt distances.
-inline ExPolygons belt_flatten(const ExPolygons &src, const BeltBrimFrame &frame)
-    { return belt_scale_u(src, frame, frame.u_stretch()); }
-inline ExPolygons belt_unflatten(const ExPolygons &src, const BeltBrimFrame &frame)
-    { return belt_scale_u(src, frame, frame.cos_tilt()); }
-
-// Minkowski sum of `src` with the segment [0, t]: the region swept by sliding
-// `src` along t.  Used to grow the brim downhill for "extra brim width".
-//
-// Implemented as union_(P, P + t, {parallelogram per boundary edge}) over ALL
-// contours including holes, with every parallelogram forced counter-clockwise
-// so the non-zero fill rule closes holes narrower than t along the sweep
-// direction.  A hole survives exactly when it is wider than |t| measured along
-// t - not when it is wider in its narrowest Euclidean direction.
-ExPolygons sweep_ex(const ExPolygons &src, const Point &t);
-
-// "Leading edge only": keep the part of a brim region (unflattened, slicing XY)
-// at or downhill of the object's first contact with the belt, so the part is
-// supported as it lands and nothing is printed alongside it afterwards.  `u_cut`
-// is the uphill edge of the first layer's contact band along `frame.from_axis`,
-// in mm (BeltFloorContext::cutoff_u of the first layer); downhill is the side
-// `frame.downhill_sign()` points to.
-ExPolygons belt_brim_clip_leading_edge(const ExPolygons &region, const BeltBrimFrame &frame, coordf_t u_cut);
-
-// Brim region for one already-flattened belt footprint.  All lengths are scaled
-// and measured in the flattened (true on-belt) metric.
-//
-// `has_outer` / `has_inner` are the resolved BrimType: belt printers collapse
-// Auto / Mouse ear / Painted to outer-only, so the caller does that mapping and
-// this function never needs PrintConfig.
-//
-// Two directional extras are applied to the footprint before the outer offset, so
-// each one buys reach in one direction only:
-//
-//   `leading` (leading_brim_length) sweeps the footprint DOWNHILL along the belt,
-//   so every leading-facing edge gains an apron ahead of it.
-//   `lateral`  (extra_brim_width)   sweeps it BOTH WAYS across the belt, widening
-//   the brim sideways without pushing it further ahead or behind.
-//
-// Neither is applied to the inner (hole) ring.
-ExPolygons belt_brim_region(const ExPolygons   &footprint_flat,
-                            bool                has_outer,
-                            bool                has_inner,
-                            coord_t             brim_width,
-                            coord_t             object_gap,
-                            coord_t             leading,
-                            coord_t             lateral,
-                            const BeltBrimFrame &frame);
-
-// Brim line positions for one layer band.
-//
-// Lines sit on a fixed lattice `u_anchor + k * pitch_u` so the on-belt spacing
-// between neighbouring brim lines is constant regardless of how the lattice
-// falls across layer bands.  Snapping to band centres instead would quantise
-// the spacing to whole bands and under-deposit by ~35% at 45 degrees.
-//
-// The band is half-open, [u_lo, u_hi), so every lattice point belongs to
-// exactly one band: none duplicated at a boundary, none dropped.  A band
-// narrower than the pitch simply yields nothing; a band much wider (shallow
-// tilt) yields several lines.
-std::vector<coord_t> belt_brim_line_positions(coord_t u_lo,
-                                              coord_t u_hi,
-                                              coord_t pitch_u,
-                                              coord_t u_anchor);
-
-// ---------------------------------------------------------------- pipeline
-
-// One brim-only layer printed BEFORE the object's first layer, carrying the
-// apron that has to be stuck to the belt ahead of the part.
-//
-// Deliberately not a Layer subclass.  A synthetic Layer would inherit id()
-// semantics that leak into initial-layer temperature selection, the spiral vase
-// probe, gradual interpolation, avoid-crossing-perimeters and cooling, all of
-// which key off Layer::id() == 0 or off a layer's regions.  A plain record
-// carries only what the emitter needs.
-//
-// `height` is the LAYER height, used for the Z move and ordering metadata only.
-// Each extrusion path inside `fills` carries its own height, equal to that
-// line's nozzle-to-belt clearance, which varies across the band.
-struct BeltBrimBand
-{
-    coordf_t                  print_z = 0.;
-    coordf_t                  height  = 0.;
-    // erBrim paths in the object's local slicing frame, untranslated.
-    ExtrusionEntityCollection fills;
-    // Footprint of those paths, for the first-layer convex hull / bbox.
-    ExPolygons                areas;
-};
-
-class PrintObject;
-
-// Generate the belt brim for one object: fills its per-object-layer bands and
-// its apron prologue.  No-op unless PrintObject::has_belt_brim().
-//
-// Runs inside posSupportMaterial rather than the brim step, because the prologue
-// print_z values must exist before ToolOrdering is built at psWipeTower.
-void make_belt_brim(PrintObject &object);
-
-} // namespace Slic3r
-
-#endif // slic3r_BeltBrim_hpp_
@@ -1,50 +0,0 @@
-#include "BeltGCode.hpp"
-#include "GCodeWriter.hpp"
-#include "GCode/BeltKinematics.hpp"
-#include "BeltTransform.hpp"
-#include "Print.hpp"
-#include "Point.hpp"
-#include "PrintConfig.hpp"
-#include "libslic3r.h"
-#include <cstdlib>
-
-namespace Slic3r {
-
-void BeltGCode::init_belt_writer(Print &print)
-{
-    // Axis remap and build volume max are set by base GCode after init_belt_writer
-    // returns; set_kinematics() replays them, so install order does not matter.
-    install_belt_kinematics(m_writer, print.config());
-    m_writer.set_force_normal_lift(true);
-}
-
-void BeltGCode::write_belt_header(GCodeOutputStream &file, const Print &print)
-{
-    const auto &full_cfg = print.full_print_config();
-    // Slicing rotation: the belt tilt (axis + angle) and the single source of truth
-    // for the physical tilt the G-code viewer uses to enable belt view.
-    file.write_format("; belt_slice_rotation = %s\n", full_cfg.opt_serialize("belt_slice_rotation").c_str());
-    file.write_format("; belt_slice_rotation_angle = %.1f\n", print.config().belt_slice_rotation_angle.value);
-    // Machine-frame transform: shear (cot) + scale (1/|sin|) derived from the belt
-    // tilt angle (or belt_frame_tilt_angle when decoupled).
-    file.write_format("; belt_frame_tilt_decouple = %d\n", print.config().belt_frame_tilt_decouple.value ? 1 : 0);
-    file.write_format("; belt_frame_tilt_angle = %.1f\n", print.config().belt_frame_tilt_angle.value);
-}
-
-void BeltGCode::on_set_origin(const PrintObject * /*obj*/, const Point & /*inst_shift*/)
-{
-    // Matches the per-instance Z-offset added in PrintObjectSlice.cpp: transform
-    // the origin through the belt pipeline so that back_transform(T * origin) =
-    // origin (correct machine position). The back_transform applied during
-    // G-code emission is the inverse of the forward transform.
-
-    // Adjust origin: transform through belt forward pipeline so that
-    // the back-transform correctly recovers model-space positions.
-    Transform3d T = BeltTransformPipeline::build_forward_transform(m_config);
-    Vec2d cur_origin = this->origin();
-    Vec3d origin3d(cur_origin.x(), cur_origin.y(), 0.);
-    Vec3d adjusted = T.linear() * origin3d;
-    this->set_origin(Vec2d(adjusted.x(), adjusted.y()));
-}
-
-} // namespace Slic3r
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "GCode.hpp"
-#include "Point.hpp"
-#include "Print.hpp"
-
-namespace Slic3r {
-
-// Belt-printer-specific GCode export.
-//
-// Inherits from GCode and overrides virtual hooks to:
-// - Install a BeltKinematics on the GCodeWriter
-// - Write belt configuration to the G-code header
-// - Adjust the origin for global pre-slice transforms when switching instances
-// (Arc fitting is disabled for belt printers by BeltKinematics::supports_arc_moves(),
-//  which the base GCode::should_disable_arc_fitting() consults -- no override needed.)
-class BeltGCode : public GCode
-{
-protected:
-    void init_belt_writer(Print &print) override;
-    void write_belt_header(GCodeOutputStream &file, const Print &print) override;
-    void on_set_origin(const PrintObject *obj, const Point &inst_shift) override;
-};
-
-} // namespace Slic3r
@@ -1,433 +0,0 @@
-// ORCA-Belt: backend of the belt purge tower (the belt replacement for the
-// classic wipe/prime tower).
-//
-// Kept in its own translation unit so the belt-purge logic stays out of the way
-// of unrelated upstream changes to Print.cpp / PrintObjectSlice.cpp and carries
-// no regression risk for normal printers: none of these methods do anything
-// unless the print is a belt printer with the belt purge tower enabled.
-//
-//   Print::has_belt_purge_tower()      - is the belt purge tower active?
-//   Print::_align_belt_purge_layers()  - snap the prism's layer grid onto the
-//                                        printed objects' grid
-//   Print::_plan_belt_purge()          - route filament-change purging into the
-//                                        prism (flush-into-objects), no wipe tower
-//   PrintObject::belt_shift_layer_grid()      - shift a sliced layer grid
-//   PrintObject::belt_truncate_layers_above() - cancel the prism past the last swap
-//
-// (Declarations live in Print.hpp alongside the rest of the Print interface.)
-
-#include "Print.hpp"
-#include "PrintConfig.hpp"
-#include "Exception.hpp"
-#include "GCode/ToolOrdering.hpp"
-#include "Layer.hpp"
-#include "ExtrusionEntity.hpp"
-#include "ExtrusionEntityCollection.hpp"
-#include "I18N.hpp"
-#include "format.hpp"
-#include "LocalesUtils.hpp"
-#include "libslic3r.h"
-#include "BeltBrim.hpp"
-#include "PrintBase.hpp"
-
-#include <algorithm>
-#include <cmath>
-#include <limits>
-
-#include <boost/log/trivial.hpp>
-#include <cassert>
-#include <cstddef>
-#include <functional>
-#include <utility>
-#include <vector>
-
-namespace Slic3r {
-
-// Belt purge prism: purging after filament changes is routed into a sliced
-// prism object via the flush-into-objects machinery instead of a wipe tower.
-bool Print::has_belt_purge_tower() const
-{
-    // Its own purge-tower "type", gated by the belt-only enable_belt_purge_tower
-    // option (not the classic enable_prime_tower).
-    if (!(m_config.belt_printer.value
-          && m_config.enable_belt_purge_tower.value
-          && !m_config.spiral_mode.value
-          && m_config.filament_diameter.values.size() > 1))
-        return false;
-
-    return std::any_of(m_objects.begin(), m_objects.end(), [](const PrintObject *object) {
-        return object->config().belt_purge_tower_object.value;
-    });
-}
-
-// Belt mode: align ALL objects on the plate (the printed objects AND the purge
-// prism) onto one common layer grid, so the prism can absorb every toolchange.
-//
-// After belt slicing each object's layer print_z carries a per-object global z
-// offset (mesh-vertex-scan belt_z_shift + instance-Y-dependent terms), so
-// objects at different belt-Y positions get layer grids with DIFFERENT residues
-// (mod layer height). Purge marking looks absorbers up with
-// get_layer_at_printz(lt.print_z, EPSILON), so a toolchange on object B only
-// absorbs into the prism if the prism has a layer at B's print_z. Snapping only
-// the prism to one object therefore worked for a single (assembled) multi-color
-// object but failed with multiple separate objects — the prism could follow only
-// one grid, and toolchanges on the others went unabsorbed ("multiple layer
-// grids" warning).
-//
-// Fix: pick one reference grid (the tallest object) and shift every object onto
-// it. Each shift is at most half a layer height — a sub-100µm move along the
-// belt, the very same mechanism the per-object global_z_offset already uses, and
-// it keeps each object internally consistent (belt_shift_layer_grid moves the
-// object's layers, its support layers, and its belt floor together). Equal layer
-// height across objects is enforced by Print::validate(), so once residues match
-// every object steps on the same lattice {ref_offset + k*h} and every toolchange
-// layer coincides with a prism layer.
-void Print::_align_belt_purge_layers()
-{
-    PrintObject *prism = nullptr;
-    for (PrintObject *po : m_objects)
-        if (po->config().belt_purge_tower_object.value && !po->layers().empty()) {
-            prism = po;
-            break;
-        }
-    if (prism == nullptr || prism->layers().empty())
-        return;
-
-    const double h = prism->config().layer_height.value;
-    if (h <= EPSILON)
-        return;
-
-    // Grid residue of an object's layer grid: identical for all of an object's
-    // layers above the first since they step by h.
-    auto grid_offset = [h](const PrintObject *po) -> double {
-        if (po->layers().empty())
-            return 0.;
-        const double z = po->layers().front()->print_z;
-        return z - std::floor(z / h) * h; // in [0, h)
-    };
-
-    // Reference grid: the tallest non-prism object (proxy for the object with
-    // the most toolchange layers — minimizes how far the rest must move).
-    const PrintObject *ref     = nullptr;
-    double             ref_top = -std::numeric_limits<double>::max();
-    for (const PrintObject *po : m_objects) {
-        if (po->config().belt_purge_tower_object.value || po->layers().empty())
-            continue;
-        const double top = po->layers().back()->print_z;
-        if (top > ref_top) {
-            ref_top = top;
-            ref     = po;
-        }
-    }
-    if (ref == nullptr)
-        return;
-
-    const double ref_offset = grid_offset(ref);
-
-    // Snap every object (printed objects AND the prism) onto the reference grid.
-    for (PrintObject *po : m_objects) {
-        if (po->layers().empty())
-            continue;
-        double delta = ref_offset - grid_offset(po);
-        if (delta > 0.5 * h)
-            delta -= h;
-        else if (delta <= -0.5 * h)
-            delta += h;
-        po->belt_shift_layer_grid(delta); // no-op for the reference object (delta ~ 0)
-    }
-}
-
-// Belt mode replacement for _make_wipe_tower(): plan filament-change purging
-// into the belt purge prism (and any other flush_into_* object) using the
-// flush-into-objects machinery, without generating classic wipe tower G-code.
-// The toolchange itself is emitted by GCode::set_extruder() via the
-// change_filament_gcode macro; the overrides marked here make the new
-// filament's first extrusions land in the purge prism.
-void Print::_plan_belt_purge()
-{
-    m_wipe_tower_data.clear();
-
-    // psWipeTower may be invalidated without posSlice (for example after a
-    // filament-map or tool-ordering change). Restore a prism shortened by the
-    // previous plan so a newly higher toolchange can use its original layers.
-    for (PrintObject *po : m_objects)
-        if (po->config().belt_purge_tower_object.value)
-            po->belt_undo_purge_plan();
-
-    // Must run before ToolOrdering is built: LayerTools merge per-object layer
-    // print_z values, and the prism only absorbs purge where its (snapped)
-    // layers coincide with the toolchange layers.
-    this->_align_belt_purge_layers();
-
-    const unsigned int number_of_extruders = (unsigned int) m_config.filament_colour.values.size();
-
-    // No initial priming extrusions: there is no tower to prime on.
-    m_wipe_tower_data.tool_ordering = ToolOrdering(*this, (unsigned int) -1, false);
-    m_wipe_tower_data.tool_ordering.sort_and_build_data(*this, (unsigned int) -1, false);
-
-    if (m_wipe_tower_data.tool_ordering.empty() || m_wipe_tower_data.tool_ordering.last_extruder() == unsigned(-1))
-        throw Slic3r::SlicingError("The print is empty. The model is not printable with current print settings.");
-
-    // Is there any filament change at all? Not ToolOrdering::has_wipe_tower(): that reads the
-    // FIRST layer's flag, and on a belt the first layer may be a brim apron band, which carries
-    // neither object nor support and so never gets the flag even when the print changes filament.
-    {
-        bool         any_change = false;
-        unsigned int cur        = m_wipe_tower_data.tool_ordering.first_extruder();
-        for (const auto &lt : m_wipe_tower_data.tool_ordering.layer_tools())
-            for (const unsigned int e : lt.extruders)
-                if (e != cur) { any_change = true; cur = e; }
-        if (! any_change)
-            return;
-    }
-
-    this->throw_if_canceled();
-
-    // Flush volumes per filament pair, mirroring the generic wipe tower path:
-    // full flush matrix for single extruder multi material with purging enabled,
-    // plain prime volume otherwise.
-    std::vector<float> flush_matrix(cast<float>(
-        get_flush_volumes_matrix(m_config.flush_volumes_matrix.values, 0, m_config.nozzle_diameter.values.size())));
-    std::vector<std::vector<float>> wipe_volumes;
-    for (unsigned int i = 0; i < number_of_extruders; ++i)
-        wipe_volumes.push_back(std::vector<float>(flush_matrix.begin() + i * number_of_extruders,
-                                                  flush_matrix.begin() + (i + 1) * number_of_extruders));
-    const bool  use_flush_matrix = m_config.purge_in_prime_tower && m_config.single_extruder_multi_material;
-    const float flush_multiplier = (float) m_config.flush_multiplier.get_at(0);
-
-    // Cancel the purge prism early: pre-scan the tool ordering for the highest
-    // print_z that actually has a toolchange, then drop the prism's layers above
-    // it so the tower stops at the last color swap (saves filament/time). This
-    // MUST happen before the marking loop below: ensure_perimeters_infills_order
-    // force-overrides the prism's extrusions on every layer (it is a dedicated
-    // flush object), so truncating afterwards would leave dangling overrides
-    // pointing into deleted layers.
-    {
-        // The tool ordering covers the WHOLE print, and the prism is a printed
-        // object in it. Left unbounded, the scan below sees the prism's own
-        // toolchanges on layers above every model object -- the prism runs past
-        // them by design (ramp/height compensation at the tilted ends) -- so
-        // last_tc_z lands at the prism's own top and the truncation cancels
-        // nothing. The tower ends up justifying its own existence.
-        //
-        // Nothing above the tallest printed object can require a color change,
-        // so bound the scan there. On MCTEST5 that is 197 toolchanges spanning
-        // z=154.00..193.20 with the tallest object topping out at 153.80, i.e.
-        // 39.4 mm of tower that no swap ever needed.
-        // Support layers count too: on a belt they can extend above the object's
-        // own top, and a toolchange there is a real one.
-        double obj_top_z = -1.;
-        for (const PrintObject *po : m_objects) {
-            if (po->config().belt_purge_tower_object.value)
-                continue;
-            if (!po->layers().empty())
-                obj_top_z = std::max(obj_top_z, po->layers().back()->print_z);
-            if (!po->support_layers().empty())
-                obj_top_z = std::max(obj_top_z, po->support_layers().back()->print_z);
-        }
-
-        double       last_tc_z   = -1.;
-        unsigned int cur_ext     = m_wipe_tower_data.tool_ordering.first_extruder();
-        for (const auto &lt : m_wipe_tower_data.tool_ordering.layer_tools()) {
-            // layer_tools() is ordered by print_z ascending.
-            if (obj_top_z >= 0. && lt.print_z > obj_top_z + EPSILON)
-                break;
-            for (const unsigned int e : lt.extruders)
-                if (e != cur_ext) { last_tc_z = lt.print_z; cur_ext = e; }
-        }
-        // Deliberately NOT cancelling the prism outright when no object toolchange
-        // exists: belt_truncate_layers_above(0.) empties m_layers, and an object
-        // with zero layers is not something the rest of the pipeline expects. The
-        // GUI already declines to create a prism unless more than one filament is
-        // in use, so this case is a stale prism, not a hot path -- leave it whole
-        // rather than risk a zero-layer object.
-        if (last_tc_z >= 0.)
-            for (PrintObject *po : m_objects)
-                if (po->config().belt_purge_tower_object.value && !po->layers().empty()) {
-                    po->belt_truncate_layers_above(last_tc_z);
-                    break;
-                }
-    }
-
-    // The prism only absorbs purge at toolchange layers whose print_z coincides
-    // with one of its own layers.
-    PrintObject *prism_po = nullptr;
-    for (PrintObject *po : m_objects)
-        if (po->config().belt_purge_tower_object.value && !po->layers().empty()) { prism_po = po; break; }
-
-    float  total_leftover      = 0.f;
-    float  worst_layer_leftover = 0.f;
-    double worst_layer_z       = 0.;
-
-    unsigned int current_extruder_id = m_wipe_tower_data.tool_ordering.first_extruder();
-    for (auto &layer_tools : m_wipe_tower_data.tool_ordering.layer_tools()) {
-        float layer_leftover = 0.f;
-        for (const unsigned int extruder_id : layer_tools.extruders) {
-            if (extruder_id == current_extruder_id)
-                continue;
-            float volume_to_wipe = use_flush_matrix ?
-                wipe_volumes[current_extruder_id][extruder_id] * flush_multiplier :
-                (float) m_config.prime_volume;
-            float leftover = layer_tools.wiping_extrusions().mark_wiping_extrusions(*this, current_extruder_id, extruder_id,
-                                                                                    volume_to_wipe);
-            layer_leftover += leftover;
-            current_extruder_id = extruder_id;
-        }
-
-        // Plastic saving: drop the prism's fills that no toolchange on this layer
-        // claimed. At this point the prism's OVERRIDDEN fills are exactly the
-        // purge; the rest would print as solid infill in the prism's own filament
-        // for nothing -- which is the whole prism on a layer with no toolchange
-        // (141 of 692 layers on MCTEST5 before the truncation fix). Perimeters are
-        // left alone so the bar keeps a continuous wall along the belt.
-        //
-        // Non-destructive: the entities are stashed with their positions and put
-        // back by belt_restore_dropped_fills() at the top of the next plan. An
-        // earlier version deleted them outright, which broke replanning when a
-        // later tool ordering needed what this one had not claimed -- that is why
-        // it was removed rather than kept.
-        if (prism_po != nullptr) {
-            const auto &we = layer_tools.wiping_extrusions();
-            prism_po->belt_drop_unclaimed_fills(
-                prism_po->get_layer_at_printz(layer_tools.print_z, EPSILON),
-                [&we, prism_po](const ExtrusionEntity *e) { return we.is_entity_overridden(e, prism_po, 0); });
-        }
-
-        layer_tools.wiping_extrusions().ensure_perimeters_infills_order(*this);
-        if (layer_leftover > 0.f) {
-            total_leftover += layer_leftover;
-            if (layer_leftover > worst_layer_leftover) {
-                worst_layer_leftover = layer_leftover;
-                worst_layer_z        = layer_tools.print_z;
-            }
-        }
-        this->throw_if_canceled();
-    }
-
-    if (total_leftover > 1.f) {
-        this->active_step_add_warning(
-            PrintStateBase::WarningLevel::CRITICAL,
-            Slic3r::format(_u8L("The belt purge tower cannot absorb the full purge volume: %1% mm³ in total could not "
-                                "be purged (worst layer: %2% mm³ at height %3%). The print may show color bleeding. "
-                                "Increase the belt purge tower width, or reduce flushing volumes."),
-                           int(std::ceil(total_leftover)), int(std::ceil(worst_layer_leftover)),
-                           Slic3r::float_to_string_decimal_point(worst_layer_z, 2)));
-    }
-}
-
-// Belt mode: shift the sliced layer grid by delta. Mirrors the global_z_offset
-// application in slice() — layer print_z and belt_floor_z_shift move together
-// so belt floor clipping stays consistent with the shifted grid. Used by
-// Print::_align_belt_purge_layers() to snap the purge prism onto the printed
-// objects' layer grid; |delta| <= half a layer height, i.e. a sub-layer shift
-// of the prism along the belt.
-void PrintObject::belt_shift_layer_grid(double delta)
-{
-    if (std::abs(delta) < EPSILON)
-        return;
-    for (Layer *layer : m_layers)
-        layer->print_z += delta;
-    for (SupportLayer *layer : m_support_layers)
-        layer->print_z += delta;
-    // The brim's apron bands below the first layer carry their own print_z.
-    for (BeltBrimBand &band : m_belt_brim_prologue)
-        band.print_z += delta;
-    m_slicing_params.belt_floor_z_shift += delta;
-    // The grid stays shifted across a support-only or brim-only change (posSlice does
-    // not rerun), so everything slice() derived from it has to follow: the cached floor
-    // that update_slicing_parameters() restores, and the global offset the organic
-    // support layers and the adaptive infill octree are placed with. Left alone, the
-    // next alignment finds a delta of 0 and the floor and the supports sit up to half
-    // a layer off the grid, unlike a fresh slice.
-    if (m_belt_floor_z_shift_cache_valid)
-        m_belt_floor_z_shift_cached += delta;
-    m_belt_global_z_offset += delta;
-}
-
-// Belt mode: drop layers strictly above z (used to cancel the purge prism early
-// once there are no more toolchanges above z, so the tower stops at the last
-// color swap instead of wasting filament up the rest of the belt). Each layer's
-// cross-section is already sliced, so removing upper layers does not affect the
-// last toolchange's coverage. Deletes the Layer objects and clears the new top
-// layer's upper-layer link. Returns the number of layers removed.
-size_t PrintObject::belt_truncate_layers_above(coordf_t z)
-{
-    // A repeated plan always starts from the restored full layer set.
-    assert(m_belt_truncated_layers.empty());
-    size_t keep = m_layers.size();
-    while (keep > 0 && m_layers[keep - 1]->print_z > z + EPSILON)
-        --keep;
-    if (keep >= m_layers.size())
-        return 0;
-    const size_t removed = m_layers.size() - keep;
-    m_belt_truncated_layers.assign(m_layers.begin() + keep, m_layers.end());
-    m_layers.resize(keep);
-    if (!m_layers.empty())
-        m_layers.back()->upper_layer = nullptr;
-    return removed;
-}
-
-// Plastic saving on the purge prism: keep only the fills a toolchange claimed.
-//
-// Called per layer from _plan_belt_purge(), after the real-purge marking and
-// BEFORE ensure_perimeters_infills_order() -- that pass force-overrides every
-// remaining fill on the prism (it is a dedicated flush object), so afterwards
-// everything looks claimed and nothing could be distinguished.
-size_t PrintObject::belt_drop_unclaimed_fills(Layer *layer, const std::function<bool(const ExtrusionEntity*)> &claimed)
-{
-    if (layer == nullptr)
-        return 0;
-    size_t dropped = 0;
-    for (size_t ri = 0; ri < layer->regions().size(); ++ri) {
-        LayerRegion *lr = layer->get_region(ri);
-        auto        &ents = lr->fills.entities;
-        ExtrusionEntitiesPtr keep;
-        keep.reserve(ents.size());
-        for (size_t i = 0; i < ents.size(); ++i) {
-            if (claimed(ents[i])) {
-                keep.emplace_back(ents[i]);
-            } else {
-                // Stash with its original index so the restore is exact.
-                m_belt_dropped_fills.push_back(BeltDroppedFill{ layer, ri, i, ents[i] });
-                ++dropped;
-            }
-        }
-        ents = std::move(keep);
-    }
-    return dropped;
-}
-
-void PrintObject::belt_restore_dropped_fills()
-{
-    if (m_belt_dropped_fills.empty())
-        return;
-    // Ascending index per (layer, region): inserting in that order lands every
-    // entity back at its original position, because each insertion shifts only
-    // the entries after it, which are themselves still to be inserted.
-    std::stable_sort(m_belt_dropped_fills.begin(), m_belt_dropped_fills.end(),
-                     [](const BeltDroppedFill &a, const BeltDroppedFill &b) {
-                         if (a.layer != b.layer)           return a.layer < b.layer;
-                         if (a.region_idx != b.region_idx) return a.region_idx < b.region_idx;
-                         return a.index < b.index;
-                     });
-    for (const BeltDroppedFill &d : m_belt_dropped_fills) {
-        auto &ents = d.layer->get_region(d.region_idx)->fills.entities;
-        ents.insert(ents.begin() + std::min(d.index, ents.size()), d.entity);
-    }
-    m_belt_dropped_fills.clear();
-}
-
-void PrintObject::belt_restore_truncated_layers()
-{
-    if (m_belt_truncated_layers.empty())
-        return;
-
-    m_layers.insert(m_layers.end(), m_belt_truncated_layers.begin(), m_belt_truncated_layers.end());
-    m_belt_truncated_layers.clear();
-    for (size_t i = 0; i < m_layers.size(); ++i) {
-        m_layers[i]->lower_layer = i == 0 ? nullptr : m_layers[i - 1];
-        m_layers[i]->upper_layer = i + 1 < m_layers.size() ? m_layers[i + 1] : nullptr;
-    }
-}
-
-} // namespace Slic3r
@@ -1,82 +0,0 @@
-#include "BeltSliceStrategy.hpp"
-#include "Model.hpp"
-#include "BeltTransform.hpp"
-#include "Point.hpp"
-#include "PrintConfig.hpp"
-
-#include <limits>
-#include <algorithm>
-
-namespace Slic3r {
-
-void BeltSliceStrategy::apply_preslice_transforms(Transform3d           &trafo,
-                                                  const PrintConfig     &config,
-                                                  const ModelVolumePtrs &model_volumes,
-                                                  double                *out_belt_min_z)
-{
-    // 1. Belt rotation — the sole mesh-side belt transform (matching
-    //    BeltTransformPipeline::build_forward_transform).  Only active in
-    //    belt-printer mode.
-    bool has_rotation = false;
-    if (config.belt_printer.value) {
-        const Matrix3d rot = BeltTransformPipeline::build_rotation_matrix(config, &has_rotation);
-        if (has_rotation) {
-            Transform3d belt_xform = Transform3d::Identity();
-            belt_xform.linear() = rot;
-            trafo = belt_xform * trafo;
-        }
-    }
-
-    if (!has_rotation)
-        return;
-
-    // 2. Z-shift — detect if the mesh clips below the build plate after the
-    // transforms and lift it.  Each mesh vertex must be brought into object space
-    // via mv->get_matrix() before applying the full trafo (which is in object
-    // space).  Missing this on assemblies (where per-volume get_matrix() positions
-    // each volume within the object) would compute min_z against mesh-local vertex
-    // coordinates rather than object-space coordinates, so volumes translated along
-    // the slicer's Z axis would be silently excluded from the bound check.
-
-    //
-    // The lift is measured to the lowest point of the SUPPORT region, not of the
-    // mesh: the belt floor (z = shear * u in this rotated frame, u the from-axis
-    // coordinate) runs below every vertex, and under the leading end of an
-    // overhang it lies below the lowest vertex by up to the overhang's length
-    // times the shear.  Supports have to reach that floor, and every support
-    // generator works in layers at z >= 0, so z = 0 has to be the lowest floor
-    // point under the footprint.  The layers between it and the first vertex
-    // come out empty, which belt slicing already tolerates (the bottom corner
-    // of a tilted part is a point).  Vertices on the belt have z == floor, so
-    // for a part resting on the belt this is simply the floor at its leading
-    // extreme, less the frame margin (see BeltTransformPipeline::frame_margin).
-    BeltTransformPipeline::BeltFloorParams floor;
-    const bool has_floor = BeltTransformPipeline::floor_shear(config, floor);
-    double min_z = std::numeric_limits<double>::max();
-    for (const ModelVolume *mv : model_volumes) {
-        if (!mv->is_model_part()) continue;
-        Transform3d vol_trafo = trafo * mv->get_matrix();
-        const auto &its = mv->mesh().its;
-        for (const stl_vertex &v : its.vertices) {
-            Vec3d vm = v.cast<double>();
-            Vec3d pt = vol_trafo * vm;
-            min_z = std::min(min_z, pt.z());
-            if (has_floor)
-                min_z = std::min(min_z, floor.shear_factor * (floor.from_axis == 0 ? pt.x() : pt.y()));
-        }
-    }
-    if (has_floor && min_z != std::numeric_limits<double>::max())
-        min_z -= BeltTransformPipeline::frame_margin(floor);
-    const double z_shift_val = (min_z < 0. && min_z != std::numeric_limits<double>::max()) ? -min_z : 0.;
-    if (z_shift_val > 0.) {
-        Transform3d z_shift = Transform3d::Identity();
-        z_shift.matrix()(2, 3) = z_shift_val;
-        trafo = z_shift * trafo;
-    }
-    // out_belt_min_z is only meaningful in belt mode.
-    if (out_belt_min_z && config.belt_printer.value) {
-        *out_belt_min_z = (min_z != std::numeric_limits<double>::max()) ? min_z : 0.;
-    }
-}
-
-} // namespace Slic3r
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "libslic3r.h"
-#include "Point.hpp"
-#include "BeltTransform.hpp"
-#include "PrintConfig.hpp"
-#include "Model.hpp"
-
-namespace Slic3r {
-
-// Belt printer pre-slice transform strategy.
-//
-// Composes, in order, the mesh transforms applied before slicing on a belt printer:
-//   1. Belt rotation (the sole mesh-side belt transform; shear & scale are a
-//      g-code-side stage, see MachineFrameTransform)
-//   2. Per-object Z-shift that lifts the mesh so its slicing frame starts at the
-//      belt below its footprint
-//
-// Isolates this belt-specific logic from the generic slicing pipeline in
-// PrintObjectSlice.cpp.
-class BeltSliceStrategy
-{
-public:
-    // Apply the belt rotation + Z-shift to `trafo` in place.  No-op when no belt
-    // rotation is configured.
-    //
-    // out_belt_min_z (if non-null) receives the minimum mesh Z after the transforms.
-    static void apply_preslice_transforms(Transform3d           &trafo,
-                                          const PrintConfig     &config,
-                                          const ModelVolumePtrs &model_volumes,
-                                          double                *out_belt_min_z = nullptr);
-};
-
-} // namespace Slic3r
@@ -1,153 +0,0 @@
-#include "BeltTransform.hpp"
-#include "Model.hpp"
-#include "BoundingBox.hpp"
-#include "Config.hpp"
-#include "Geometry.hpp"
-#include "Point.hpp"
-#include "PrintConfig.hpp"
-#include "libslic3r.h"
-
-#include <limits>
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-
-namespace Slic3r {
-
-// ---- Matrix builders ------------------------------------------------------
-
-Matrix3d BeltTransformPipeline::build_rotation_matrix(const PrintConfig &config, bool *has_rot_out)
-{
-    BeltRotationAxis axis = config.belt_slice_rotation.value;
-    double angle_deg = config.belt_slice_rotation_angle.value;
-    bool active = axis != BeltRotationAxis::None && std::abs(angle_deg) > EPSILON;
-    if (has_rot_out) *has_rot_out = active;
-    if (!active)
-        return Matrix3d::Identity();
-    double angle_rad = Geometry::deg2rad(angle_deg);
-    Vec3d unit_axis;
-    switch (axis) {
-    case BeltRotationAxis::X: unit_axis = Vec3d::UnitX(); break;
-    case BeltRotationAxis::Y: unit_axis = Vec3d::UnitY(); break;
-    case BeltRotationAxis::Z: unit_axis = Vec3d::UnitZ(); break;
-    default:                  return Matrix3d::Identity();
-    }
-    return Eigen::AngleAxisd(angle_rad, unit_axis).toRotationMatrix();
-}
-
-Transform3d BeltTransformPipeline::build_forward_transform(const PrintConfig &config)
-{
-    // Mesh-side belt transform: the rotation. (Shear & scale are a g-code-side
-    // stage, not part of the mesh transform.)
-    Transform3d combined = Transform3d::Identity();
-    combined.linear() = build_rotation_matrix(config);
-    return combined;
-}
-
-// ---- Belt floor parameters ------------------------------------------------
-
-namespace {
-
-// Belt floor in the rotated slicer frame: the image of z_machine = 0 under R.
-//   R(+α, X): point (·, y, 0) → (·, cos α · y, sin α · y) ⇒ z = tan(α) · y_s
-//   R(+α, Y): point (x, ·, 0) → (cos α · x, ·, -sin α · x) ⇒ z = -tan(α) · x_s
-//   R(+α, Z): point (·, ·, 0) → (·, ·, 0); no tilt → no floor
-void belt_floor_shear(BeltRotationAxis rot_axis, double angle_rad, BeltTransformPipeline::BeltFloorParams &out)
-{
-    double sin_a = std::sin(angle_rad), cos_a = std::cos(angle_rad);
-    switch (rot_axis) {
-    case BeltRotationAxis::X:
-        out.shear_factor = (std::abs(cos_a) > EPSILON) ?  sin_a / cos_a : 0.;
-        out.from_axis    = 1; // Y
-        break;
-    case BeltRotationAxis::Y:
-        out.shear_factor = (std::abs(cos_a) > EPSILON) ? -sin_a / cos_a : 0.;
-        out.from_axis    = 0; // X
-        break;
-    case BeltRotationAxis::Z:
-    default:
-        out.shear_factor = 0.0;
-        out.from_axis    = 1;
-        break;
-    }
-}
-
-// Z of the belt floor directly under a point of the rotated (unshifted) frame.
-inline double belt_floor_z(const BeltTransformPipeline::BeltFloorParams &fp, const Vec3d &pt)
-{
-    return fp.shear_factor * (fp.from_axis == 0 ? pt.x() : pt.y());
-}
-
-
-BeltTransformPipeline::BeltHeightResult compute_belt_height_and_floor_impl(
-    const PrintConfig &config, const BoundingBoxf3 &bb, double original_height)
-{
-    BeltTransformPipeline::BeltHeightResult result;
-    result.object_height = original_height;
-
-    // The mesh rotation (the sole mesh-side belt transform).
-    const BeltRotationAxis rot_axis  = config.belt_slice_rotation.value;
-    const double           rot_angle = config.belt_slice_rotation_angle.value;
-
-    bool has_rotation = rot_axis != BeltRotationAxis::None && std::abs(rot_angle) > EPSILON;
-    if (!has_rotation)
-        return result;
-
-    // Rotation path: sweep the 8 bbox corners through R to get the rotated height,
-    // then derive the belt floor (the image of machine-Z = 0 under R).
-    double angle_rad = Geometry::deg2rad(rot_angle);
-    Vec3d unit_axis;
-    switch (rot_axis) {
-    case BeltRotationAxis::X: unit_axis = Vec3d::UnitX(); break;
-    case BeltRotationAxis::Y: unit_axis = Vec3d::UnitY(); break;
-    case BeltRotationAxis::Z: unit_axis = Vec3d::UnitZ(); break;
-    default:                  unit_axis = Vec3d::UnitX(); break;
-    }
-    Matrix3d R = Eigen::AngleAxisd(angle_rad, unit_axis).toRotationMatrix();
-    belt_floor_shear(rot_axis, angle_rad, result.floor_params);
-    // The slicing frame starts at the lowest point of the support region: the
-    // lowest belt-floor point under the footprint, not the lowest vertex.  The
-    // belt under the leading end of an overhang lies below every vertex of the
-    // part, and supports have to be able to reach it (see
-    // BeltSliceStrategy::apply_preslice_transforms for the exact vertex-scan
-    // counterpart of this bbox estimate).
-    double min_rz = std::numeric_limits<double>::max();
-    double max_rz = std::numeric_limits<double>::lowest();
-    for (int i = 0; i < 8; ++i) {
-        Vec3d c((i & 1) ? bb.max.x() : bb.min.x(),
-                (i & 2) ? bb.max.y() : bb.min.y(),
-                (i & 4) ? bb.max.z() : bb.min.z());
-        Vec3d  rc = R * c;
-        double z  = rc.z();
-        min_rz = std::min(min_rz, z);
-        max_rz = std::max(max_rz, z);
-        min_rz = std::min(min_rz, belt_floor_z(result.floor_params, rc));
-    }
-    min_rz -= BeltTransformPipeline::frame_margin(result.floor_params);
-    result.object_height = max_rz - min_rz;
-
-    result.floor_params.z_shift = bb.min.z() + ((min_rz < 0.) ? -min_rz : 0.);
-
-    return result;
-}
-
-} // anonymous namespace
-
-BeltTransformPipeline::BeltHeightResult BeltTransformPipeline::compute_belt_height_and_floor(
-    const PrintConfig &config, const BoundingBoxf3 &bbox, double original_height)
-{
-    return compute_belt_height_and_floor_impl(config, bbox, original_height);
-}
-
-bool BeltTransformPipeline::floor_shear(const PrintConfig &config, BeltFloorParams &out)
-{
-    out = BeltFloorParams{};
-    const BeltRotationAxis rot_axis  = config.belt_slice_rotation.value;
-    const double           rot_angle = config.belt_slice_rotation_angle.value;
-    if (rot_axis == BeltRotationAxis::None || std::abs(rot_angle) <= EPSILON)
-        return false;
-    belt_floor_shear(rot_axis, Geometry::deg2rad(rot_angle), out);
-    return std::abs(out.shear_factor) > EPSILON;
-}
-
-} // namespace Slic3r
@@ -1,132 +0,0 @@
-#pragma once
-
-#include "libslic3r.h"
-#include "Point.hpp"
-#include "BoundingBox.hpp"
-#include "PrintConfig.hpp"
-#include "Geometry.hpp"
-#include "Config.hpp"
-
-#include <cmath>
-
-namespace Slic3r {
-
-class ModelObject;
-
-// Shared belt-printer transform math.
-//
-// The pre-slice pipeline applied in PrintObjectSlice.cpp is:
-//     trafo_out = z_shift * rotation * trafo_in
-//
-// Rotation is the sole mesh-side belt transform; shear & scale are applied
-// to the g-code instead (see MachineFrameTransform).  This class provides the
-// building blocks so every call site uses the same implementation.  z_shift is
-// object-dependent (computed from mesh vertex bounds) and is NOT included in
-// build_forward_transform().  The machine-frame shear/scale is derived directly
-// from the tilt angle in MachineFrameTransform and no longer lives here.
-//
-// Design note: this mesh-rotation approach replaced an earlier pre-shear
-// method (now removed).  While that initial pre-shear method was instrumental
-// in getting belt printer slicing off the ground in the first place, its place is
-// in the past.  A big thank you goes to the Unlayered3D team, who recommended 
-// switching to a pre-slice rotation stage instead.  Doing so keeps the slicing 
-// operation isometric — no distortion of the sliced geometry — while the 
-// non-orthogonal machine-axis compensation is confined to a g-code-side shear/scale
-// derived from the same tilt angle.
-// 
-// This fixed a number of issues, including several issues noticed by hotcubcar
-// regarding adaptive infills not working, gyroid becoming anisotropic, and more 
-// that were all mostly resolved as a result of the switch.
-// 
-// This also means that the pre-slice rotation transform methodology can be used 
-// more cleanly on non-belt printers.
-// - HarrierPigeon (Joseph Robertson)
-
-class BeltTransformPipeline
-{
-public:
-    // ---- Identity checks --------------------------------------------------
-
-    // Whether the G-code axis remap applies at all. The remap fields are only
-    // offered in the belt printer group, so a value left in a profile must not
-    // change a non-belt print: with belt mode off every belt-only key is a no-op.
-    // This is the one place to widen if a non-belt use ever needs them.
-    static bool axis_remap_enabled(const PrintConfig &config) { return config.belt_printer.value; }
-
-    static bool has_rotation(const PrintConfig &config)
-    {
-        return config.belt_slice_rotation.value != BeltRotationAxis::None &&
-               std::abs(config.belt_slice_rotation_angle.value) > EPSILON;
-    }
-
-    // Physical belt tilt derived from the slicing rotation — the single source of
-    // truth for bed rendering, support gravity tilt and the bed-exclusion
-    // projection.  Returns the tilt magnitude in degrees split onto the X and Y
-    // build-plate tilt axes according to the rotation axis:
-    //   rotation about X  → tilt_x = angle   (gantry tilts in the YZ plane)
-    //   rotation about Y  → tilt_y = angle   (gantry tilts in the XZ plane)
-    //   rotation about Z / None → no tilt    (in-plane spin doesn't tilt the belt)
-    // The magnitude uses abs(angle) so a negative rotation still reports a positive
-    // physical tilt.
-    struct PhysicalTilt { double tilt_x_deg = 0.; double tilt_y_deg = 0.; };
-
-    static PhysicalTilt physical_tilt(BeltRotationAxis axis, double angle_deg)
-    {
-        PhysicalTilt t;
-        double mag = std::abs(angle_deg);
-        switch (axis) {
-        case BeltRotationAxis::X: t.tilt_x_deg = mag; break;
-        case BeltRotationAxis::Y: t.tilt_y_deg = mag; break;
-        default: break; // Z / None: no physical tilt
-        }
-        return t;
-    }
-
-    // ---- Matrix builders --------------------------------------------------
-
-    // Build the 3x3 rotation matrix from belt_slice_rotation* config.
-    // Returns Identity if rotation axis is None or angle is ~0.
-    // Also sets has_rot_out if non-null.
-    static Matrix3d build_rotation_matrix(const PrintConfig &config, bool *has_rot_out = nullptr);
-
-    // Forward transform (the rotation) — the mesh-side belt transform that
-    // BeltSliceStrategy applies and BeltBackTransform inverts.
-    // Does NOT include the per-object Z-shift.
-    static Transform3d build_forward_transform(const PrintConfig &config);
-
-    // ---- Belt floor parameters --------------------------------------------
-
-    struct BeltFloorParams {
-        double shear_factor = 0.0;
-        int    from_axis    = 1;
-        double z_shift      = 0.0;
-    };
-
-    // Shear factor and from-axis of the belt floor in the rotated slicer frame
-    // (z_floor = shear_factor * u, u = the from-axis coordinate), for the
-    // rotation the config selects.  z_shift is left at 0.  Returns false (and
-    // zero shear) when the config has no tilt.
-    static bool floor_shear(const PrintConfig &config, BeltFloorParams &out);
-
-    // How far below the lowest belt-floor point under the footprint the slicing
-    // frame starts, in slicing Z.  A support column meeting the belt is wider at
-    // its base than at its tip, so under a leading overhang the base reaches ahead
-    // of the part along the belt, and the layers that trim it to the belt plane
-    // lie below that lowest point: 10 mm along the belt.
-    static double frame_margin(const BeltFloorParams &fp) { return 10. * std::abs(fp.shear_factor); }
-
-    // Result of computing belt height + floor params.
-    struct BeltHeightResult {
-        double          object_height;  // Effective object height after shear/scale
-        BeltFloorParams floor_params;
-    };
-
-    // Compute effective object height and belt floor parameters from config
-    // and the object's bounding box.  original_height is the input height
-    // (bb.size().z() or model_object.max_z()).
-    static BeltHeightResult compute_belt_height_and_floor(
-        const PrintConfig &config, const BoundingBoxf3 &bbox,
-        double original_height);
-};
-
-} // namespace Slic3r
@@ -474,9 +474,7 @@ static ExPolygons outer_inner_brim_area(const Print& print,
            const bool         use_brim_ears = object->config().brim_type == btPainted;
            const bool         use_inner_brim_ears = (use_auto_brim_ears || use_brim_ears) && !object->config().brim_ears_outer_only.value;
            const bool         has_inner_brim = brim_type == btInnerOnly || brim_type == btOuterAndInner || use_inner_brim_ears;
-            // btLeadingEdgeOnly is a belt-printer mode; on a flat bed there is no leading
-            // edge, so it degrades to an ordinary outer brim rather than silently to none.
-            const bool         has_outer_brim = brim_type == btOuterOnly || brim_type == btOuterAndInner || brim_type == btAutoBrim || brim_type == btLeadingEdgeOnly || use_auto_brim_ears || use_brim_ears;
+            const bool         has_outer_brim = brim_type == btOuterOnly || brim_type == btOuterAndInner || brim_type == btAutoBrim || use_auto_brim_ears || use_brim_ears;
            coord_t            ear_detection_length = scale_(object->config().brim_ears_detection_length.value);
            coordf_t           brim_ears_max_angle = object->config().brim_ears_max_angle.value;
            //ORCA: Select brim base slices from EFC-compensated outline when enabled.
@@ -891,17 +889,6 @@ void make_brim(const Print& print, PrintTryCancel try_cancel, Polygons& islands_
    std::vector<unsigned int>& printExtruders,
    std::map<ObjectInstanceID, ExPolygons>* objectBrimAreasByInstanceOut)
 {
-    // Belt printers never use the flat plate brim.
-    //
-    // With a tilted belt the brim has to be laid onto the belt plane over many layers,
-    // which BeltBrim.cpp does during posSupportMaterial.  With an untilted belt this
-    // could in principle fall through and produce an ordinary brim, but it would never
-    // reach the G-code: the plate brim is emitted out of skirt_brim_groups(), which
-    // _make_skirt() builds, and that returns early for every belt printer.  Running the
-    // generator anyway would just burn time on geometry nobody prints.
-    if (print.config().belt_printer.value)
-        return;
-
    std::map<ObjectInstanceID, ExPolygons> brimAreaMap;
    Flow                 flow = print.brim_flow();
    ExPolygons           islands_area_ex = outer_inner_brim_area(print,
@@ -84,7 +84,7 @@ public:
    indexed_triangle_set        bounding_mesh(bool scale=true) const;

    // Center of the print bed, unscaled.
-    Vec2d                       bed_center()        const { return get_extents(m_bed_shape).center(); }
+    Vec2d                       bed_center()        const { return to_2d(m_bboxf.center()); }
    // Convex hull of polygon(), scaled.
    const Polygon&              convex_hull()       const { return m_convex_hull; }
    // Smallest enclosing circle of polygon(), scaled.
@@ -85,15 +85,6 @@ set(lisbslic3r_sources
    BoundingBox.hpp
    BridgeDetector.cpp
    BridgeDetector.hpp
-    BeltBrim.cpp
-    BeltBrim.hpp
-    BeltGCode.cpp
-    BeltGCode.hpp
-    BeltPurge.cpp
-    BeltSliceStrategy.cpp
-    BeltSliceStrategy.hpp
-    BeltTransform.cpp
-    BeltTransform.hpp
    Brim.cpp
    BrimEarsPoint.hpp
    Brim.hpp
@@ -241,14 +232,6 @@ set(lisbslic3r_sources
    GCode/AdaptivePAProcessor.hpp
    GCode/AvoidCrossingPerimeters.cpp
    GCode/AvoidCrossingPerimeters.hpp
-    GCode/BeltBackTransform.cpp
-    GCode/BeltBackTransform.hpp
-    GCode/MachineFrameTransform.cpp
-    GCode/MachineFrameTransform.hpp
-    GCode/BeltKinematics.cpp
-    GCode/BeltKinematics.hpp
-    GCode/MachineKinematics.cpp
-    GCode/MachineKinematics.hpp
    GCode/ConflictChecker.cpp
    GCode/ConflictChecker.hpp
    GCode/CoolingBuffer.cpp
@@ -470,8 +453,6 @@ set(lisbslic3r_sources
    SlicingAdaptive.hpp
    Slicing.cpp
    Slicing.hpp
-    Support/BeltFloorContext.cpp
-    Support/BeltFloorContext.hpp
    Support/SupportCommon.cpp
    Support/SupportCommon.hpp
    Support/SupportLayer.hpp
@@ -403,11 +403,6 @@ inline void translate(ExPolygons &expolys, const Point &p) {
        expoly.translate(p);
 }

-inline void translate(Polygons &polys, const Point &p) {
-    for (Polygon &poly : polys)
-        poly.translate(p);
-}
-
 inline void polygons_append(Polygons &dst, const ExPolygon &src) 
 { 
    dst.reserve(dst.size() + src.holes.size() + 1);
@@ -18,7 +18,6 @@
 #include <utility>

 #include "ColorDecomposeRecipe.hpp"
-#include "Config.hpp"
 #include "FilamentMixerModel.hpp"
 #include "LocalesUtils.hpp"

@@ -428,59 +427,6 @@ std::vector<double> parse_mixed_ratios(const std::string &str, size_t n_componen
    return ratios;
 }

-std::string format_mixed_components(const std::vector<unsigned int> &components)
-{
-    std::string out;
-    for (size_t i = 0; i < components.size(); ++i) {
-        if (i > 0)
-            out += ",";
-        out += std::to_string(components[i]);
-    }
-    return out;
-}
-
-std::string format_mixed_ratios(const std::vector<int> &weights)
-{
-    int sum = std::accumulate(weights.begin(), weights.end(), 0);
-    if (sum <= 0)
-        sum = 100;
-    CNumericLocalesSetter c_locale_setter;
-    std::string           out;
-    for (size_t i = 0; i < weights.size(); ++i) {
-        if (i > 0)
-            out += ",";
-        char buf[32];
-        std::snprintf(buf, sizeof(buf), "%.4f", float(weights[i]) / float(sum));
-        out += buf;
-    }
-    return out;
-}
-
-int find_fixed_mixed_filament(const ConfigBase                &project_config,
-                              const std::vector<unsigned int> &components,
-                              const std::vector<int>          &weights)
-{
-    const auto *is_mixed = project_config.option<ConfigOptionBools>("filament_is_mixed");
-    const auto *comps    = project_config.option<ConfigOptionStrings>("filament_mixed_components");
-    const auto *ratios   = project_config.option<ConfigOptionStrings>("filament_mixed_sublayer_ratios");
-    if (is_mixed == nullptr || comps == nullptr || ratios == nullptr)
-        return -1;
-    // Created lazily with the first mixed slot, so an older project may not have it at all.
-    const auto *gradient = project_config.option<ConfigOptionBools>("filament_mixed_gradient");
-
-    const std::string comp_str  = format_mixed_components(components);
-    const std::string ratio_str = format_mixed_ratios(weights);
-    for (size_t i = 0; i < is_mixed->values.size(); ++i) {
-        if (!is_mixed->values[i] || i >= comps->values.size() || i >= ratios->values.size())
-            continue;
-        if (gradient != nullptr && i < gradient->values.size() && gradient->values[i])
-            continue;
-        if (comps->values[i] == comp_str && ratios->values[i] == ratio_str)
-            return int(i);
-    }
-    return -1;
-}
-
 bool has_any_mixed_filament(const std::vector<unsigned char> &is_mixed)
 {
    for (unsigned char v : is_mixed)
@@ -11,8 +11,6 @@

 namespace Slic3r {

-class ConfigBase;
-
 // Photoshop-style gradient curve control point in [0,1] x [0,1].
 // (x, y) is the anchor position; (m_in, m_out) are optional cubic Hermite tangent
 // overrides. NaN means "use the PCHIP-computed default", which is the case for plain
@@ -96,22 +94,6 @@ std::vector<unsigned int> parse_mixed_components(const std::string &str);
 // Normalizes so the sum equals 1.0.
 std::vector<double> parse_mixed_ratios(const std::string &str, size_t n_components);

-// The text a mixed slot stores in filament_mixed_components, e.g. {1, 3} → "1,3".
-std::string format_mixed_components(const std::vector<unsigned int> &components);
-
-// The text a mixed slot stores in filament_mixed_sublayer_ratios: the weights normalised to sum to 1,
-// four decimals, e.g. {1, 2} → "0.3333,0.6667". A non-positive sum is read as 100.
-std::string format_mixed_ratios(const std::vector<int> &weights);
-
-// The 0-based index of the mixed slot in `project_config` that blends `components` (1-based physical
-// filaments) in `weights` at a fixed ratio, or -1 when there is none. Matched on the stored text, as
-// format_mixed_components() and format_mixed_ratios() write it. A gradient slot never matches: its
-// ratio drifts from layer to layer, so it is not the blend asked for even where its stored ratios
-// are the same.
-int find_fixed_mixed_filament(const ConfigBase                &project_config,
-                              const std::vector<unsigned int> &components,
-                              const std::vector<int>          &weights);
-
 // Returns true if any element in is_mixed is true.
 // ConfigOptionBools stores values as std::vector<unsigned char>.
 bool has_any_mixed_filament(const std::vector<unsigned char> &is_mixed);
@@ -314,13 +314,8 @@ void AMFParserContext::startElement(const char *name, const char **atts)
    case 2:
        if (strcmp(name, "metadata") == 0) {
            if (m_path[1] == NODE_TYPE_MATERIAL || m_path[1] == NODE_TYPE_OBJECT) {
-                const char *type = get_attribute(atts, "type");
-                if (type == nullptr)
-                    this->stop();
-                else {
-                    m_value[0] = type;
-                    node_type_new = NODE_TYPE_METADATA;
-                }
+                m_value[0] = get_attribute(atts, "type");
+                node_type_new = NODE_TYPE_METADATA;
            }
        }/* else if (strcmp(name, "layer_config_ranges") == 0 && m_path[1] == NODE_TYPE_OBJECT)
                node_type_new = NODE_TYPE_LAYER_CONFIG;*/
@@ -21,6 +21,7 @@
 #include "libslic3r/BrimEarsPoint.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/TextureDisplacement.hpp"
 #include "libslic3r_version.h"

 #include "bbs_3mf.hpp"
@@ -62,6 +63,7 @@
 #include <ostream>
 #include <sstream>
 #include <set>
+#include <iterator>
 #include <memory>
 #include <optional>
 #include <map>
@@ -353,6 +355,13 @@ static constexpr const char* CUSTOM_SUPPORTS_ATTR = "paint_supports";
 static constexpr const char* CUSTOM_FUZZY_SKIN_ATTR  = "paint_fuzzy_skin";
 static constexpr const char* CUSTOM_SEAM_ATTR = "paint_seam";
 static constexpr const char* MMU_SEGMENTATION_ATTR = "paint_color";
+// Texture displacement. One paint mask per layer slot, mirroring paint_color; the layer stack itself is
+// a JSON file in the archive, named by the volume metadata key below (see add_texture_displacement()).
+static constexpr const char* TEXTURE_DISPLACEMENT_ATTRS[Slic3r::TEXTURE_DISPLACEMENT_MAX_LAYERS] = {
+    "paint_texture_0", "paint_texture_1", "paint_texture_2", "paint_texture_3",
+    "paint_texture_4", "paint_texture_5", "paint_texture_6", "paint_texture_7" };
+static constexpr const char* TEXTURE_DISPLACEMENT_KEY = "texture_displacement";
+static constexpr const char* TEXTURE_DISPLACEMENT_DIR = "Metadata/texture_displacement/";
 // BBS
 static constexpr const char* FACE_PROPERTY_ATTR = "face_property";

@@ -840,6 +849,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            std::vector<std::string> custom_seam;
            std::vector<std::string> mmu_segmentation;
            std::vector<std::string> fuzzy_skin;
+            // One per texture displacement layer slot, each parallel to `triangles` like the masks above.
+            std::vector<std::string> texture_displacement[TEXTURE_DISPLACEMENT_MAX_LAYERS];
            // BBS
            std::vector<std::string> face_properties;

@@ -860,6 +871,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                custom_seam.clear();
                mmu_segmentation.clear();
                fuzzy_skin.clear();
+                for (std::vector<std::string> &slot : texture_displacement)
+                    slot.clear();
            }
        };

@@ -1041,10 +1054,10 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            void _stop_object_xml_parser(const std::string& msg = std::string())
            {
                assert(! obj_parse_error);
+                assert(obj_parse_error_message.empty());
                assert(object_xml_parser != nullptr);
                obj_parse_error = true;
-                if (! msg.empty() || obj_parse_error_message.empty())   // a handler may have set the message already
-                    obj_parse_error_message = msg;
+                obj_parse_error_message = msg;
                XML_StopParser(object_xml_parser, false);
            }

@@ -1193,6 +1206,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        /*IdToSlaSupportPointsMap m_sla_support_points;
        IdToSlaDrainHolesMap    m_sla_drain_holes;*/
        PathToEmbossShapeFileMap m_path_to_emboss_shape_files;
+        // Texture displacement: every file under Metadata/texture_displacement/, by archive path. Volumes
+        // are built only after the whole archive has been walked, so by the time a volume names its JSON
+        // every file it could refer to is already in here, whatever order the archive happened to be in.
+        std::map<std::string, std::string> m_texture_displacement_files;
+        void _apply_texture_displacement(ModelVolume &volume, const std::string &json_path);
        std::string m_curr_metadata_name;
        std::string m_curr_characters;
        std::string m_name;
@@ -1395,7 +1413,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)

        bool _handle_start_relationship(const char** attributes, unsigned int num_attributes);

-        bool _generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap& current_objects);
+        void _generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap& current_objects);
        bool _generate_volumes_new(ModelObject& object, const std::vector<Component> &sub_objects, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions);
        //bool _generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions);

@@ -2066,6 +2084,13 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                else if (_is_svg_shape_file(name)) {
                    _extract_embossed_svg_shape_file(name, archive, stat);
                }
+                else if (boost::algorithm::istarts_with(name, TEXTURE_DISPLACEMENT_DIR)) {
+                    std::string contents(stat.m_uncomp_size, '\0');
+                    if (mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, contents.data(), stat.m_uncomp_size, 0))
+                        m_texture_displacement_files.emplace(name, std::move(contents));
+                    else
+                        add_error("Error while reading texture displacement data");
+                }
                else if (!dont_load_config && boost::algorithm::iequals(name, SLICE_INFO_CONFIG_FILE)) {
                    m_parsing_slice_info = true;
                    //extract slice info from archive
@@ -2117,8 +2142,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                        return false;
                    }
                    std::vector<Component> object_id_list;
-                    if (!_generate_current_object_list(object_id_list, object.first, m_current_objects))
-                        return false;
+                    _generate_current_object_list(object_id_list, object.first, m_current_objects);

                    ObjectMetadata::VolumeMetadataList volumes;
                    ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr;
@@ -2217,8 +2241,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            }*/

            std::vector<Component> object_id_list;
-            if (!_generate_current_object_list(object_id_list, object.first, m_current_objects))
-                return false;
+            _generate_current_object_list(object_id_list, object.first, m_current_objects);

            ObjectMetadata::VolumeMetadataList volumes;
            ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr;
@@ -3303,6 +3326,59 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        }
    }*/

+    // Restores one volume's texture displacement stack from the JSON it named. Called while the volume is
+    // being built, which is after the whole archive has been walked - so every file it can refer to is
+    // already extracted, and no deferral is needed.
+    //
+    // A missing or malformed JSON leaves the volume with no layers but keeps the paint mask it already
+    // loaded, which is the same state as a project saved by a build without the feature: recoverable by
+    // picking the texture again rather than a hard failure.
+    void _BBS_3MF_Importer::_apply_texture_displacement(ModelVolume &volume, const std::string &json_path)
+    {
+        const auto json = m_texture_displacement_files.find(json_path);
+        if (json == m_texture_displacement_files.end()) {
+            add_error("Missing texture displacement data: " + json_path);
+            return;
+        }
+        std::vector<TextureDisplacementLayer> layers;
+        TextureDisplacementOptions            options;
+        if (!texture_displacement_layers_from_json(json->second, layers, options)) {
+            add_error("Malformed texture displacement data: " + json_path);
+            return;
+        }
+        // A layer the archive carries no image for - saved while its texture had not been loaded, or
+        // written by a build that stored only the path - falls back to the file it came from. The
+        // importer copies every texture into the user's own library, so that path resolves on the
+        // machine the project was made on and quietly resolves nowhere else, which is the old
+        // behaviour: settings restored, pixels not.
+        const auto load_image_from_disk = [](TextureDisplacementLayer &layer) {
+            boost::system::error_code ec;
+            if (layer.path.empty() || !boost::filesystem::is_regular_file(layer.path, ec) || ec)
+                return;
+            boost::nowide::ifstream file(layer.path, std::ios::binary);
+            if (!file.good())
+                return;
+            std::vector<unsigned char> bytes((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
+            if (!bytes.empty())
+                layer.image_data = std::make_shared<std::vector<unsigned char>>(std::move(bytes));
+        };
+
+        for (TextureDisplacementLayer &layer : layers) {
+            if (!layer.path_in_3mf.empty()) {
+                if (const auto image = m_texture_displacement_files.find(layer.path_in_3mf);
+                    image != m_texture_displacement_files.end()) {
+                    layer.image_data = std::make_shared<std::vector<unsigned char>>(image->second.begin(),
+                                                                                    image->second.end());
+                    continue;
+                }
+                add_error("Missing texture displacement image: " + layer.path_in_3mf);
+            }
+            load_image_from_disk(layer);
+        }
+        volume.texture_displacement_layers  = std::move(layers);
+        volume.texture_displacement_options = options;
+    }
+
    void _BBS_3MF_Importer::_extract_embossed_svg_shape_file(const std::string &filename, mz_zip_archive &archive, const mz_zip_archive_file_stat &stat){
        assert(m_path_to_emboss_shape_files.find(filename) == m_path_to_emboss_shape_files.end());
        auto file = std::make_unique<std::string>(stat.m_uncomp_size, '\0');
@@ -3903,18 +3979,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
    {
        // appends the vertex coordinates
        // missing values are set equal to ZERO
-        if (m_curr_object) {
-            const Vec3f v(m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR),
-                          m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR),
-                          m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR));
-            // A non-finite coordinate ("nan", "inf") used to be accepted and crashed
-            // qhull in ModelVolume's convex hull while the file was still loading. Refuse the file.
-            if (! v.allFinite()) {
-                _stop_xml_parser("Invalid vertex coordinate: not a finite number");
-                return true;   // the parser is stopped; returning false would overwrite the message
-            }
-            m_curr_object->geometry.vertices.emplace_back(v);
-        }
+        if (m_curr_object)
+            m_curr_object->geometry.vertices.emplace_back(
+                m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR),
+                m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR),
+                m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR));
        return true;
    }

@@ -3959,6 +4028,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            m_curr_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR));
            m_curr_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR));
            m_curr_object->geometry.fuzzy_skin.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_FUZZY_SKIN_ATTR));
+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot)
+                m_curr_object->geometry.texture_displacement[slot].push_back(
+                    bbs_get_attribute_value_string(attributes, num_attributes, TEXTURE_DISPLACEMENT_ATTRS[slot]));
            // BBS
            m_curr_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR));
        }
@@ -5073,18 +5145,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        return true;
    }

-    bool _BBS_3MF_Importer::_generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap &current_objects)
+    void _BBS_3MF_Importer::_generate_current_object_list(std::vector<Component> &sub_objects, Id object_id, IdToCurrentObjectMap &current_objects)
    {
-        // A cycle in the component graph would expand forever, and an acyclic graph can still expand
-        // exponentially, so bound the number of component references queued. Checking before they are
-        // queued bounds the work list itself, whatever the fan-out. A valid file over the budget is
-        // rejected too, but the budget is way above the component references of any real object.
-        static constexpr size_t max_components = 100000;
-
        std::list<std::pair<Component, Transform3d>> id_list;
        id_list.push_back(std::make_pair(Component(object_id, Transform3d::Identity()), Transform3d::Identity()));

-        size_t num_components = 0;
        while (!id_list.empty())
        {
            auto current_item = id_list.front();
@@ -5094,12 +5159,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            if (current_object != current_objects.end()) {
                //found one
                if (!current_object->second.components.empty()) {
-                    num_components += current_object->second.components.size();
-                    if (num_components > max_components) {
-                        add_error("invalid 3mf: cyclic or too many component references");
-                        sub_objects.clear();
-                        return false;
-                    }
                    for (const Component &comp : current_object->second.components) {
                        id_list.push_back(std::pair(comp, current_item.second * comp.transform));
                    }
@@ -5111,7 +5170,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                }
            }
        }
-        return true;
    }

    bool _BBS_3MF_Importer::_generate_volumes_new(ModelObject& object, const std::vector<Component> &sub_objects, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions)
@@ -5218,11 +5276,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                    }
                }

-                for (const Vec3f &v : sub_object->geometry.vertices)
-                    if (! v.allFinite()) {   // Qhull cannot take a NaN vertex
-                        add_error("invalid (non-finite) vertex in object " + std::to_string(sub_object->id));
-                        return false;
-                    }
                its.vertices.assign(sub_object->geometry.vertices.begin(), sub_object->geometry.vertices.end());

                // BBS
@@ -5304,6 +5357,18 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                volume->mmu_segmentation_facets.touch();
                volume->fuzzy_skin_facets.shrink_to_fit();
                volume->fuzzy_skin_facets.touch();
+                for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot) {
+                    const std::vector<std::string> &mask = sub_object->geometry.texture_displacement[slot];
+                    if (mask.empty())
+                        continue; // written by a build without the feature
+                    FacetsAnnotation &facets = volume->texture_displacement_facet(slot);
+                    facets.reserve(triangles_count);
+                    for (size_t i = 0; i < triangles_count && i < mask.size(); ++i)
+                        if (!mask[i].empty())
+                            facets.set_triangle_from_string(i, mask[i]);
+                    facets.shrink_to_fit();
+                    facets.touch();
+                }
            }

            volume->set_type(volume_data->part_type);
@@ -5319,6 +5384,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            for (const Metadata& metadata : volume_data->metadata) {
                if (metadata.key == NAME_KEY)
                    volume->name = metadata.value;
+                else if (metadata.key == TEXTURE_DISPLACEMENT_KEY)
+                    _apply_texture_displacement(*volume, metadata.value);
                //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1"))
 				//	volume->set_type(ModelVolumeType::PARAMETER_MODIFIER);
 				//for old format
@@ -5483,12 +5550,28 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            volume->seam_facets.shrink_to_fit();
            volume->mmu_segmentation_facets.shrink_to_fit();

+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot) {
+                const std::vector<std::string> &mask = geometry.texture_displacement[slot];
+                if (mask.empty())
+                    continue; // written by a build without the feature
+                FacetsAnnotation &facets = volume->texture_displacement_facet(slot);
+                facets.reserve(triangles_count);
+                for (size_t i = 0; i < triangles_count; ++i) {
+                    const size_t index = volume_data.first_triangle_id + i;
+                    if (index < mask.size() && !mask[index].empty())
+                        facets.set_triangle_from_string(i, mask[index]);
+                }
+                facets.shrink_to_fit();
+                facets.touch();
+            }
            volume->set_type(volume_data.part_type);

            // apply the remaining volume's metadata
            for (const Metadata& metadata : volume_data.metadata) {
                if (metadata.key == NAME_KEY)
                    volume->name = metadata.value;
+                else if (metadata.key == TEXTURE_DISPLACEMENT_KEY)
+                    _apply_texture_displacement(*volume, metadata.value);
                //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1"))
 				//	volume->set_type(ModelVolumeType::PARAMETER_MODIFIER);
 				//for old format
@@ -5736,18 +5819,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
    {
        // appends the vertex coordinates
        // missing values are set equal to ZERO
-        if (current_object) {
-            const Vec3f v(object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR),
-                          object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR),
-                          object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR));
-            // See _BBS_3MF_Importer::_handle_start_vertex: a non-finite coordinate
-            // crashed qhull while the file loaded. The dispatcher stops this parser on `false`.
-            if (! v.allFinite()) {
-                obj_parse_error_message = "Invalid vertex coordinate: not a finite number";
-                return false;
-            }
-            current_object->geometry.vertices.emplace_back(v);
-        }
+        if (current_object)
+            current_object->geometry.vertices.emplace_back(
+                object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR),
+                object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR),
+                object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR));
        return true;
    }

@@ -5792,6 +5868,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
            current_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR));
            current_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR));
            current_object->geometry.fuzzy_skin.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_FUZZY_SKIN_ATTR));
+            for (int slot = 0; slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS); ++slot)
+                current_object->geometry.texture_displacement[slot].push_back(
+                    bbs_get_attribute_value_string(attributes, num_attributes, TEXTURE_DISPLACEMENT_ATTRS[slot]));
            // BBS
            current_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR));
        }
@@ -6795,6 +6874,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        stream << " <Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>\n";
        stream << " <Default Extension=\"model\" ContentType=\"application/vnd.ms-package.3dmanufacturing-3dmodel+xml\"/>\n";
        stream << " <Default Extension=\"png\" ContentType=\"image/png\"/>\n";
+        stream << " <Default Extension=\"jpg\" ContentType=\"image/jpeg\"/>\n";
+        stream << " <Default Extension=\"jpeg\" ContentType=\"image/jpeg\"/>\n";
+        stream << " <Default Extension=\"json\" ContentType=\"application/json\"/>\n";
        stream << " <Default Extension=\"gcode\" ContentType=\"text/x.gcode\"/>\n";
        stream << "</Types>";

@@ -7638,6 +7720,20 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                    output_buffer += "\"";
                }

+                // One attribute per texture displacement layer slot. Older readers ignore attributes they do
+                // not know, so a project written here still opens in a build without the feature - it just
+                // loses the paint, which is also all it could have done with it.
+                for (int slot = 0; slot < TEXTURE_DISPLACEMENT_MAX_LAYERS; ++slot) {
+                    const std::string texture_paint = volume->texture_displacement_facet(slot).get_triangle_as_string(i);
+                    if (texture_paint.empty())
+                        continue;
+                    output_buffer += " ";
+                    output_buffer += TEXTURE_DISPLACEMENT_ATTRS[slot];
+                    output_buffer += "=\"";
+                    output_buffer += texture_paint;
+                    output_buffer += "\"";
+                }
+
                // BBS
                if (i < its.properties.size()) {
                    std::string prop_str = its.properties[i].to_string();
@@ -8087,7 +8183,42 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
        return file_path;
    }

-    bool _BBS_3MF_Exporter::_add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config, int export_plate_idx, bool save_gcode, bool use_loaded_id)
+    // Writes a volume's texture displacement stack into the archive and points the volume's metadata at it.
+// The layer settings go in as JSON and each layer's texture as the image file it was loaded from, both
+// referenced by path - the same split EmbossShape makes for its SVG. The image deliberately stays out of
+// the XML: it is binary and routinely megabytes, and base64 in an attribute would bloat the one file
+// every reader has to parse just to list the objects.
+static void add_texture_displacement(std::stringstream &stream, const ModelVolume &volume, mz_zip_archive &archive,
+                                     const std::string &id)
+{
+    if (volume.texture_displacement_layers.empty())
+        return;
+
+    // A copy, because path_in_3mf is only meaningful inside the archive being written and the volume
+    // being exported is const (and may be saved again, elsewhere, with different paths).
+    std::vector<TextureDisplacementLayer> layers = volume.texture_displacement_layers;
+    for (TextureDisplacementLayer &layer : layers) {
+        layer.path_in_3mf.clear();
+        if (!layer.image_data || layer.image_data->empty())
+            continue;
+        // Always .png: the importer converts whatever the user picked (jpg, bmp, ...) to an 8-bit
+        // greyscale PNG, so image_data is PNG whatever layer.path happens to be named.
+        const std::string path = std::string(TEXTURE_DISPLACEMENT_DIR) + id + "_" + std::to_string(layer.slot) + ".png";
+        // No deflate: a PNG is already compressed, so a second pass only costs time.
+        if (mz_zip_writer_add_mem(&archive, path.c_str(), layer.image_data->data(), layer.image_data->size(),
+                                  MZ_NO_COMPRESSION))
+            layer.path_in_3mf = path;
+    }
+
+    const std::string json      = texture_displacement_layers_to_json(layers, volume.texture_displacement_options);
+    const std::string json_path = std::string(TEXTURE_DISPLACEMENT_DIR) + id + ".json";
+    if (!mz_zip_writer_add_mem(&archive, json_path.c_str(), json.data(), json.size(), MZ_DEFAULT_COMPRESSION))
+        return;
+    stream << "      <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << TEXTURE_DISPLACEMENT_KEY << "\" "
+           << VALUE_ATTR << "=\"" << xml_escape(json_path) << "\"/>\n";
+}
+
+bool _BBS_3MF_Exporter::_add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config, int export_plate_idx, bool save_gcode, bool use_loaded_id)
    {
        std::stringstream stream;
        // Store mesh transformation in full precision, as the volumes are stored transformed and they need to be transformed back
@@ -8198,6 +8329,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
                            if (const std::optional<EmbossShape> &es = volume->emboss_shape; es.has_value()) {
                                to_xml(stream, *es, *volume, archive, m_fullpath_sources);
                            }
+
+                            add_texture_displacement(stream, *volume, archive, std::to_string(volume->id().id));
                    
                            if (const std::optional<TextConfiguration> &tc = volume->text_configuration;
                                tc.has_value())
@@ -7,7 +7,6 @@
 #include "Print.hpp"
 #include "libslic3r.h"
 #include "GCodeWriter.hpp"
-#include "GCode/BeltKinematics.hpp"
 #include "Layer.hpp"
 #include "Point.hpp"
 #include "PlaceholderParser.hpp"
@@ -41,16 +40,13 @@
 #include <memory>
 #include <map>
 #include <unordered_map>
-#include <optional>
 #include <set>
 #include <string>
 #include <cfloat>
 #include <vector>
 #include <utility>
-#include <cmath>
 #include "BoundingBox.hpp"
 #include "Polyline.hpp"
-#include "BeltBrim.hpp"

 namespace Slic3r { class ExtrusionEntityCollection; }

@@ -253,9 +249,8 @@ public:
        m_toolchange_count(0),
        m_nominal_z(0.)
        {}
-    virtual ~GCode() = default;
+    ~GCode() = default;

-public:
    // throws std::runtime_exception on error,
    // throws CanceledException through print->throw_if_canceled().
    void            do_export(Print* print, const char* path, GCodeProcessorResult* result = nullptr, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);
@@ -347,13 +342,6 @@ public:
        const Layer* 		object_layer;
        const SupportLayer* support_layer;
        const PrintObject*  original_object; //BBS: used for shared object logic
-        // Belt printers only: an apron band that prints BELOW the object's first
-        // layer, so it has no object or support layer of its own.  Deliberately
-        // not a Layer, so it cannot leak Layer::id() semantics into initial-layer
-        // temperature, spiral vase, cooling or interpolation logic.  When this is
-        // the only thing set, layer() is null and process_layer() takes its
-        // dedicated brim-only branch.
-        const BeltBrimBand* belt_brim_band { nullptr };
        const Layer* 		layer()   const
        {
            if (object_layer != nullptr)
@@ -383,17 +371,11 @@ public:
                count++;
            }

-            // A brim-only apron band contributes no object/support layer, and
-            // averaging zero terms would yield NaN.  Never folded into the
-            // average, so the non-belt result is bit-identical.
-            if (count == 0 && belt_brim_band != nullptr)
-                return belt_brim_band->print_z;
-
            return sum_z / count;
        }
    };

-protected:
+private:
    class GCodeOutputStream {
    public:
        GCodeOutputStream(FILE *f, GCodeProcessor &processor) : f(f), m_processor(processor) {}
@@ -421,21 +403,9 @@ protected:
        FILE *f = nullptr;
        GCodeProcessor &m_processor;
    };
-
-    // Virtual hooks for belt printer subclass (BeltGCode).
-    // No-ops in base GCode; overridden in BeltGCode.
-    virtual void init_belt_writer(Print &print) {}
-    virtual void write_belt_header(GCodeOutputStream &file, const Print &print) {}
-    virtual void on_set_origin(const PrintObject *obj, const Point &inst_shift) {}
-    // Arc fitting is suppressed whenever the writer's machine mapping cannot
-    // represent a G2/G3 arc. Belt printers get this through BeltKinematics
-    // rather than through an override of their own.
-    virtual bool should_disable_arc_fitting() const
-        { return ! m_writer.kinematics().supports_arc_moves(); }
-
    void            _do_export(Print &print, GCodeOutputStream &file, ThumbnailsGeneratorCallback thumbnail_cb);

-    static std::vector<LayerToPrint>        		                   collect_layers_to_print(const PrintObject &object, bool skip_empty_first_layer = false);
+    static std::vector<LayerToPrint>        		                   collect_layers_to_print(const PrintObject &object);
    static std::vector<std::pair<coordf_t, std::vector<LayerToPrint>>> collect_layers_to_print(const Print &print);

    std::string generate_skirt(const Print &print,
@@ -455,29 +425,7 @@ protected:
    std::string generate_object_brim(const Print &print,
        const PrintObject &object,
        size_t instance_id,
-        bool first_layer,
-        const Layer *object_layer);
-
-    // Belt printers: emit one brim-only apron layer.  These print below the
-    // object's first layer, so there is no object or support layer for the normal
-    // process_layer() machinery to work from.  Kept to the minimum a layer needs -
-    // tool, Z move, extrusions - so that nothing here can perturb the
-    // Layer::id()-based logic the ordinary path relies on.
-    LayerResult process_belt_brim_layer(
-        const Print                     &print,
-        const std::vector<LayerToPrint> &layers,
-        const LayerTools                &layer_tools,
-        const bool                       last_layer,
-        const size_t                     single_object_instance_idx);
-
-    // Emit the apron bands carried by these layers whose brim filament is extruder_id
-    // (0-based).  Called from both the brim-only branch and the ordinary path, since a
-    // band's print_z can coincide with another object's layer on a multi-object belt.
-    std::string emit_belt_brim_bands(
-        const Print                     &print,
-        const std::vector<LayerToPrint> &layers,
-        const size_t                     single_object_instance_idx,
-        const unsigned int               extruder_id);
+        bool first_layer);

    LayerResult process_layer(
        const Print                     &print,
@@ -681,21 +629,9 @@ protected:
    };

    // Cache the per-filament island tour to avoid recomputing while the layer's island layout is
-    // unchanged. Key: filament_id. Value: the nodes the tour was computed from, the per-instance
-    // island layout (count and whether the trailing catch-all island has anything to print), and
-    // the resulting visits.
-    // The layout is part of the key. Nodes only cover the chainable islands, so two
-    // layers with the same centroids but a different number of islands (thin walls, negative
-    // volumes come and go) matched the cache and the visit's catch-all index -- islands.size() - 1
-    // of the OLD layer -- ran past the new layer's islands (found by fuzzing: segfault in
-    // extrude_perimeters on multi-part objects).
-    struct IslandOrderCacheEntry
-    {
-        std::vector<IslandOrderNode>         nodes;
-        std::vector<std::pair<size_t, bool>> layout;
-        std::vector<InstanceVisit>           visits;
-    };
-    std::map<unsigned int, IslandOrderCacheEntry> m_ordering_cache;
+    // unchanged. Key: filament_id. Value: {nodes the tour was computed from, resulting visits}.
+    std::map<unsigned int, std::pair<std::vector<IslandOrderNode>, std::vector<InstanceVisit>>>
+                                        m_ordering_cache;

    ExtrusionQualityEstimator m_extrusion_quality_estimator;

@@ -832,6 +768,7 @@ protected:

    std::unique_ptr<CoolingBuffer>      m_cooling_buffer;
    std::unique_ptr<SpiralVase>         m_spiral_vase;
+
    std::unique_ptr<PressureEqualizer>  m_pressure_equalizer;
    
    std::unique_ptr<AdaptivePAProcessor>      m_pa_processor;
@@ -886,25 +823,6 @@ protected:
    mutable ConfigIndexCache m_filament_index_cache;
    mutable ConfigIndexCache m_nozzle_index_cache;

-    // Belt brim apron layers only.  They have no Layer, so the print_z that
-    // _extrude() needs for the first-layer-plane probe is published here instead.
-    // Scoped by BeltBrimZGuard in process_belt_brim_layer(), never left set.
-    std::optional<coordf_t> m_belt_brim_z;
-    // Belt brim only.  Brim and coincident apron bands are emitted before m_layer
-    // is switched to their object, so belt_height_above_floor() would otherwise
-    // read the previously visited object's belt description -- making a brim's
-    // classification depend on plate visiting order.  Those paths publish the
-    // owner here for the duration of the emission.  Never left set.
-    const PrintObject *m_belt_floor_object{nullptr};
-    struct BeltFloorObjectGuard {
-        const PrintObject *&slot;
-        BeltFloorObjectGuard(const PrintObject *&s, const PrintObject *o) : slot(s) { slot = o; }
-        ~BeltFloorObjectGuard() { slot = nullptr; }
-    };
-
-    // The last extrusion segment was inside the belt's first-layer fan band (see _extrude()).
-    bool m_belt_in_band{false};
-
    std::set<unsigned int>                  m_initial_layer_extruders;
    std::vector<std::vector<unsigned int>>  m_sorted_layer_filaments;
    // BBS
@@ -922,46 +840,6 @@ protected:
    // On the first printing layer. This flag triggers first layer speeds.
    //BBS
    bool    on_first_layer() const { return m_layer != nullptr && m_layer->id() == 0 && abs(m_layer->bottom_z()) < EPSILON; }
-    // Per-point first-layer test.  On a belt printer the result depends on the
-    // supplied slicing-frame point (its height above the belt); otherwise we
-    // delegate to the legacy per-layer test.  This is the entry point used by
-    // per-path call sites in _extrude.
-    bool on_first_layer(const Vec3d &point_slicing_mm) const {
-        double h;
-        if (this->belt_height_above_floor(point_slicing_mm, h))
-            return h <= m_config.initial_layer_print_height.value + EPSILON;
-        return on_first_layer();
-    }
-    // "Effective layer index" used to drive layer-count thresholds like
-    // slow_down_layers.  On a belt printer this is the height above the belt in
-    // first_layer_band_mm() units; otherwise it is the legacy slicing layer index.
-    int effective_layer_index_for_point(const Vec3d &point_slicing_mm) const {
-        double h;
-        if (this->belt_height_above_floor(point_slicing_mm, h)) {
-            const double lh = this->first_layer_band_mm();
-            return h <= 0. ? 0 : int(std::floor(h / lh));
-        }
-        return on_first_layer() ? 0 : layer_id();
-    }
-
-    // Band thickness for the *effective layer index*: one first layer height, so
-    // "the first N layers" means the same height above the belt as on a flat bed.
-    double first_layer_band_mm() const {
-        const double band = m_config.initial_layer_print_height.value;
-        return band > 0. ? band : 0.2;
-    }
-
-    // Height of a slicing-frame point above the belt surface, or false when this
-    // is not a belt print.
-    //
-    // The belt surface is known exactly in the slicing frame from the slicing
-    // parameters (belt_floor_shear_factor / _from_axis / _z_shift) -- the same
-    // description the support generator uses, independent of every remap and
-    // back-transform.
-    bool belt_height_above_floor(const Vec3d &point_slicing_mm, double &height_mm) const;
-    // 1 / 0 / -1: the object layer is entirely past the first-layer band above the
-    // belt / reaches into it / the belt surface is not known for it.
-    int  belt_layer_past_first_layer_band(const Layer *object_layer) const;
    int layer_id() const {
        if (m_layer == nullptr)
            return -1;
@@ -1,33 +0,0 @@
-#include "BeltBackTransform.hpp"
-#include "../BeltTransform.hpp"
-#include "../Point.hpp"
-#include "../PrintConfig.hpp"
-
-namespace Slic3r {
-
-bool BeltBackTransform::init_from_config(const PrintConfig &config)
-{
-    m_active  = false;
-    m_inverse = Transform3d::Identity();
-
-    if (!config.belt_printer.value)
-        return false;
-
-    // Build the forward pipeline (the rotation) and store its inverse.
-    Transform3d forward = BeltTransformPipeline::build_forward_transform(config);
-    if (forward.isApprox(Transform3d::Identity()))
-        return false;
-
-    m_inverse = forward.inverse();
-    m_active  = true;
-    return true;
-}
-
-Vec3d BeltBackTransform::apply(const Vec3d &pos) const
-{
-    if (!m_active)
-        return pos;
-    return m_inverse * pos;
-}
-
-} // namespace Slic3r
@@ -1,38 +0,0 @@
-#ifndef slic3r_BeltBackTransform_hpp_
-#define slic3r_BeltBackTransform_hpp_
-
-#include "../libslic3r.h"
-#include "../Point.hpp"
-#include "../PrintConfig.hpp"
-
-namespace Slic3r {
-
-// Reverses the pre-slice rotation that PrintObjectSlice.cpp applies to belt
-// printer geometry, converting G-code coordinates from the sliced (rotated)
-// frame back to the machine's real coordinate space.
-//
-// Initialized once from PrintConfig, then applied per-point in
-// BeltKinematics::to_machine() before axis remapping.
-//
-// Active on belt printers with a non-identity pre-slice rotation.
-class BeltBackTransform
-{
-public:
-    BeltBackTransform() = default;
-
-    // Initialize from belt printer config.  Rebuilds the same pre-slice rotation
-    // as PrintObjectSlice.cpp and precomputes the affine inverse.  Returns true if a non-identity back-transform was computed.
-    bool init_from_config(const PrintConfig &config);
-
-    // Apply the inverse transform to a point.  Returns pos unchanged if
-    // no back-transform is active.
-    Vec3d apply(const Vec3d &pos) const;
-
-private:
-    bool       m_active  = false;
-    Transform3d m_inverse = Transform3d::Identity();
-};
-
-} // namespace Slic3r
-
-#endif // slic3r_BeltBackTransform_hpp_
@@ -1,29 +0,0 @@
-#include "BeltKinematics.hpp"
-#include "../BeltTransform.hpp"
-#include "../PrintConfig.hpp"
-#include "../GCodeWriter.hpp"
-#include "../Point.hpp"
-#include <memory>
-
-namespace Slic3r {
-
-BeltKinematics::BeltKinematics(const PrintConfig &config, bool world_coordinates)
-    : m_world_coordinates(world_coordinates)
-{
-    m_back_transform.init_from_config(config);
-    m_machine_frame.init_from_config(config);
-}
-
-Vec3d BeltKinematics::to_machine(const Vec3d &p) const
-{
-    const Vec3d after_back  = m_world_coordinates ? p : m_back_transform.apply(p);
-    const Vec3d after_remap = this->apply_axis_remap(after_back);
-    return m_machine_frame.apply(after_remap);
-}
-
-void install_belt_kinematics(GCodeWriter &writer, const PrintConfig &config, bool world_coordinates)
-{
-    writer.set_kinematics(std::make_unique<BeltKinematics>(config, world_coordinates));
-}
-
-} // namespace Slic3r
@@ -1,59 +0,0 @@
-#ifndef slic3r_BeltKinematics_hpp_
-#define slic3r_BeltKinematics_hpp_
-
-#include "MachineKinematics.hpp"
-#include "BeltBackTransform.hpp"
-#include "MachineFrameTransform.hpp"
-#include "../Point.hpp"
-
-namespace Slic3r {
-
-class PrintConfig;
-class GCodeWriter;
-
-// Belt-printer machine frame.
-//
-// Forward order, as applied per emitted point:
-//     machine = MachineFrameTransform( axis_remap( BeltBackTransform( logical ) ) )
-//
-// i.e. the slicer->world back-transform runs FIRST and the machine-frame
-// shear/scale LAST, so the latter acts as a global linear transform on the
-// already-placed coordinates.
-//
-// world_coordinates mode (the PA line / PA pattern calibration generators)
-// treats the incoming point as already relative to the belt surface -- X across,
-// Y along the belt, Z above it -- and therefore skips the back-transform while
-// keeping the remap and the machine frame. It is a different coordinate map, not
-// a writer mode, which is why it is fixed at construction.
-class BeltKinematics : public CartesianKinematics
-{
-public:
-    explicit BeltKinematics(const PrintConfig &config, bool world_coordinates = false);
-
-    Vec3d to_machine(const Vec3d &p) const override;
-
-    // A belt writer has always emitted full XYZ on every move, whether or not any
-    // individual stage reports itself active. Making this conditional would change
-    // emitted G-code for an identity-transform belt configuration.
-    bool must_emit_all_axes() const override { return true; }
-    bool suppress_lift_at_unknown_position() const override { return true; }
-    // The machine frame shears and scales, so a circle is an ellipse in machine
-    // coordinates and G2/G3 cannot describe it.
-    bool supports_arc_moves() const override { return false; }
-
-private:
-    BeltBackTransform     m_back_transform;
-    MachineFrameTransform m_machine_frame;
-    bool                  m_world_coordinates { false };
-};
-
-// Install a belt machine frame on any GCodeWriter. Any axis remap and build
-// volume already configured on the writer are carried over, so this may be
-// called before or after those setters. Re-calling it with a different
-// world_coordinates value swaps the map (used around the PA line generator).
-void install_belt_kinematics(GCodeWriter &writer, const PrintConfig &config,
-                             bool world_coordinates = false);
-
-} // namespace Slic3r
-
-#endif // slic3r_BeltKinematics_hpp_
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <float.h>
 #include <string>
-#include <string_view>
 #include <system_error>
 #include <unordered_map>
 #include <vector>
@@ -47,12 +46,10 @@ CoolingBuffer::CoolingBuffer(GCode &gcodegen) : m_config(gcodegen.config()), m_g
        m_num_extruders = std::max(ex.id() + 1, m_num_extruders);
        m_extruder_ids.emplace_back(ex.id());
    }
-
 }

 void CoolingBuffer::reset(const Vec3d &position)
 {
-    m_belt_band_active = false;
    // BBS: add I and J axis to store center of arc
    m_current_pos.assign(7, 0.f);
    m_current_pos[0] = float(position.x());
@@ -92,9 +89,6 @@ struct CoolingLine
        // ORCA: Add support for ironing fan speed control
        TYPE_IRONING_FAN_START         = 1 << 19,
        TYPE_IRONING_FAN_END           = 1 << 20,
-        // Belt printers: extrusions within the first-layer band above the belt.
-        TYPE_BELT_BAND_START           = 1 << 21,
-        TYPE_BELT_BAND_END             = 1 << 22,
    };

    CoolingLine(unsigned int type, size_t  line_start, size_t  line_end) :
@@ -555,10 +549,6 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
            line.type = CoolingLine::TYPE_IRONING_FAN_START;
        } else if (boost::starts_with(sline, ";_IRONING_FAN_END")) { // ORCA: Add support for ironing fan speed control
            line.type = CoolingLine::TYPE_IRONING_FAN_END;
-        } else if (boost::starts_with(sline, ";_BELT_BAND_START")) {
-            line.type = CoolingLine::TYPE_BELT_BAND_START;
-        } else if (boost::starts_with(sline, ";_BELT_BAND_END")) {
-            line.type = CoolingLine::TYPE_BELT_BAND_END;
        } else if (boost::starts_with(sline, "G4 ")) {
            // Parse the wait time.
            line.type = CoolingLine::TYPE_G4;
@@ -901,9 +891,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
                                                               {CoolingLine::TYPE_SUPPORT_INTERFACE_FAN_START, false},
                                                               {CoolingLine::TYPE_IRONING_FAN_START, false}, // ORCA: Add support for ironing fan speed control
                                                               {CoolingLine::TYPE_FORCE_RESUME_FAN, false}};
-    // Belt printers: a band still open from the previous layer has to take the fan back from
-    // the layer-level speed issued just above.
-    bool need_set_fan = m_belt_band_active;
+    bool need_set_fan = false;

    for (const CoolingLine *line : lines) {
        const char *line_start  = gcode.c_str() + line->line_start;
@@ -917,8 +905,6 @@ std::string CoolingBuffer::apply_layer_cooldown(
                if (new_extruder != m_current_extruder) {
                    m_current_extruder = new_extruder;
                    change_extruder_set_fan(true);
-                    if (m_belt_band_active)
-                        need_set_fan = true;
                }
            }
            new_gcode.append(line_start, line_end - line_start);
@@ -971,13 +957,6 @@ std::string CoolingBuffer::apply_layer_cooldown(
            if (m_additional_fan_speed != -1 && m_config.auxiliary_fan.value)
                new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed);
        }
-        else if (line->type & CoolingLine::TYPE_BELT_BAND_START) {
-            m_belt_band_active = true;
-            need_set_fan       = true;
-        } else if (line->type & CoolingLine::TYPE_BELT_BAND_END) {
-            m_belt_band_active = false;
-            need_set_fan       = true;
-        }
        else if (line->type & CoolingLine::TYPE_EXTRUDE_END) {
            // Just remove this comment.
        } else if (line->type & (CoolingLine::TYPE_ADJUSTABLE | CoolingLine::TYPE_EXTERNAL_PERIMETER | CoolingLine::TYPE_WIPE | CoolingLine::TYPE_HAS_F)) {
@@ -1070,15 +1049,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
                    m_current_fan_speed = speed;
                }
            };
-            if (m_belt_band_active) {
-                // Belt printers: a tilted layer runs from the belt to the top of the part, so
-                // "the first layers" are a band along the belt rather than the first slicing
-                // layers. Extrusions GCode::_extrude() marks as inside that band print with the
-                // fan off, whatever overhang, bridge or resume request is pending, as the first
-                // layers of a flat bed do. Leaving the band falls through to the branches below.
-                set_fan(0);
-                fan_speed_change_requests[CoolingLine::TYPE_FORCE_RESUME_FAN] = false;
-            } else if (fan_speed_change_requests[CoolingLine::TYPE_OVERHANG_FAN_START]){
+            if (fan_speed_change_requests[CoolingLine::TYPE_OVERHANG_FAN_START]){
                set_fan(overhang_fan_speed);
            } else if (fan_speed_change_requests[CoolingLine::TYPE_INTERNAL_BRIDGE_FAN_START]){ // ORCA: Add support for separate internal bridge fan speed control
                set_fan(internal_bridge_fan_speed);
@@ -21,7 +21,7 @@ struct PerExtruderAdjustments;
 //
 // The simple it sounds, the actual implementation is significantly more complex.
 // Namely, for a multi-extruder print, each material may require a different cooling logic.
-// For example, some materials may not like to print too slowly, while with some materials
+// For example, some materials may not like to print too slowly, while with some materials 
 // we may slow down significantly.
 //
 class CoolingBuffer {
@@ -63,9 +63,6 @@ private:
    unsigned int                m_current_nozzle;
    //BBS: current fan speed
    int                         m_current_fan_speed;
-    // Belt printers: the extrusion being processed lies in the first-layer band above the
-    // belt (between a ";_BELT_BAND_START" and a ";_BELT_BAND_END"). Kept across layers.
-    bool                        m_belt_band_active = false;
 };

 }
@@ -2616,9 +2616,6 @@ void GCodeProcessorResult::reset() {
    long_retraction_when_cut = false;
    timelapse_warning_code = 0;
    printable_height = 0.0f;
-    machine_frame_transform_active = false;
-    belt_tilt_angle = 0.f;
-    belt_z_origin   = 0.f;
    settings_ids.reset();
    filaments_count = 0;
    backtrace_enabled = false;
@@ -2855,32 +2852,6 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const int
        return ps;
    };

-    // Belt-printer post-gcode shear/scale/post_remap is applied as the final
-    // step of BeltKinematics::to_machine, so MoveVertex.position is
-    // in the printer's machine frame.  Undo it here so the XY area check
-    // operates in the build-volume frame that printable_area is defined in
-    // (the height checks below are skipped on belt printers).  For non-belt printers
-    // (is_active() == false) apply_inverse is identity and behaviour is
-    // unchanged from before.
-    const bool machine_frame_active = m_machine_frame_transform.is_active();
-    auto compare_pos = [&](const GCodeProcessorResult::MoveVertex &move) -> Vec3d {
-        Vec3d pos = move.position.cast<double>();
-        if (!machine_frame_active)
-            return pos;
-        Vec3d extruder_off = Vec3d::Zero();
-        if (size_t(move.extruder_id) < m_extruder_offsets.size())
-            extruder_off = m_extruder_offsets[move.extruder_id].cast<double>();
-        // Strip plate + extruder offsets to recover the raw machine-frame
-        // coordinate that was emitted into the G-code (see store_move_vertex).
-        Vec3d machine(pos.x() - m_x_offset - extruder_off.x(),
-                      pos.y() - m_y_offset - extruder_off.y(),
-                      pos.z() - extruder_off.z() + m_z_offset);
-        Vec3d build = m_machine_frame_transform.apply_inverse(machine);
-        // Re-apply plate offset so the result matches plate_printable_poly,
-        // which is translated by plate_offset below.
-        return Vec3d(build.x() + m_x_offset, build.y() + m_y_offset, build.z());
-    };
-
    struct GCodePosInfo
    {
        Points pos;
@@ -2892,20 +2863,26 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const int
    for (const GCodeProcessorResult::MoveVertex &move : m_result.moves) {
        // sometimes, the start line extrude was outside the edge of plate a little, this is allowed, so do not include into the gcode_path_pos
        if (move.type == EMoveType::Extrude /* && move.extrusion_role != ExtrusionRole::erFlush || move.type == EMoveType::Travel*/) {
-            const Vec3d cp = compare_pos(move);
-            // For belt printers we read Z from the inverse-transformed position
-            // (post-origin-snap, pre-machine-frame).  Otherwise keep the
-            // original print_z source (the slicer's layer-Z comment) so
-            // non-belt behaviour is bit-for-bit unchanged.
-            const float z_for_height = machine_frame_active ? float(cp.z()) : move.print_z;
            if (move.extrusion_role == ExtrusionRole::erCustom) {
-                gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos_custom.emplace_back(to_2d(cp));
+                /*if (move.is_arc_move_with_interpolation_points()) {
+                    for (int i = 0; i < move.interpolation_points.size(); i++) {
+                        gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos_custom.emplace_back(to_2d(move.interpolation_points[i].cast<double>()));
+                    }
+                } else {*/
+                    gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos_custom.emplace_back(to_2d(move.position.cast<double>()));
+                //}
                gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z_custom =
-                    std::max(gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z_custom, z_for_height);
+                    std::max(gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z_custom, move.print_z);
            } else {
-                gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos.emplace_back(to_2d(cp));
+                /*if (move.is_arc_move_with_interpolation_points()) {
+                    for (int i = 0; i < move.interpolation_points.size(); i++) {
+                        gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos.emplace_back(to_2d(move.interpolation_points[i].cast<double>()));
+                    }
+                } else {*/
+                    gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos.emplace_back(to_2d(move.position.cast<double>()));
+                //}
                gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z = std::max(gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z,
-                                                                                                   z_for_height);
+                                                                                                   move.print_z);
            }
        }
    }
@@ -2940,12 +2917,7 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const int
                    valid = false;
                }
            }
-            // Belt printers: the Z recorded here grows with belt travel (machine Z with the
-            // frame transform, the slicing-frame Z without it), while printable_height is the
-            // clearance above the belt; the two are not comparable, so the over-height check
-            // is skipped, as the preview's ToolHeightOutside warning already is.
-            // Print::validate() checks the object's height against the clearance.
-            if ( !m_belt_printer && iter->second.max_print_z > plate_printable_height ) { //over height
+            if ( iter->second.max_print_z > plate_printable_height ) { //over height
                m_result.gcode_check_result.error_code |= (1 << 3);
                std::pair<int, int> filament_to_object_id;
                filament_to_object_id.first  = iter->first;
@@ -2986,7 +2958,7 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const int
                    }

                // check printable height
-                if (!m_belt_printer && (extruder_id < printable_heights.size()) && (iter->second.max_print_z > printable_heights[extruder_id])) {
+                if ((extruder_id < printable_heights.size()) && (iter->second.max_print_z > printable_heights[extruder_id])) {
                    m_result.gcode_check_result.error_code |= (1 << 1);
                    std::pair<int, int> filament_to_object_id;
                    filament_to_object_id.first  = iter->first;
@@ -3152,13 +3124,6 @@ void GCodeProcessor::apply_config(const PrintConfig& config)

    m_result.printable_height = config.printable_height;

-    // Belt printer: cache the post-gcode machine-frame transform so the
-    // multi-extruder validator can undo it and compare against build-volume
-    // bounds rather than machine-frame positions.
-    m_machine_frame_transform.init_from_config(config);
-    m_result.machine_frame_transform_active = m_machine_frame_transform.is_active();
-    m_belt_printer = config.belt_printer.value;
-
    auto filament_maps = config.option<ConfigOptionInts>("filament_map");
    if (filament_maps != nullptr) {
        m_filament_maps = filament_maps->values;
@@ -3189,32 +3154,6 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
 {
    m_parser.apply_config(config);

-    // Belt printer: remember the file's belt keys for export_config_for_render(). The
-    // config block lists belt_printer for every printer, so a non-belt file loaded while
-    // a belt printer is selected switches the preview's belt view off, and a belt file
-    // loaded on another printer brings its own tilt, remaps and bed along.
-    m_belt_render_config.clear();
-    {
-        const auto *belt = config.option<ConfigOptionBool>("belt_printer");
-        if (belt != nullptr) {
-            static const char *belt_keys[] = {
-                "belt_printer", "belt_slice_rotation", "belt_slice_rotation_angle",
-                "gcode_remap_x", "gcode_remap_y", "gcode_remap_z",
-                "belt_frame_tilt_decouple", "belt_frame_tilt_angle",
-            };
-            for (const char *key : belt_keys)
-                if (const ConfigOption *opt = config.option(key); opt != nullptr)
-                    m_belt_render_config.set_key_value(key, opt->clone());
-            // The Rev remaps mirror inside the build volume, so the designed view needs
-            // the bed the file was sliced for. Only a belt file may override it.
-            static const char *bed_keys[] = { "printable_area", "printable_height" };
-            if (belt->value)
-                for (const char *key : bed_keys)
-                    if (const ConfigOption *opt = config.option(key); opt != nullptr)
-                        m_belt_render_config.set_key_value(key, opt->clone());
-        }
-    }
-
    //BBS
    const ConfigOptionFloatsNullable* nozzle_volume = config.option<ConfigOptionFloatsNullable>("nozzle_volume");
    if (nozzle_volume != nullptr) {
@@ -3698,7 +3637,6 @@ void GCodeProcessor::reset()
    m_zero_layer_height = 0.0f;
    m_first_layer_height = 0.0f;
    m_processing_start_custom_gcode = false;
-    m_in_config_block = false;
    m_g1_line_id = 0;
    m_layer_id = 0;
    m_cp_color.reset();
@@ -3739,7 +3677,6 @@ DynamicConfig GCodeProcessor::export_config_for_render() const
    config.set_key_value("filament_is_support", new ConfigOptionBools(m_parser.get_config().filament_is_support.values));
    config.set_key_value("filament_type", new ConfigOptionStrings(m_parser.get_config().filament_type.values));
    config.set_key_value("filament_map", new ConfigOptionInts(m_parser.get_config().filament_map.values));
-    config.apply(m_belt_render_config);
    return config;
 }

@@ -4305,34 +4242,6 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
        return;
    }

-    // ;Z: -- the layer Z tag non-BBL printers write.  Only read on a belt printer,
-    // where the preview labels its layers with it (GCodeViewer::load_as_gcode);
-    // elsewhere print_z stays unset, as it always was, so nothing downstream of
-    // it changes for other printers.
-    if (m_belt_printer && boost::starts_with(comment, "Z:")) {
-        m_print_z = get_z_height(comment);
-        return;
-    }
-
-    if (boost::starts_with(comment, " CONFIG_BLOCK_START")) {
-        m_in_config_block = true;
-        return;
-    }
-    if (boost::starts_with(comment, " CONFIG_BLOCK_END")) {
-        m_in_config_block = false;
-        return;
-    }
-
-    // Belt printer: derive the physical tilt magnitude from the slicing-rotation
-    // angle header comment (used to enable the preview's belt view). Only the belt
-    // header carries it outside the config block; the config block lists the key
-    // for every printer, belt or not.
-    if (!m_in_config_block && boost::starts_with(comment, " belt_slice_rotation_angle = ")) {
-        try {
-            m_result.belt_tilt_angle = std::abs(std::stof(std::string(comment.substr(29))));
-        } catch (...) {}
-        return;
-    }
    // wipe start tag
    if (boost::starts_with(comment, reserved_tag(ETags::Wipe_Start))) {
        m_wiping = true;
@@ -6229,13 +6138,6 @@ void GCodeProcessor::process_G92(const GCodeReader::GCodeLine& line)
    if (line.has_z()) {
        m_origin[Z] = m_end_position[Z] - line.z() * lengths_scale_factor;
        any_found = true;
-        // Belt only: the start G-code's purge-blob advance + G92 Z0 resets leave a constant
-        // machine-Z origin offset here; the designed-view back-transform subtracts it so
-        // toolpaths map to the model's belt coordinate (gcode Z). Gated on belt_tilt_angle
-        // (set from the belt header, parsed before the body) so non-belt G-code processing
-        // is byte-identical — no unconditional work on the shared path.
-        if (m_result.belt_tilt_angle != 0.f)
-            m_result.belt_z_origin = m_origin[Z];
    }

    if (line.has_e()) {
@@ -7214,22 +7116,6 @@ void GCodeProcessor::store_move_vertex(EMoveType type, EMovePathType path_type,
        m_result.print_statistics.total_travel_distance += m_travel_dist;
    }

-    // During the start G-code "prepare" stage the toolhead Z is not yet a real
-    // print height on a normal printer, so it is pinned to the first-layer height
-    // to keep the preview tidy. Belt printers are the exception: there the Z is
-    // written explicitly by the belt kinematics and the designed-view back-transform
-    // couples machine Z into the rendered model Y (the belt tilt mixes the height
-    // and belt-feed axes). Overriding Z therefore back-transforms the last
-    // prepare-stage move (the unretract before the first extrusion) to model
-    // Y ~= 0, and the libvgcode path builder then draws a phantom extrusion
-    // segment from Y ~= 0 to the first real toolpath. Keep the real Z for belt
-    // printers so prepare-stage moves map correctly. Gated on belt_tilt_angle (set
-    // from the G-code header before the body is processed) so non-belt processing
-    // is byte-identical.
-    const float store_z = (m_processing_start_custom_gcode && m_result.belt_tilt_angle == 0.f)
-        ? m_first_layer_height
-        : m_end_position[Z] - m_z_offset;
-
    m_result.moves.push_back({
        m_last_line_id,
        type,
@@ -7237,7 +7123,7 @@ void GCodeProcessor::store_move_vertex(EMoveType type, EMovePathType path_type,
        static_cast<unsigned char>(filament_id),
        m_cp_color.current,
        //BBS: add plate's offset to the rendering vertices
-        Vec3f(m_end_position[X] + m_x_offset, m_end_position[Y] + m_y_offset, store_z) + m_extruder_offsets[filament_id],
+        Vec3f(m_end_position[X] + m_x_offset, m_end_position[Y] + m_y_offset, m_processing_start_custom_gcode ? m_first_layer_height : m_end_position[Z]- m_z_offset) + m_extruder_offsets[filament_id],
        static_cast<float>(m_end_position[E] - m_start_position[E]),
        m_feedrate,
        0.0f, // actual feedrate
@@ -12,7 +12,6 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/CustomGCode.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
-#include "libslic3r/GCode/MachineFrameTransform.hpp"

 #include <cstddef>
 #include <cassert>
@@ -291,19 +290,6 @@ class Print;
        bool support_traditional_timelapse{true};
        float printable_height;
        float z_offset;
-        // Belt printer: physical tilt magnitude (deg) parsed from the slicing-rotation
-        // header comment; used to enable the preview's belt view.
-        float belt_tilt_angle{ 0.f };
-        // Belt printer: machine-Z origin offset (mm) left in m_origin[Z] by the start
-        // G-code (purge-blob belt advance + G92 Z0 resets). Move positions are stored
-        // as gcode_Z + this offset, so the designed-view back-transform must subtract it
-        // to recover the model's belt coordinate.
-        float belt_z_origin{ 0.f };
-        // Belt printer: post-gcode shear/scale/post_remap is configured and
-        // non-identity.  When set, the layer Z values in `moves` are in the
-        // machine frame and should not be compared against `printable_height`
-        // (which lives in the build-volume frame).
-        bool machine_frame_transform_active{ false };
        SettingsIds settings_ids;
        size_t filaments_count;
        bool backtrace_enabled;
@@ -399,9 +385,6 @@ class Print;
            // Keep the SKIPPABLE per-type time on a copied result.
            skippable_part_time = std::forward<Other>(other).skippable_part_time;
            initial_layer_time = std::forward<Other>(other).initial_layer_time;
-            belt_tilt_angle = std::forward<Other>(other).belt_tilt_angle;
-            belt_z_origin = std::forward<Other>(other).belt_z_origin;
-            machine_frame_transform_active = std::forward<Other>(other).machine_frame_transform_active;
 #if ENABLE_GCODE_VIEWER_STATISTICS
            time = std::forward<Other>(other).time;
 #endif
@@ -1102,10 +1085,6 @@ class Print;
    private:
        CommandProcessor m_command_processor;
        GCodeReader m_parser;
-        // Belt printer: the belt keys of the loaded file's config block (plus the bed they
-        // are relative to), handed to the preview through export_config_for_render() so the
-        // belt view and its back-transform follow the file, not the selected printer.
-        DynamicConfig m_belt_render_config;
        EUnits m_units;
        EPositioningType m_global_positioning_type;
        EPositioningType m_e_local_positioning_type;
@@ -1181,13 +1160,6 @@ class Print;
        double          m_x_offset{ 0 };
        double          m_y_offset{ 0 };

-        // Belt-printer post-gcode shear/scale/post_remap. Used by
-        // check_multi_extruder_gcode_valid to undo the machine-frame
-        // transform on move positions so bounds checks operate in the
-        // pre-machine-frame (build-volume) frame.
-        MachineFrameTransform m_machine_frame_transform;
-        bool                  m_belt_printer{ false };
-
        unsigned int m_line_id;
        unsigned int m_last_line_id;
        float m_feedrate; // mm/s
@@ -1217,7 +1189,6 @@ class Print;
        float m_first_layer_height; // mm
        float m_zero_layer_height; // mm
        bool m_processing_start_custom_gcode;
-        bool m_in_config_block;
        unsigned int m_g1_line_id;
        unsigned int m_layer_id;
        CpColor m_cp_color;
@@ -1,89 +0,0 @@
-#include "MachineFrameTransform.hpp"
-#include "../Geometry.hpp"
-#include "../Point.hpp"
-#include "../PrintConfig.hpp"
-#include "../libslic3r.h"
-
-#include <cmath>
-
-namespace Slic3r {
-
-bool MachineFrameTransform::init_from_config(const PrintConfig &config)
-{
-    m_active            = false;
-    m_transform         = Transform3d::Identity();
-    m_transform_inverse = Transform3d::Identity();
-
-    if (!config.belt_printer.value)
-        return false;
-
-    // The machine-frame transform is derived from the single belt tilt (axis +
-    // angle) that also drives the pre-slice mesh rotation.  Expert decouple lets
-    // the machine-frame angle differ from the slicing rotation; otherwise both
-    // use belt_slice_rotation_angle.
-    const BeltRotationAxis axis = config.belt_slice_rotation.value;
-    if (axis == BeltRotationAxis::None || axis == BeltRotationAxis::Z)
-        return false; // Z is an in-plane spin: no machine-frame tilt.
-
-    const double angle_deg = config.belt_frame_tilt_decouple.value
-        ? config.belt_frame_tilt_angle.value
-        : config.belt_slice_rotation_angle.value;
-    if (std::abs(angle_deg) <= EPSILON)
-        return false;
-
-    const double angle_rad = Geometry::deg2rad(angle_deg);
-    const double sin_a      = std::sin(angle_rad);
-    if (std::abs(sin_a) <= EPSILON)
-        return false;
-    const double cot_a   = std::cos(angle_rad) / sin_a;
-    const double inv_sin = 1.0 / std::abs(sin_a);
-
-    // This stage runs after the conventional belt axis swap. For an X-axis
-    // slicing rotation, remapped Y is model height and remapped Z is travel
-    // along the belt. Convert those Cartesian coordinates to machine axes with
-    // the established belt-printer convention:
-    //   machine gantry = model height / sin(a)
-    //   machine belt   = model belt + model height * cot(a)
-    // The Y-rotation case is the same mapping on X/Z, with the rotation sign.
-    // At 45 degrees tan/cot and sin/cos are equal, which previously hid the
-    // incorrect complementary-angle formulas used by this unified transform.
-    Matrix3d shear = Matrix3d::Identity();
-    Matrix3d scale = Matrix3d::Identity();
-    if (axis == BeltRotationAxis::X) {
-        shear(2, 1) =  cot_a;   // Z from Y
-        scale(1, 1) =  inv_sin; // Y
-    } else { // BeltRotationAxis::Y
-        shear(2, 0) = -cot_a;   // Z from X
-        scale(0, 0) =  inv_sin; // X
-    }
-
-    // Apply shear first, then scale (the historical default ShearThenScale order:
-    // result = scale * shear * p).  For the canonical 45°/X belt this maps
-    // (x,y,z) -> (x, y/sin, y + z), matching the previous per-axis config.
-    Transform3d combined = Transform3d::Identity();
-    combined.linear() = scale * shear;
-
-    if (combined.isApprox(Transform3d::Identity()))
-        return false;
-
-    m_transform         = combined;
-    m_transform_inverse = combined.inverse();
-    m_active            = true;
-    return true;
-}
-
-Vec3d MachineFrameTransform::apply(const Vec3d &pos) const
-{
-    if (!m_active)
-        return pos;
-    return m_transform * pos;
-}
-
-Vec3d MachineFrameTransform::apply_inverse(const Vec3d &pos) const
-{
-    if (!m_active)
-        return pos;
-    return m_transform_inverse * pos;
-}
-
-} // namespace Slic3r
@@ -1,54 +0,0 @@
-#ifndef slic3r_MachineFrameTransform_hpp_
-#define slic3r_MachineFrameTransform_hpp_
-
-#include "../libslic3r.h"
-#include "../Point.hpp"
-#include "../PrintConfig.hpp"
-
-namespace Slic3r {
-
-// Post-stage machine-frame transform for belt printers.
-//
-// Applied in BeltKinematics::to_machine AFTER the back-transform and
-// the gcode_remap_* axis remap.  Maps Cartesian (axis-permuted) G-code
-// coordinates into the printer's physical machine frame.
-//
-// Derived entirely from the single belt tilt (belt_slice_rotation axis +
-// belt_slice_rotation_angle): a shear coupling the height axis to the belt-feed
-// axis (factor cot a) plus a 1/sin a scale on the gantry-height axis.  The expert
-// belt_frame_tilt_decouple flag lets the machine-frame angle differ from the
-// pre-slice rotation angle via belt_frame_tilt_angle.
-class MachineFrameTransform
-{
-public:
-    MachineFrameTransform() = default;
-
-    // Initialize from belt printer config.  Returns true if a non-identity
-    // transform was computed.  Inactive when belt_printer is disabled or
-    // both shear and scale are identity.
-    bool init_from_config(const PrintConfig &config);
-
-    // Apply the transform to a point.  Returns pos unchanged if not active.
-    Vec3d apply(const Vec3d &pos) const;
-
-    // Apply the inverse transform.  Returns pos unchanged if not active.
-    // Used by validators that need to compare emitted machine-frame
-    // coordinates against build-volume bounds.
-    Vec3d apply_inverse(const Vec3d &pos) const;
-
-    bool is_active() const { return m_active; }
-
-    // The composed shear*scale transform (identity when inactive). Exposed so the
-    // G-code viewer can build the machine->model back-transform for the upright
-    // ("designed") belt preview.
-    const Transform3d& transform() const { return m_transform; }
-
-private:
-    bool        m_active            = false;
-    Transform3d m_transform         = Transform3d::Identity();
-    Transform3d m_transform_inverse = Transform3d::Identity();
-};
-
-} // namespace Slic3r
-
-#endif // slic3r_MachineFrameTransform_hpp_
@@ -1,25 +0,0 @@
-#include "MachineKinematics.hpp"
-#include "../Point.hpp"
-
-namespace Slic3r {
-
-// Moved verbatim from GCodeWriter::apply_axis_remap().
-Vec3d CartesianKinematics::apply_axis_remap(const Vec3d &pos) const
-{
-    if (!has_axis_remap())
-        return pos;
-    auto remap = [this, &pos](int r) -> double {
-        int axis = r % 3;
-        if (r < 3) return pos[axis];
-        if (r < 6) return -pos[axis];
-        return m_build_vol_max[axis] - pos[axis];
-    };
-    return { remap(m_remap_x), remap(m_remap_y), remap(m_remap_z) };
-}
-
-Vec3d CartesianKinematics::to_machine(const Vec3d &p) const
-{
-    return this->apply_axis_remap(p);
-}
-
-} // namespace Slic3r
@@ -1,92 +0,0 @@
-#ifndef slic3r_MachineKinematics_hpp_
-#define slic3r_MachineKinematics_hpp_
-
-#include "../Point.hpp"
-
-namespace Slic3r {
-
-// The frame contract for emitted movement.
-//
-// GCodeWriter produces points in the *logical placed* frame: plate offsets have
-// already been subtracted, but no machine-specific mapping has been applied.
-// A MachineKinematics turns that into the coordinates actually written to
-// G-code, and answers the two structural questions the writer needs in order to
-// decide which axis words it may omit.
-//
-// This is a seam for writer-generated movement only.  Start/end/custom G-code,
-// classic wipe-tower output and GCodeWriter::extrude_arc_to_xy() do NOT pass
-// through it: they write machine coordinates directly.
-class MachineKinematics
-{
-public:
-    virtual ~MachineKinematics() = default;
-
-    // Logical placed point -> emitted machine point.
-    virtual Vec3d to_machine(const Vec3d &p) const = 0;
-
-    // True when a move must emit X, Y and Z because omitting a word would be
-    // wrong under this mapping.  Deliberately not called "couples_axes": a pure
-    // axis permutation forces full emission without physically coupling axes.
-    virtual bool must_emit_all_axes() const = 0;
-
-    // True when a lift must be suppressed while the current position is unknown,
-    // because _travel_to_z() re-emits the logical X/Y through this mapping and an
-    // uninitialised position would map to a bogus machine point -- for a reverse
-    // mapping, the far corner of the bed.
-    virtual bool suppress_lift_at_unknown_position() const = 0;
-
-    // True when a G2/G3 arc in the logical XY plane is still the same arc in the
-    // machine frame. Arc moves emit only X, Y, I and J, so this asks a narrower
-    // question than must_emit_all_axes(): whether logical X and Y reach the
-    // machine unchanged. A mapping that only negates or reverses Z keeps its
-    // arcs; one that permutes X or Y moves the arc out of the plane that I/J
-    // describes, and a shear turns the circle into an ellipse G2/G3 cannot
-    // express at all.
-    virtual bool supports_arc_moves() const = 0;
-
-    // Configuration.  GCodeWriter forwards its setters here so that the state
-    // lives with the strategy and a strategy installed before the setters run
-    // still receives it.
-    virtual void set_axis_remap(int rx, int ry, int rz) = 0;
-    virtual void set_build_volume_max(const Vec3d &max) = 0;
-};
-
-// Axis remap only -- the historical GCodeWriter behaviour, moved verbatim.
-//
-// The remap encodes, per output axis, which source axis feeds it and how:
-//   r < 3 : source axis r, unchanged
-//   r < 6 : source axis r-3, negated
-//   else  : source axis r-6, reversed within the build volume
-class CartesianKinematics : public MachineKinematics
-{
-public:
-    Vec3d to_machine(const Vec3d &p) const override;
-
-    bool must_emit_all_axes() const override { return this->has_axis_remap(); }
-    bool suppress_lift_at_unknown_position() const override { return this->has_axis_remap(); }
-
-    // X and Y must reach the machine untouched. Because the remap is a
-    // permutation, pinning those two also pins Z to Z, so a mapping that only
-    // negates or reverses Z still supports arcs -- every word a G2/G3 emits is
-    // unchanged by it.
-    bool supports_arc_moves() const override { return m_remap_x == 0 && m_remap_y == 1; }
-
-    void set_axis_remap(int rx, int ry, int rz) override
-        { m_remap_x = rx; m_remap_y = ry; m_remap_z = rz; }
-    void set_build_volume_max(const Vec3d &max) override { m_build_vol_max = max; }
-
-    bool has_axis_remap() const
-        { return m_remap_x != 0 || m_remap_y != 1 || m_remap_z != 2; }
-
-protected:
-    Vec3d apply_axis_remap(const Vec3d &pos) const;
-
-    int   m_remap_x { 0 };
-    int   m_remap_y { 1 };
-    int   m_remap_z { 2 };
-    Vec3d m_build_vol_max { Vec3d::Zero() };
-};
-
-} // namespace Slic3r
-
-#endif // slic3r_MachineKinematics_hpp_
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ExPikaPaka	8ecfee6a21	Save where the panel was left, and recover a texture the archive lacks The project carried the layer stack but not the user's place in it: a reopened project landed on slot 0 in Standard, whatever they had been editing. The active layer and Standard/Pro now live on the volume, next to the rest of its options, and come back with it. Docked/undocked goes to the application config instead - it describes the user's window, not the model, so opening someone else's project must not move their panel. A layer whose image_data was empty at save time was written with no texture and came back with none. It now falls back to the file the layer came from, which the importer put in the user's own texture library, so a project reopened on the same machine keeps its pixels. The texture is always stored as .png: the importer converts whatever the user picked, so the extension was being taken from a name that no longer described the bytes. Also adds v2_flip_edges to the cereal field list, which the undo stack was silently dropping.	2026-10-09 09:35:35 +02:00
ExPikaPaka	fbf4652e12	Fix the build and clang-tidy failures in the persistence change The round-trip test named a TextureTileMethod enumerator that does not exist (MirroredRepeat, not Mirror) and used a bare Approx, which Catch2 v3 keeps in its own namespace. The rest of the file compares floats with WithinAbs, so these follow it rather than reaching for Catch::Approx. bbs_3mf.cpp reads and writes the layer JSON but picked up the declarations through another header, and the same for boost::to_lower.	2026-10-09 09:05:42 +02:00
ExPikaPaka	be9ff50130	Merge remote-tracking branch 'origin/main' into feature/texdisp-3mf-persistence # Conflicts: # src/libslic3r/TextureDisplacement.cpp	2026-10-09 09:03:51 +02:00
SoftFever	dee1f1715f	Merge branch 'main' into feature/texdisp-3mf-persistence	2026-10-09 12:15:16 +08:00
ExPikaPaka	fcb1f62bd9	Save texture displacement in the project file A painted relief did not survive closing the project: nothing about the feature was written to the .3mf, so the layers, their textures and the paint mask were all lost on save. The layer struct's cereal save()/load() serve the undo/redo stack only, which is one session and one binary stream. Write the layer stack and the per-volume options as JSON in the archive, and each layer's texture as the image file it was loaded from, both referenced by path - the same split EmbossShape already makes for its SVG. The image stays out of the XML deliberately: it is binary and routinely megabytes, and base64 in an attribute would bloat the one file every reader parses just to list the objects. JSON rather than the cereal stream next to it because that one is positional and unversioned, which would make every future field a project-breaking change; an unknown key is ignored and a missing one keeps its default, so a project written by either side keeps loading. The paint masks go in as one attribute per layer slot, mirroring paint_color. Older readers ignore attributes they do not know, so a project written here still opens in a build without the feature - it loses the relief, which is all it could have done with it anyway. The layers are restored while the volume is being built rather than after the archive is walked: volumes are constructed only once the whole archive has been read, so a hook placed after the walk ran before any volume existed and restored nothing.	2026-10-05 08:36:22 +02:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M5.5,14.5c-1.105,0-2-3.686-2-7s.895-7,2-7" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.67" y1="4.67" x2="14.33" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.33" y1="4.67" x2="8.67" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><path d="M3.5,13.7c-.294.511-.636.8-1,.8-1.1,0-2-3.686-2-7s.9-7,2-7c.365,0,.707.293,1,.805" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.727,4.5c.334-2.208,1-4,1.773-4,.354,0,.686.378.974,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M9.474,13.5c-.288.622-.62,1-.974,1-.77,0-1.439-1.792-1.773-4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>