fix: handle missing API keys correctly

(cherry picked from commit c6d3e755ec)

.github/workflows/build_all.yml

@@ -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

.github/workflows/build_orca.yml

@@ -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

.github/workflows/check_profiles.yml

@@ -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

CMakeLists.txt

@@ -1084,10 +1084,10 @@ endif ()
 
 find_path(SPNAV_INCLUDE_DIR spnav.h)
 if (SPNAV_INCLUDE_DIR)
-    find_library(SPNAV_LIB NAMES libspnav.a spnav)
+    find_library(SPNAV_LIB NAMES libspnav.a) # Force linking libspnav statically
     if (SPNAV_LIB)
         add_definitions(-DHAVE_SPNAV)
-        message(STATUS "SPNAV library found: ${SPNAV_LIB}")
+        message(STATUS "SPNAV library found")
     else()
         message(STATUS "SPNAV library NOT found, Spacenavd not supported")
     endif()

README.md

@@ -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

build_linux.sh

@@ -8,10 +8,9 @@ SCRIPT_PATH=$(dirname "$(readlink -f "${0}")")
 pushd "${SCRIPT_PATH}" > /dev/null
 
 function usage() {
-    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-D][-e][-F][-g][-h][-i][-j N][-J N][-p][-r][-s][-t][-u][-l][-L]"
+    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-D][-e][-F][-g][-h][-i][-j N][-p][-r][-s][-t][-u][-l][-L]"
     echo "   -1: limit builds to one core (where possible)"
     echo "   -j N: limit builds to N cores (where possible)"
-    echo "   -J N: build up to N dependencies at a time, each still using -j jobs (default: 1)"
     echo "   -b: build in Debug mode"
     echo "   -c: force a clean build"
     echo "   -C: enable ANSI-colored compile output (GNU/Clang only)"
@@ -37,13 +36,12 @@ function usage() {
 }
 
 SLIC3R_PRECOMPILED_HEADERS="ON"
-DEPS_PARALLEL=""
 
 unset name
 BUILD_DIR=build
 BUILD_CONFIG=Release
 FORWARDED_ARGS=()
-while getopts ":1j:J:bcCdDeFghiprstulL" opt ; do
+while getopts ":1j:bcCdDeFghiprstulL" opt ; do
   case ${opt} in
     1 )
         export CMAKE_BUILD_PARALLEL_LEVEL=1
@@ -53,10 +51,6 @@ while getopts ":1j:J:bcCdDeFghiprstulL" opt ; do
         export CMAKE_BUILD_PARALLEL_LEVEL=$OPTARG
         FORWARDED_ARGS+=("-j" "$OPTARG")
         ;;
-    J )
-        DEPS_PARALLEL=$OPTARG
-        FORWARDED_ARGS+=("-J" "$OPTARG")
-        ;;
     b )
         BUILD_DIR=build-dbg
         BUILD_CONFIG=Debug
@@ -141,11 +135,6 @@ if [[ -n "${CLEAN_DOCKER_IMAGE}" ]] && [[ -z "${USE_DOCKER}" ]] ; then
     exit 1
 fi
 
-if [[ -n "${DEPS_PARALLEL}" ]] && ! [[ "${DEPS_PARALLEL}" =~ ^[1-9][0-9]*$ ]] ; then
-    echo "Error: -J expects a positive integer."
-    exit 1
-fi
-
 function check_available_memory_and_disk() {
     FREE_MEM_GB=$(free --gibi --total | grep 'Mem' | rev | cut --delimiter=" " --fields=1 | rev)
     MIN_MEM_GB=10
@@ -548,29 +537,7 @@ if [[ -n "${BUILD_DEPS}" ]] ; then
     fi
 
     print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" "${CMAKE_CCACHE_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}"
-    # The top-level build runs one dependency at a time by default, which keeps the console
+    print_and_run cmake --build deps/$BUILD_DIR -j1
-    # output readable and lets that dependency's own build use all of CMAKE_BUILD_PARALLEL_LEVEL.
-    # -J raises the top level instead, and -j still applies in full to every dependency, so the
-    # worst case is -J times -j compile jobs at once. Ninja has no job server to share a pool
-    # across the nested builds, so that ceiling is not enforced anywhere: pick -J to suit the RAM.
-    DEPS_JOBS=1
-    if [[ -n "${DEPS_PARALLEL}" ]] ; then
-        DEPS_JOBS=${DEPS_PARALLEL}
-        SAVED_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL-}
-        export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(nproc)}
-        echo "Building up to ${DEPS_JOBS} dependencies at a time, ${CMAKE_BUILD_PARALLEL_LEVEL} jobs each: up to $(( DEPS_JOBS * CMAKE_BUILD_PARALLEL_LEVEL )) compile jobs at once."
-    fi
-
-    print_and_run cmake --build deps/$BUILD_DIR -j"${DEPS_JOBS}"
-
-    if [[ -n "${DEPS_PARALLEL}" ]] ; then
-        # Give the whole -j back to the OrcaSlicer build below.
-        if [[ -n "${SAVED_PARALLEL_LEVEL}" ]] ; then
-            export CMAKE_BUILD_PARALLEL_LEVEL=${SAVED_PARALLEL_LEVEL}
-        else
-            unset CMAKE_BUILD_PARALLEL_LEVEL
-        fi
-    fi
 fi
 
 if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then

build_release_macos.sh

@@ -104,8 +104,8 @@ fi
 
 CMAKE_VERSION=$(cmake --version | head -1 | sed 's/[^0-9]*\([0-9]*\).*/\1/')
 if [ "$CMAKE_VERSION" -ge 4 ] 2>/dev/null; then
-  export CMAKE_POLICY_VERSION_MINIMUM=3.10
+  export CMAKE_POLICY_VERSION_MINIMUM=3.5
-  export CMAKE_POLICY_COMPAT="-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
+  export CMAKE_POLICY_COMPAT="-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   echo "Detected CMake 4.x, adding compatibility flag (env + cmake arg)"
 else
   export CMAKE_POLICY_COMPAT=""

deps/CMakeLists.txt

@@ -1,5 +1,5 @@
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0")
-    set(CMAKE_POLICY_VERSION_MINIMUM 3.10 CACHE STRING "" FORCE)
+    set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE STRING "" FORCE)
 endif()
 
 #
@@ -24,7 +24,7 @@ endif()
 # therefore, unfortunately, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
 #
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.2)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 12.0 (the lowest Xcode 27 accepts)
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
@@ -224,7 +224,7 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
         ${_source_dir_arg}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.10
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
             -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
@@ -279,7 +279,7 @@ else()
         ${_source_dir_arg}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.10
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
             -DCMAKE_IGNORE_PREFIX_PATH:STRING=${CMAKE_IGNORE_PREFIX_PATH}

deps/OCCT/0001-BRepMesh-seam-pcurve-at-edge-parameter.patch

@@ -1,28 +0,0 @@
-diff --git a/src/ModelingAlgorithms/TKMesh/BRepMesh/BRepMesh_ModelPreProcessor.cxx b/src/ModelingAlgorithms/TKMesh/BRepMesh/BRepMesh_ModelPreProcessor.cxx
-index 6f63781..9b1c08e 100644
---- a/src/ModelingAlgorithms/TKMesh/BRepMesh/BRepMesh_ModelPreProcessor.cxx
-+++ b/src/ModelingAlgorithms/TKMesh/BRepMesh/BRepMesh_ModelPreProcessor.cxx
-@@ -210,10 +210,10 @@ private:
- 
-     // Define two pcurves of the seam-edge.
-     occ::handle<Geom2d_Curve> aPC1, aPC2;
--    double                    af, al;
-+    double                    af, al, af1, al1;
- 
-     aE.Orientation(TopAbs_FORWARD);
--    aPC1 = BRep_Tool::CurveOnSurface(aE, aF, af, al);
-+    aPC1 = BRep_Tool::CurveOnSurface(aE, aF, af1, al1);
- 
-     aE.Orientation(TopAbs_REVERSED);
-     aPC2 = BRep_Tool::CurveOnSurface(aE, aF, af, al);
-@@ -224,7 +224,9 @@ private:
-     }
- 
-     // Select the correct pcurve of the seam-edge.
--    const gp_Pnt2d& aFPntOfPC1 = aPC1->Value(aPC1->FirstParameter());
-+    // Use the edge's first parameter. A Geom2d_Line's FirstParameter() is -Precision::Infinite(),
-+    // where a direction of (2e-16, -1) from rounding error gives an X far outside the U range.
-+    const gp_Pnt2d aFPntOfPC1 = aPC1->Value(af1);
- 
-     if (std::abs(aLPntOfIPC1.X() - aFPntOfPC1.X()) > Precision::Confusion())
-     {

deps/OCCT/OCCT.cmake

@@ -25,16 +25,9 @@ endif()
 # shipped bytes. Windows ships only the DLLs libslic3r links, so the tab adds the TKFillet,
 # TKOffset and TKBool DLLs. See docs/HLSD/design-tab.md.
 
-if (IN_GIT_REPO)
-    set(OCCT_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT)
-endif ()
-
 orcaslicer_add_cmake_project(OCCT
     URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V8_0_1.zip
     URL_HASH SHA256=7c033d917ee8f040c0512d289dcc5f02c148889d5bac17c3e25639accb44f0da
-    # Makes BRepMesh triangulate cone faces whose seam pcurve is slightly tilted
-    # (Open-Cascade-SAS/OCCT#572); remove the patch once an OCCT release includes the fix.
-    PATCH_COMMAND git apply ${OCCT_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-BRepMesh-seam-pcurve-at-edge-parameter.patch
     #DEPENDS dep_Boost
     DEPENDS ${FREETYPE_PKG}
     CMAKE_ARGS

deps/OpenSSL/OpenSSL.cmake

@@ -44,18 +44,6 @@ else()
     if(APPLE)
         set(_conf_cmd export MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} && ./Configure -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
     else()
-        # A static library that is embedded into a shared object must not export
-        # its symbols. On Linux the running process also loads the system OpenSSL
-        # 3.x (WebKitGTK/gnutls pull in libcrypto.so.3), and CPython's _ssl and
-        # _hashlib are dlopened (RTLD_LOCAL) DSOs that each embed this OpenSSL.
-        # With default visibility their unversioned OpenSSL references are
-        # preempted by that global 3.x copy, mixing the 1.1.1 and 3.x ABIs and
-        # corrupting the heap (ssl.create_default_context() aborts). Hidden
-        # visibility makes each embedded copy self-contained. Linux-only: macOS
-        # binds dylibs with a two-level namespace (no interposition) and ships no
-        # OpenSSL, and Windows has no equivalent flag and no system OpenSSL to
-        # collide with.
-        set(_openssl_extra_cflags -fvisibility=hidden)
         set(_conf_cmd env "CC=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" "./config")
     endif()
     set(_cross_comp_prefix_line "")
@@ -114,20 +102,3 @@ ExternalProject_Add_Step(dep_OpenSSL install_cmake_files
     COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
     WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
 )
-
-if (NOT WIN32 AND NOT APPLE)
-    # OpenSSL's object rules do not depend on CFLAGS, so reconfiguring it (for
-    # example to add -fvisibility=hidden) relinks the archives from stale
-    # objects instead of recompiling them, and the change silently has no
-    # effect. Drop the objects whenever this recipe changes so the next build
-    # actually recompiles them.
-    ExternalProject_Get_Property(dep_OpenSSL SOURCE_DIR)
-    ExternalProject_Add_Step(dep_OpenSSL clean_objects
-        DEPENDEES configure
-        DEPENDERS build
-        COMMAND make clean
-        WORKING_DIRECTORY "${SOURCE_DIR}"
-        DEPENDS "${CMAKE_CURRENT_LIST_FILE}"
-        COMMENT "OpenSSL: cleaning objects after a recipe change"
-    )
-endif ()

deps/python3/python3.cmake

@@ -299,27 +299,3 @@ endif()
 if(TARGET dep_ZLIB)
     add_dependencies(dep_python3 dep_ZLIB)
 endif()
-
-if (NOT WIN32 AND NOT APPLE)
-    # CPython's Makefile rules for _ssl and _hashlib depend only on their own
-    # sources, not on the OpenSSL archives, so a rebuilt OpenSSL does not make
-    # them relink and they keep the previous symbols. On an incremental tree,
-    # drop the built modules and relink them against the current OpenSSL; a
-    # fresh build is left alone (its PGO target builds them). "make" alone is a
-    # no-op once PGO has run, so sharedmods is invoked explicitly.
-    ExternalProject_Get_Property(dep_python3 SOURCE_DIR)
-    file(GLOB _python_ssl_modules
-        "${SOURCE_DIR}/Modules/_ssl*.so"
-        "${SOURCE_DIR}/Modules/_hashlib*.so")
-    if (_python_ssl_modules)
-        ExternalProject_Add_Step(dep_python3 relink_ssl_extensions
-            DEPENDEES configure
-            DEPENDERS build
-            COMMAND sh -c "rm -f '${SOURCE_DIR}'/Modules/_ssl*.so '${SOURCE_DIR}'/Modules/_hashlib*.so && make -j${NPROC} sharedmods"
-            WORKING_DIRECTORY "${SOURCE_DIR}"
-            COMMENT "CPython: relinking _ssl/_hashlib against the current OpenSSL"
-            DEPENDS "${CMAKE_CURRENT_LIST_FILE}"
-                    "${CMAKE_CURRENT_LIST_DIR}/../OpenSSL/OpenSSL.cmake"
-        )
-    endif ()
-endif ()

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

@@ -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;
+        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;
-        }
 
         // BBS make sure the item won't clash with excluded regions
         // do we have wipe tower after arranging?

docs/HLSD/adaptive-tpms-infill.md

@@ -1,221 +0,0 @@
-# Adaptive TPMS infill — High Level Design
-
-## Purpose and scope
-
-`tpms_adaptive` grades the sparse infill of the Gyroid, TPMS-D and TPMS-FK
-patterns inside the object: the cells grow continuously from the surface
-towards the center of the object. `distance_warp`, `smooth_blend` and
-`stepped_shells` follow the distance to the nearest surface, including the top
-and bottom, like concentric shells; `lobes` follows the whole 3D shape towards
-the center of each lobe of the object; `normal_z`, `normal_y` and `normal_x`
-follow each section of the object normal to that axis, so the grading does not
-change along the axis, as suits a profile extruded along it.
-`sparse_infill_density` is the density at the surface, `tpms_interior_density`
-the density at the center, and `tpms_adaptive_gradient` picks how the density
-goes from one to the other. Only internal sparse infill is graded; the Gyroid
-Z-buckling optimization does not apply to it.
-
-The design has two parts: a field built once per object, and a pattern made
-from it, warped around the center of each lobe of a body so that its cell size
-follows the field, or, in the modes following the distance to the surface,
-split into shells or blended between densities.
-
-## Radial field
-
-`TpmsRadialField` gives every point of an object the center of its lobe and a
-radial coordinate: 0 at the center, 1 at the surface along the ray from the
-center. `PrintObject::prepare_tpms_radial_fields()` builds it in
-`bridge_over_infill()`, next to the adaptive cubic octree, because the anchoring
-infill generated there has to match the printed infill. A field is built for
-every mode a region uses, and is shared by the regions using that mode: the
-field depends on the geometry only, the densities are applied per region in the
-fill. An object thinner than the grid cells has no body in the field; no field
-is kept then, and the infill falls back to the regular pattern. In the modes
-following the distance to the surface, the field also gives the depth of every
-point (see below).
-
-A regular 3D grid of cubic cells is rasterized from the `lslices` of the layers,
-so the field follows what is printed: negative volumes, the union of
-overlapping parts and holes are taken into account, and the mesh does not need
-to be closed. A padding node around the grid is always outside. The grid is
-capped at about a million nodes, with cells no smaller than 0.5 mm.
-
-- Bodies are the connected inside nodes. Each is graded on its own, so separate
-  parts of one object each get their own sparse center.
-- A body is split into lobes around the local maxima of the depth, by an exact
-  Euclidean distance transform (Felzenszwalb and Huttenlocher, one pass per
-  axis). Two maxima are in separate lobes when the depth along the segment
-  between them drops below 0.8 of the shallower one, like at the neck between
-  two united spheres; maxima shallower than 0.3 of the deepest one are ignored.
-  A maximum joins the first lobe whose first maximum it sees without a neck.
-  The lobes are made one at a time, the remaining maxima tested against the
-  first one in parallel, as a plate has a whole plane of them.
-  Where the depth ties along a line or a plane, as in a tall box, the lobe's
-  center is the node nearest to the middle of the tied nodes, so the center is
-  in the middle of the height and not a column.
-- A point belongs to the lobe it is nearest to relative to their depths, so the
-  side between two lobes is nearer to the smaller one. Near that side, within a
-  tenth of that relative distance, the patterns of the lobes morph into each
-  other, so the lines stay continuous. Every lobe in that range takes part, up
-  to four, so the morph is also continuous where three or four lobes meet.
-- The reach of a lobe is the distance from its center to the first exit along
-  24 x 48 latitude-longitude directions, smoothed twice over neighbouring
-  directions in log space. Towards a neighbouring lobe it stops at twice the
-  distance to the side between them, so that side is graded half way, as deep
-  as a neck is, rather than as sparse as the center or as dense as the surface.
-  Only the lobes whose centers are near enough to be nearer at the current
-  distance are compared along a ray, so many lobes, as in a perforated plate,
-  stay cheap.
-  The radial coordinate of a point is its distance to the center over the reach
-  in its direction. Behind a gap, as across the hole
-  of a ring, the radial coordinate is above 1 and the infill keeps the surface
-  density.
-- Every outside node belongs to its nearest body, so points near a surface find
-  their body without a search. With a single body, all nodes belong to it.
-
-In the 2D modes, every plane of nodes normal to the axis is a field of its own:
-the distance transform skips the axis, bodies, lobes and the nearest body are
-found within the plane, and the reach is sampled on a circle of 48 directions.
-A point is looked up in the two planes around it, the weights of their lobes
-interpolated along the axis, so the grading does not step between planes; a
-plane without a body uses the nearest one that has one. The planes are a cell
-apart, not a layer: where the sections change abruptly, as at a step, the
-patterns of the two planes morph into each other over that cell.
-
-A distance to the nearest surface would be the obvious field, but no smooth map
-follows it. By the divergence theorem, the mean scale of a map over a body is
-fixed by its values on the surface: a map that keeps the full density along the
-whole surface, as the distance would ask under the top and bottom, has the mean
-density of the uniform infill, the sparser core being paid for by lines crowding
-along the walls. The layers of a plate at different depths would also need
-different line spacings in the same directions, which no continuous map allows
-without shearing across the plate. Following the distance needs changes of the
-topology of the lattice (see below). The radial coordinate instead grades what a
-single map can: towards one point.
-
-## Warped pattern
-
-The pattern is evaluated on warped coordinates:
-
-    TPMS(f_surface * m(t) * (p - center))
-
-where `m` scales the pattern around the center of the lobe: its frequency is
-`m + t * m'` along the ray and `m` across it. `m(t)` is the mean of the target
-scale over the ball of radius `t`, `3 / t^3 * integral of s^2 * target(s) ds`, so
-the mean of the three, and with it the density, follows the gradient. The cells
-are round at the center; near the surface they are flattened, with the lines
-running parallel to it. Beyond the surface the target is the surface scale, so
-the warp extends continuously outside.
-
-In the 2D modes only the coordinates within the plane are warped, and `m(t)` is
-the mean over the disc, `2 / t^2 * integral of s * target(s) ds`. Along the axis
-the pattern keeps the interior frequency: scaling it with `m` would shear the
-pattern by the distance along the axis times the gradient of `m`, without bound
-on a long object. The cells are round at the center and stretched along the
-axis near the surface. With Normal Z the layers are graded exactly, since
-the lines of a layer follow its in-plane frequencies; normal to X or Y, the
-layers near the sides are as dense as the larger of the two frequencies in the
-layer, which is the surface one.
-
-Evaluating a TPMS at a frequency that varies with the position without such a
-map distorts it wherever the frequency changes, because the phase also changes
-with the gradient of the frequency times the distance from the origin. Fitting a
-smooth map to a varying isotropic scale in the least-squares sense (a Poisson
-problem per axis) cannot grade strongly: its divergence is the target scale plus
-a harmonic function pinned by the surface, which keeps the scale in the core
-near two thirds of the surface one. Following a distance exactly needs the
-lattice to change its topology, by blending lattices of different densities or
-filling shells of equal distance with them, as the modes following the distance
-to the surface do.
-
-The target scale at depth `d = 1 - t`, with `S` the surface and `I` the interior
-frequency, both from each pattern's own density calibration:
-
-| Gradient    | Scale                  |
-|-------------|------------------------|
-| Linear      | `1 + (I / S - 1) * d`  |
-| Quadratic   | `1 + (I / S - 1) * d^2`|
-| Exponential | `(I / S)^d`            |
-
-With a denser surface, quadratic keeps the surface density deepest and
-exponential drops fastest. A denser interior works the same way.
-
-The zero level is extracted with marching squares like the regular TPMS-FK, on
-a sampling grid fixed in the fill frame like the optimized Gyroid, so that every
-region of a layer connects its lines the same way at the saddles of the pattern.
-Loops narrower than two lines (shorter than `2 * PI * spacing`) are dropped, as
-they would print as blobs. The fill works in a frame rotated by the infill
-angle, so the radial field is looked up at the point rotated back into the
-object frame, and the center rotated into the fill frame. Both use the middle of
-the layer.
-
-## Modes following the distance to the surface
-
-`distance_warp`, `smooth_blend` and `stepped_shells` grade by the distance to
-the nearest surface, including the top and bottom, as concentric shells do. The
-depth of a point is that distance over the distance of the deepest point of its
-body, from 0 at the surface to 1; the field keeps it for every node and
-interpolates it between them. A tall box so keeps its whole axis as sparse as
-its center, and a plate is graded through its thickness.
-
-No single smooth pattern follows that depth without distortion (see above), so
-the three modes trade differently:
-
-- Distance warp keeps the lobes and the warp of Lobes, but its radial profile
-  comes from the depth. For every direction of a lobe, the mean depth over the
-  ball along the ray is sampled at 33 radii up to the reach, then smoothed over
-  the neighbouring directions like the reach. The radial coordinate is the one
-  of the linear profile with the same mean depth, `t = 4/3 * (1 - mean depth)`,
-  so with a linear gradient the mean cell size follows the depth exactly, and
-  with the others approximately. In a sphere or a cube, where the depth falls
-  linearly along every ray, it is Lobes. Elsewhere the profile changes with the
-  direction, and the warp shears where neighbouring directions differ, as in
-  plates and long bodies; right under the top of a long body the cells are
-  sparser within the layer, the warp moving their density into the height.
-  The profiles are smoothed over the directions like the reach, as sharper
-  ones shear the pattern across the layer, which adds lines. A long body is so
-  graded partly along its length, between Lobes and the distance.
-- Smooth blend evaluates the regular patterns of the two levels around the
-  target of every point and blends them by a smoothstep over the whole gap
-  between the levels, here at most 2.5 times apart. The density follows the
-  depth without steps, but where two lattices blend, part of their lines run
-  along the blend, so fewer levels print fewer extra lines. From 25% to 5%,
-  three levels print about 0.45 of the uniform infill in a deep core whose
-  levels alone would print 0.3; levels 1.5 times apart print 0.6 to 0.7, and a
-  single blend from the surface to the interior 0.6.
-- Stepped shells split each region of a layer into shells and fill every shell
-  with the regular pattern at its density. The densities are levels from the
-  surface to the interior density at most 1.5 times apart, five from 25% to 5%,
-  and a point takes the level nearest to its target on that geometric scale.
-  The shells are traced by marching squares of the continuous level over the
-  layer on a 0.5 mm grid fixed in the object, so every region of a layer gets
-  the same shells, and clipped to the region. Each shell is shrunk by half a
-  line, like a filled region, and its regular filler connects its lines along
-  that boundary, so the connections of two neighbouring shells lie side by side
-  instead of on top of each other. The pattern is never
-  distorted, but its lines end at every shell, and thin parts get thin shells.
-  The connections add lines: in the core of a 60 mm cube, about a third more
-  than the target.
-
-Stepped shells and Smooth blend need neither lobes nor reaches, which are not
-built for them.
-
-## Constraints
-
-- With `tpms_adaptive` disabled, or for other patterns, the fill parameters are reset
-  to their defaults, so they neither change the infill nor split fill batches.
-- `Layer::get_sparse_infill_max_void_area()` uses the sparser of the two
-  densities, as the voids at the center are that large.
-- At a sparse infill density of 100% the sparse infill is turned into solid
-  infill, so there is nothing to grade: the options are hidden and no field is
-  built.
-- The adaptive options invalidate `posPrepareInfill`, which rebuilds the field
-  and the anchoring infill.
-- An elongated body without a neck has one center, so its far ends are graded
-  as the outer part of the body, and the warp shears where the reach changes
-  quickly with the direction. A concave body, like an L, may be split into lobes
-  where its maxima cannot see each other in a straight line.
-- Across a ray, the scale is the mean of the gradient from the center, so the
-  layers right under the top and above the bottom are sparser than the surface
-  density in their middle, and a plate is graded from its middle outwards rather
-  than through its thickness.

docs/HLSD/separated-infills.md

@@ -1,97 +0,0 @@
-# Separated infills — High Level Design
-
-## Purpose and scope
-
-An object's infill patterns are laid out from one reference point, the center
-of the object. When an object groups several parts that do not touch, every
-part cuts the same object-wide pattern at a different place, so equal parts get
-different infill. `separated_infills` lays the infill of every connected body
-out from the center of that body instead, as if the body were sliced on its own.
-
-The option covers sparse infill, internal solid infill and bridges. Top and
-bottom surfaces are left to `center_of_surface_pattern`, which centers the
-Archimedean Chords and Octagram Spiral surface patterns. The option is off by
-default; with it off, or for an object made of a single body, no fill changes.
-Adaptive Cubic and Support Cubic do not depend on the option: they always fill
-each body on its own (see Octree infill).
-
-## Bodies
-
-`PrintObject::prepare_infill()` groups the islands of every layer (`lslices`)
-into 3D connected bodies before bridges are detected, so bridge anchors and
-printed infill share one origin. Islands on adjacent layers belong to one body
-when their slices overlap. Parts that touch or overlap form one body. Separate
-parts, disconnected islands of one mesh, and interleaved parts that never touch,
-such as chain links, each form their own. Every island stores the index of its
-body in `Layer::lslices_separated_component_ids`, and
-`PrintObject::separated_body_bboxes()` holds the bounding box of each body over
-all its layers.
-
-The pass runs when a region uses separated infills, per-model surface centering
-or an octree infill pattern. It is skipped when the object has one model part
-that cannot be split, since a single body already shares the object center.
-
-## Centering a fill
-
-`infill_body()` matches each fill region to the island it overlaps most, among
-the islands whose bounding boxes overlap it, and the filler takes the bounding
-box of that island's body instead of the object's. The box covers every layer
-of the body, which is the box the body gets when sliced alone, so patterns that
-depend on its extent as well as its center come out the same too. Bridge
-anchoring (`Layer::generate_sparse_infill_polylines_for_anchoring()`) makes the
-same choice, so the anchors match the printed infill.
-
-The patterns follow the body's box in one of two ways:
-
-- Rectilinear and its variants, Line, Grid, Triangles, Tri-hexagon, Cubic,
-  Quarter Cubic, Lateral Lattice, Lateral Honeycomb and the plane-path patterns
-  (Hilbert Curve, Archimedean Chords, Octagram Spiral) are laid out from the
-  box: they phase their lines through its center, and Hilbert Curve and the Zig
-  Zag links start from its corner. `Fill::extended_object_bounding_box()`
-  extends the box about its center, so it also serves a box that is not
-  centered on the origin.
-- Honeycomb, 3D Honeycomb, Cross Hatch, Gyroid, TPMS-D and TPMS-FK are laid out
-  from the coordinate origin, which is the object center. They return true from
-  `Fill::aligned_to_origin()`, and `Fill::fill_surface()` moves each region so
-  that the box center lands on the origin, fills it, and moves the paths back.
-  With the default box the center is the origin, so nothing moves.
-
-`is_separable_infill_pattern()` lists these patterns. The settings show the
-option only when the sparse infill pattern is one of them.
-
-## Octree infill
-
-Adaptive Cubic and Support Cubic take their lines from an octree, laid out from
-the center of the mesh it is built from and refined near its surfaces. An
-octree of the whole object would lay every part out from the object's center
-and refine it near the other parts, so these patterns
-(`is_octree_infill_pattern()`) always fill each body on its own, and the
-settings hide the option for them.
-
-For an object of several bodies, `PrintObject::prepare_adaptive_infill_data()`
-builds one octree per body (`FillAdaptive::Octrees`) from the triangles of that
-body only, which is the octree the body gets when sliced alone. Each connected
-component of the mesh goes to the body that most of a few sampled triangles lie
-on. A sample is taken a layer height inside the solid, behind the triangle, and
-looked up in the islands of the nearest layer. Each internal bridge surface goes
-to the body of its island. The fill takes the octree of the region's body, from
-the same `infill_body()`. The octree of the whole object is built only for an
-object of a single body, or when some body received no triangles, which then
-uses it.
-
-The line spacing of an octree comes from the density, line width and multiline
-count of a region, so a modifier or a part with its own density needs octrees of
-its own. `adaptive_fill_line_spacing()` gives the spacing of each region, and
-`FillAdaptive::RegionOctrees` holds one set of octrees per distinct spacing,
-shared by the regions that have it. A set is built only for the bodies its
-regions fill. The fill takes the set of its region, then the octree of its body.
-
-## Patterns left out
-
-Lightning grows its trees over the whole object, so moving a reference point
-cannot center it on one body. Concentric and Spiral Inset follow the outline of
-each region and need no centering.
-
-Solid infill at full density spaces its lines over the extent of each region,
-so it is already independent of the other bodies. Only bridges, which keep
-their line spacing, and the plane-path solid patterns depend on the center.

resources/calib/temperature_tower/gen_belt_temp_tower.py

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

resources/images/delete_all_filaments.svg

@@ -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>

resources/images/toolbar_tooltip.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><rect x="7" y="12" width="1" height="1" style="fill:#fefefe;"/><path d="M4.5,5.5c0-1.71,1.43-3.09,3.16-3,1.62.08,2.84,1.54,2.84,3.17h0c0,.61-.25,1.2-.69,1.62l-2.31,2.24v.97" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25"><circle cx="9.5" cy="12.5" r="9.5" style="fill:#009688"/><path d="M6.5,10.5a3,3,0,0,1,6,0c0,3-3,2-3,4v1" style="fill:none;stroke:#e6e6e6;stroke-linecap:round;stroke-linejoin:round"/><rect x="9" y="17" width="1" height="1" style="fill:#e6e6e6"/></svg>

resources/images/toolbar_tooltip_hover.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25"><circle cx="9.5" cy="12.5" r="9.5" style="fill:#33aba1"/><path d="M6.5,10.5a3,3,0,0,1,6,0c0,3-3,2-3,4v1" style="fill:none;stroke:#e6e6e6;stroke-linecap:round;stroke-linejoin:round"/><rect x="9" y="17" width="1" height="1" style="fill:#e6e6e6"/></svg>

resources/images/toolbar_video_guide.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path d="M12.31,8l-8.14,4.16c-.31.16-.67-.07-.67-.41V3.27c0-.35.37-.57.68-.41l8.14,4.32c.33.17.33.65,0,.82Z" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/></svg>

resources/images/toolbar_wiki.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path d="M7.5,3.5c2-2,5.1-1,6-1" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><path d="M7.5,12.5c2-2,5.1-1,6-1" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><path d="M7.5,3.5C5.5,1.5,2.4,2.5,1.5,2.5" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><path d="M7.5,12.5c-2-2-5.1-1-6-1" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><line x1="13.5" y1="11.5" x2="13.5" y2="2.5" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><line x1="7.5" y1="12.5" x2="7.5" y2="3.5" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/><line x1="1.5" y1="11.5" x2="1.5" y2="2.5" style="fill:none; stroke:#fefefe; stroke-linecap:round; stroke-linejoin:round;"/></svg>

resources/profiles/BBL/process/0.08mm High Quality @BBL P2S 0.2 nozzle.json

@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"

resources/profiles/BBL/process/0.08mm High Quality @BBL P2S.json

@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",

resources/profiles/BBL/process/0.10mm Standard @BBL P2S 0.2 nozzle.json

@@ -9,7 +9,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"

resources/profiles/BBL/process/0.12mm Balanced Quality @BBL P2S 0.2 nozzle.json

@@ -9,7 +9,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"

resources/profiles/BBL/process/0.12mm High Quality @BBL P2S.json

@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",

resources/profiles/BBL/process/0.16mm High Quality @BBL P2S.json

@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",

resources/profiles/BBL/process/0.16mm Standard @BBL P2S.json

@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.18mm Balanced Quality @BBL P2S 0.6 nozzle.json

@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.20mm High Quality @BBL P2S.json

@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",

resources/profiles/BBL/process/0.20mm Standard @BBL P2S.json

@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.24mm Balanced Quality @BBL P2S 0.6 nozzle.json

@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.24mm Balanced Quality @BBL P2S 0.8 nozzle.json

@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"

resources/profiles/BBL/process/0.24mm Standard @BBL P2S.json

@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.30mm Standard @BBL P2S 0.6 nozzle.json

@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",

resources/profiles/BBL/process/0.32mm Balanced Quality @BBL P2S 0.8 nozzle.json

@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"

resources/profiles/BBL/process/0.40mm Standard @BBL P2S 0.8 nozzle.json

@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"

resources/profiles/Custom.json

@@ -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"

resources/profiles/Custom/machine/MyBeltPrinter 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"
-}

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

@@ -1,20 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.4 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "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"
-}

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

@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.6 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "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"
-}

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

@@ -1,26 +0,0 @@
-{
-	"type": "machine",
-	"name": "MyBeltPrinter 0.8 nozzle",
-	"inherits": "fdm_belt_common",
-	"from": "system",
-	"setting_id": "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"
-}

resources/profiles/Custom/machine/MyBeltPrinter.json

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

resources/profiles/Custom/machine/fdm_belt_common.json

@@ -1,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"
-}

resources/profiles/Custom/process/0.12mm Fine @MyBeltPrinter.json

@@ -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"
-	]
-}

resources/profiles/Custom/process/0.20mm Standard @MyBeltPrinter.json

@@ -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"
-	]
-}

resources/profiles/Elegoo.json

@@ -1,6 +1,6 @@
 {
 	"name": "Elegoo",
-	"version": "02.04.00.11",
+	"version": "02.04.00.12",
 	"force_update": "0",
 	"description": "Elegoo configurations",
 	"machine_model_list": [

resources/profiles/Elegoo/filament/BASE/Elegoo PLA @base.json

@@ -15,6 +15,6 @@
 		"Elegoo"
 	],
 	"filament_start_gcode": [
-		"; filament start gcode\n"
+		"; Elegoo PLA filament start gcode\n"
 	]
 }

resources/profiles/IdeaFormer.json

@@ -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"
-        }
-    ]
-}

resources/profiles/IdeaFormer/filament/Generic PETG @IdeaFormer IR3 V2.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"
-	]
-}

resources/profiles/IdeaFormer/filament/Generic PLA @IdeaFormer IR3 V2.json

@@ -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"
-	]
-}

resources/profiles/IdeaFormer/filament/eSUN PLA @IdeaFormer IR3 V2.json

@@ -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"
-	]
-}

resources/profiles/IdeaFormer/machine/IdeaFormer IR3 V2 0.4 nozzle.json

@@ -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)"
-}

resources/profiles/IdeaFormer/machine/IdeaFormer IR3 V2.json

@@ -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"
-}

resources/profiles/IdeaFormer/machine/fdm_belt_common.json

@@ -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"
-}

resources/profiles/IdeaFormer/machine/fdm_klipper_common.json

@@ -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"
-}

resources/profiles/IdeaFormer/machine/fdm_machine_common.json

@@ -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"
-}

resources/profiles/IdeaFormer/process/0.20mm Standard @IdeaFormer IR3 V2.json

@@ -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"
-	]
-}

resources/profiles/IdeaFormer/process/fdm_process_common.json

@@ -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"
-}

resources/profiles/OrcaArena.json

@@ -1,7 +1,7 @@
 {
 	"name": "Orca Arena Printer",
 	"url": "",
-	"version": "02.04.00.07",
+	"version": "02.04.00.08",
 	"force_update": "0",
 	"description": "Orca Arena configuration files",
 	"machine_model_list": [

resources/profiles/OrcaFilamentLibrary.json

@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.15",
+	"version": "02.04.00.19",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [

resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @base.json

@@ -39,7 +39,7 @@
 		"60"
 	],
 	"filament_start_gcode": [
-		"; filament start gcode\n"
+		"; Elegoo PLA filament start gcode\n"
 	],
 	"filament_end_gcode": [
 		"; filament end gcode \n"

resources/profiles/Printcepts.json

@@ -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"
-		}
-	]
-}

resources/profiles/Printcepts/BabyBelt Pro_bed_texture.svg

@@ -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>

resources/profiles/Printcepts/filament/Generic PETG @BabyBelt Pro.json

@@ -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"
-	]
-}

resources/profiles/Printcepts/filament/Generic PLA @BabyBelt Pro.json

@@ -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"
-	]
-}

resources/profiles/Printcepts/filament/eSUN PLA @BabyBelt Pro.json

@@ -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"
-	]
-}

resources/profiles/Printcepts/machine/BabyBelt Pro 0.4 nozzle.json

@@ -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"
-}

resources/profiles/Printcepts/machine/BabyBelt Pro.json

@@ -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"
-}

resources/profiles/Printcepts/machine/fdm_belt_common.json

@@ -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"
-}

resources/profiles/Printcepts/machine/fdm_klipper_common.json

@@ -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"
-}

resources/profiles/Printcepts/machine/fdm_machine_common.json

@@ -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"
-}

resources/profiles/Printcepts/process/0.20mm Standard @BabyBelt Pro.json

@@ -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"
-	]
-}

resources/profiles/Printcepts/process/fdm_process_common.json

@@ -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"
-}

resources/shaders/110/gouraud.fs

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

resources/shaders/110/gouraud.vs

@@ -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
+    // z component of normal vector in world coordinate used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
 
     gl_Position = projection_matrix * position;
     if (is_outline) {

resources/shaders/110/mm_gouraud.fs

@@ -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;

resources/shaders/110/mm_gouraud.vs

@@ -24,7 +24,6 @@ struct SlopeDetection
     bool actived;
 	float normal_z;
     mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;
 void main()

resources/shaders/110/phong.fs

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

resources/shaders/110/phong.vs

@@ -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
+    // z component of normal vector in world coordinate used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
 
     gl_Position = projection_matrix * position;
     if (is_outline) {

resources/shaders/110/texture_displacement_shaded.fs

@@ -29,13 +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)
-// How each entry prints. Every entry names a single filament: a mix is given its own mixed filament
+// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
-// slot, whose components the slicer alternates per print layer, so the fragment just looks that slot's
+// num parts of a in every den, and the print shows that interleave rather than the entry's average
-// colour up.
+// 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 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;
@@ -223,16 +229,63 @@ int nearest_palette_entry(vec3 rgb)
 }
 
 // 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`. Every entry names a
+// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
-// single filament: a mix is given its own mixed filament slot, whose components the slicer alternates
+// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
-// per print layer, so there is nothing left to interleave here.
+// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
-vec3 printed_color(int index)
+// 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];
-    if (a < 0 || a >= filament_count)
+    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
-    return filament_rgb[a];
+    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()
@@ -243,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;
 
@@ -364,6 +420,6 @@ void main()
         // 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));
+        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);
 }

resources/shaders/140/gouraud.fs

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

resources/shaders/140/gouraud.vs

@@ -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
+    // z component of normal vector in world coordinate used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
 
     gl_Position = projection_matrix * position;
     if (is_outline) {

resources/shaders/140/mm_gouraud.fs

@@ -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;

resources/shaders/140/mm_gouraud.vs

@@ -24,7 +24,6 @@ struct SlopeDetection
     bool actived;
 	float normal_z;
     mat3 volume_world_normal_matrix;
-    vec3 up_direction;
 };
 uniform SlopeDetection slope;
 void main()

resources/shaders/140/phong.fs

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

resources/shaders/140/phong.vs

@@ -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
+    // z component of normal vector in world coordinate used for slope shading
-    world_normal_z = slope.actived ? dot(normalize(slope.volume_world_normal_matrix * v_normal), slope.up_direction) : 0.0;
+    world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
 
     gl_Position = projection_matrix * position;
     if (is_outline) {

resources/shaders/140/texture_displacement_shaded.fs

@@ -88,13 +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)
-// How each entry prints. Every entry names a single filament: a mix is given its own mixed filament
+// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
-// slot, whose components the slicer alternates per print layer, so the fragment just looks that slot's
+// num parts of a in every den, and the print shows that interleave rather than the entry's average
-// colour up.
+// 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 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;
@@ -289,16 +295,63 @@ int nearest_palette_entry(vec3 rgb)
 }
 
 // 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`. Every entry names a
+// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
-// single filament: a mix is given its own mixed filament slot, whose components the slicer alternates
+// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
-// per print layer, so there is nothing left to interleave here.
+// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
-vec3 printed_color(int index)
+// 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];
-    if (a < 0 || a >= filament_count)
+    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
-    return filament_rgb[a];
+    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()
@@ -311,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;
 
@@ -452,6 +508,6 @@ void main()
         // 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));
+        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);
 }

scripts/Dockerfile.deps-assimp

@@ -46,7 +46,7 @@ RUN set -eux; \
     tar -xzf /tmp/assimp.tar.gz -C /tmp/assimp-src --strip-components=1; \
     DESTDIR=/OrcaSlicer/deps/build/destdir/usr/local; \
     cmake -S /tmp/assimp-src -B /tmp/assimp-build -G Ninja \
-        -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="$DESTDIR" \
         -DCMAKE_PREFIX_PATH="$DESTDIR" \