Defer Plugin Dock Panes Until the Plater Is Shown

A plugin enabled at startup loads before the main frame exists, so a dock panel it opens from on_load was dropped by the one-shot CallAfter that found no plater. Opened a moment later, before the frame was laid out, the pane was sized against the unsized frame and track_docked_size kept that width. Poll until the plater is shown on screen, then build the pane; release the reserved id instead when the app is closing.
2026-10-10 17:21:10 +00:00 · 2026-10-07 20:47:56 +08:00
523 changed files with 6319 additions and 20196 deletions
@@ -5,6 +5,7 @@ on:
    branches:
     - main
     - release/*
+     - belt-printer
    paths:
     - 'deps/**'
     - 'src/**'
@@ -261,6 +262,9 @@ jobs:
      date:
      ver:
      ver_pure:
+      # Belt-printer nightlies share the main nightly release but carry a `_belt`
+      # suffix so they never overwrite the main assets.
+      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}
    steps:
    - name: "Remove unneeded stuff to free disk space"
      run:
@@ -435,13 +439,13 @@ jobs:
        name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
        path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
    - name: Deploy Flatpak to nightly release
-      if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main'
+      if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer')
      uses: WebFreak001/deploy-nightly@v3.2.0
      with:
        upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
        release_id: 137995723
        asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
+        asset_name: OrcaSlicer-Linux-flatpak_nightly${{ env.nightly_suffix }}_${{ matrix.variant.arch }}.flatpak
        asset_content_type: application/octet-stream
        max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
    # The asset is /app (the exes link it at runtime) plus the build tree
@@ -33,6 +33,11 @@ jobs:
      ubuntu-ver: '2404'
      ubuntu-ver-str: '_Ubuntu2404'
      ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
+      # Branches whose builds are published to the nightly release. The
+      # belt-printer branch ships alongside main but its assets carry a `_belt`
+      # suffix (nightly_suffix) so they never overwrite the main nightly assets.
+      deploy_nightly: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' }}
+      nightly_suffix: ${{ github.ref == 'refs/heads/belt-printer' && '_belt' || '' }}

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

 # Thanks to RaySajuuk, it's working now
      - name: Sign app and notary
-        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
+        if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/belt-printer' || startsWith(github.ref, 'refs/heads/release/')) && runner.os == 'macOS' && inputs.macos-combine-only
        timeout-minutes: 30
        working-directory: ${{ github.workspace }}
        env:
@@ -343,7 +348,7 @@ jobs:
          fi

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

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

@@ -538,24 +543,24 @@ jobs:
          path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe

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

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

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

      - name: Deploy Ubuntu release
-        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
+        if: ${{ github.repository == 'OrcaSlicer/OrcaSlicer' && ! env.ACT && env.deploy_nightly == 'true' && runner.os == 'Linux' && !vars.SELF_HOSTED }}
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}
          release_id: 137995723
          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly.AppImage
+          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}${{ env.arch_suffix }}_nightly${{ env.nightly_suffix }}.AppImage
          asset_content_type: application/octet-stream
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
      - name: Deploy Ubuntu release
@@ -74,26 +74,12 @@ jobs:
          set +e
          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_system.log
          exit ${PIPESTATUS[0]}
-      # The validator above is the nightly build of main, so it cannot slice profiles that use
-      # settings a PR adds to the engine: it reports their placeholders as undefined. A PR that
-      # changes src/ also runs Build all, whose Slice check runs this same sweep with the
-      # validator built from the PR, so the sweep below only runs for the other PRs.
-      - name: Detect engine changes
-        id: engine_changes
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          base=${{ github.event.pull_request.base.sha }}
-          if git fetch --no-tags --depth=1 origin "$base" && ! git diff --quiet "$base" HEAD -- src/; then
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-            echo "::notice::This PR changes src/, so Build all's Slice check slices the profiles with the PR-built validator."
-          fi
      # Slice a two-colour cube through every printer, and through every system process/filament whose
      # templates no printer's own slice reaches, so every custom g-code and filename_format shipped is
      # expanded (names in {if} branches not taken included) - catches undefined-placeholder /
      # invalid-flow bugs the static checks above cannot see.
      - name: validate slice (expand custom g-code)
        id: validate_slice
-        if: ${{ steps.engine_changes.outputs.changed != 'true' }}
        continue-on-error: true
        run: |
          set +e
@@ -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()
@@ -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
@@ -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
-    # 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
+    print_and_run cmake --build deps/$BUILD_DIR -j1
 fi

 if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
@@ -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_COMPAT="-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
+  export CMAKE_POLICY_VERSION_MINIMUM=3.5
+  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=""
@@ -5,10 +5,10 @@ endif ()
 orcaslicer_add_cmake_project(
    CGAL
    # GIT_REPOSITORY https://github.com/CGAL/cgal.git
-    # GIT_TAG        28811b671a12b5caa9e3688569dadbc6b3728fe6 # v6.2.1
+    # GIT_TAG        3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3
    # For whatever reason, this keeps downloading forever (repeats downloads if finished)
-    URL      https://github.com/CGAL/cgal/releases/download/v6.2.1/CGAL-6.2.1.zip
-    URL_HASH SHA256=eebd737d9b7f0199647ba5c1f9f6c7a3d0651aacef9c2fd4dedc52da6c25edbe
+    URL      https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip
+    URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4
    DEPENDS dep_Boost dep_Eigen dep_GMP dep_MPFR
 )

@@ -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}
@@ -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())
-     {
@@ -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
@@ -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 ()
@@ -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 ()
@@ -33,8 +33,8 @@

 // Axis-aligned bounding box tree for tet tri intersection
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>

 // Boolean operations
 #include <CGAL/Polyhedron_3.h>
@@ -41,9 +41,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
    const std::vector<std::vector<size_t> > & VF,
    const std::vector<std::vector<size_t> > & VFi,
    const CGAL::AABB_tree<
-      CGAL::AABB_traits_3<
+      CGAL::AABB_traits<
        Kernel, 
-        CGAL::AABB_triangle_primitive_3<
+        CGAL::AABB_triangle_primitive<
          Kernel, typename std::vector<
            typename Kernel::Triangle_3 >::iterator > > > & tree,
    const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -56,8 +56,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
  typedef typename Kernel::Segment_3 Segment_3;
  typedef typename Kernel::Triangle_3 Triangle;
  typedef typename std::vector<Triangle>::iterator Iterator;
-  typedef typename CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef typename CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
+  typedef typename CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef typename CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
  typedef typename CGAL::AABB_tree<AABB_triangle_traits> Tree;

  if (F.rows() <= 0 || I.rows() <= 0) {
@@ -451,8 +451,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
  typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
  typedef Kernel::Triangle_3 Triangle;
  typedef std::vector<Triangle>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
  typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;

  if (F.rows() <= 0 || I.rows() <= 0) {
@@ -498,9 +498,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
+template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
+template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
 // generated by autoexplicit.sh
 template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
    Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, 
@@ -509,7 +509,7 @@ template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT,
    Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, 
    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
-    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
+    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
 #include <cstdint>
 template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
 Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, 
@@ -518,7 +518,7 @@ Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
 Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, 
 Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
 Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
-Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, 
+Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, 
 Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, 
 Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);

@@ -14,8 +14,8 @@
 #include <vector>

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

@@ -67,9 +67,9 @@ namespace igl
          const std::vector<std::vector<size_t> > & VF,
          const std::vector<std::vector<size_t> > & VFi,
          const CGAL::AABB_tree<
-            CGAL::AABB_traits_3<
+            CGAL::AABB_traits<
              Kernel, 
-              CGAL::AABB_triangle_primitive_3<
+              CGAL::AABB_triangle_primitive<
                Kernel, typename std::vector<
                  typename Kernel::Triangle_3 >::iterator > > > & tree,
          const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -139,9 +139,9 @@ namespace igl
          const std::vector<std::vector<size_t> > & VF,
          const std::vector<std::vector<size_t> > & VFi,
          const CGAL::AABB_tree<
-            CGAL::AABB_traits_3<
+            CGAL::AABB_traits<
              Kernel, 
-              CGAL::AABB_triangle_primitive_3<
+              CGAL::AABB_triangle_primitive<
                Kernel, typename std::vector<
                  typename Kernel::Triangle_3 >::iterator > > > & tree,
          const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -12,8 +12,8 @@
 #include "points_inside_component.h"

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

 #include <cassert>
@@ -23,8 +23,8 @@
 #include "../../vertex_triangle_adjacency.h"

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

@@ -156,9 +156,9 @@ IGL_INLINE size_t igl::copyleft::cgal::extract_cells(
  std::vector<VectorXI> Is(num_components);
  std::vector<
    CGAL::AABB_tree<
-      CGAL::AABB_traits_3<
+      CGAL::AABB_traits<
        Kernel,
-        CGAL::AABB_triangle_primitive_3<
+        CGAL::AABB_triangle_primitive<
          Kernel, std::vector<
            Kernel::Triangle_3 >::iterator > > > > trees(num_components);
  std::vector< std::vector<Kernel::Triangle_3 > >
@@ -9,8 +9,8 @@ template <
 IGL_INLINE void igl::copyleft::cgal::hausdorff(
  const Eigen::MatrixBase<DerivedV>& V,
  const CGAL::AABB_tree<
-    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive_3<Kernel, 
+    CGAL::AABB_traits<Kernel, 
+      CGAL::AABB_triangle_primitive<Kernel, 
        typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
      >
    >
@@ -27,8 +27,8 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
  {
    CGAL::Point_3<Kernel> query(x,y,z);
    typename CGAL::AABB_tree<
-      CGAL::AABB_traits_3<Kernel, 
-        CGAL::AABB_triangle_primitive_3<Kernel, 
+      CGAL::AABB_traits<Kernel, 
+        CGAL::AABB_triangle_primitive<Kernel, 
          typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
        >
      >
@@ -41,5 +41,5 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
+template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
 #endif
@@ -38,8 +38,8 @@ namespace igl
      IGL_INLINE void hausdorff(
        const Eigen::MatrixBase<DerivedV>& V,
        const CGAL::AABB_tree<
-          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive_3<Kernel, 
+          CGAL::AABB_traits<Kernel, 
+            CGAL::AABB_triangle_primitive<Kernel, 
              typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
            >
          >
@@ -12,8 +12,8 @@
 #include "../../remove_unreferenced.h"

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

@@ -12,8 +12,8 @@
 #include "../../remove_unreferenced.h"

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

@@ -29,8 +29,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
  using namespace std;
  typedef CGAL::Triangle_3<Kernel> Triangle_3; 
  typedef typename std::vector<Triangle_3>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
  typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
  Tree tree;
  vector<Triangle_3> T;
@@ -43,8 +43,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance_precompute(
  const Eigen::MatrixBase<DerivedV> & V,
  const Eigen::MatrixBase<DerivedF> & F,
  CGAL::AABB_tree<
-    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive_3<Kernel, 
+    CGAL::AABB_traits<Kernel, 
+      CGAL::AABB_triangle_primitive<Kernel, 
        typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
      >
    >
@@ -90,8 +90,8 @@ template <
 IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
  const Eigen::MatrixBase<DerivedP> & P,
  const CGAL::AABB_tree<
-    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive_3<Kernel, 
+    CGAL::AABB_traits<Kernel, 
+      CGAL::AABB_triangle_primitive<Kernel, 
        typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
      >
    >
@@ -103,8 +103,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
 {
  typedef CGAL::Triangle_3<Kernel> Triangle_3; 
  typedef typename std::vector<Triangle_3>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
  typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
  typedef typename Tree::Point_and_primitive_id Point_and_primitive_id;
  typedef CGAL::Point_3<Kernel>    Point_3;
@@ -134,7 +134,7 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1>>&);
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck,   Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>,   Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1,   -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>,   Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>   >(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3,   0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0,   -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>   > const&,   Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1,   0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&,   Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
 #endif
@@ -63,8 +63,8 @@ namespace igl
        const Eigen::MatrixBase<DerivedV> & V,
        const Eigen::MatrixBase<DerivedF> & F,
        CGAL::AABB_tree<
-          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive_3<Kernel, 
+          CGAL::AABB_traits<Kernel, 
+            CGAL::AABB_triangle_primitive<Kernel, 
              typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
            >
          >
@@ -89,8 +89,8 @@ namespace igl
      IGL_INLINE void point_mesh_squared_distance(
        const Eigen::MatrixBase<DerivedP> & P,
        const CGAL::AABB_tree<
-          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive_3<Kernel, 
+          CGAL::AABB_traits<Kernel, 
+            CGAL::AABB_triangle_primitive<Kernel, 
              typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
            >
          >
@@ -13,8 +13,8 @@
 #include "assign_scalar.h"

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

 #include <cassert>
@@ -35,8 +35,8 @@ namespace igl {
            typedef Kernel::Triangle_3 Triangle;
            typedef Kernel::Plane_3 Plane_3;
            typedef std::vector<Triangle>::iterator Iterator;
-            typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-            typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
+            typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+            typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
            typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;

            template<typename DerivedF, typename DerivedI>
@@ -23,8 +23,8 @@
 #include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 // Axis-aligned bounding box tree for tet tri intersection
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <vector>

 IGL_INLINE bool igl::copyleft::cgal::signed_distance_isosurface(
@@ -18,9 +18,9 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
  const Eigen::MatrixBase<DerivedF>& F,
  const Eigen::MatrixBase<DerivedI>& I,
  CGAL::AABB_tree<
-    CGAL::AABB_traits_3<
+    CGAL::AABB_traits<
      Kernel, 
-      CGAL::AABB_triangle_primitive_3<
+      CGAL::AABB_triangle_primitive<
        Kernel, typename std::vector<
          typename Kernel::Triangle_3 >::iterator > > > & tree,
  std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -51,7 +51,7 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
 #endif
@@ -14,8 +14,8 @@
 #include <vector>

 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive_3.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_triangle_primitive.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>

@@ -44,9 +44,9 @@ namespace igl
        const Eigen::MatrixBase<DerivedF>& F,
        const Eigen::MatrixBase<DerivedI>& I,
        CGAL::AABB_tree<
-          CGAL::AABB_traits_3<
+          CGAL::AABB_traits<
            Kernel, 
-            CGAL::AABB_triangle_primitive_3<
+            CGAL::AABB_triangle_primitive<
              Kernel, typename std::vector<
                typename Kernel::Triangle_3 >::iterator > > > & tree,
        std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -88,18 +88,6 @@ struct NfpPConfig {
     */
    bool explore_holes = false;

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

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

        // BBS make sure the item won't clash with excluded regions
        // do we have wipe tower after arranging?
@@ -1,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.
@@ -62,23 +62,6 @@ Clipper2 behaves differently by default, the wrapper adjusts it.
  clip do not leave slivers.
 - Open polylines are clipped with the non-zero rule and keep their direction.

-### Tiled booleans
-
-The sweep slows down with the number of edges crossing a scan line, so a layer
-cut into thousands of pieces makes every whole-layer boolean expensive.
-`diff_ex_by_piece()` and `intersection_ex_by_piece()` take a subject of
-non-overlapping `ExPolygons`, group them into tiles with
-`ClipperUtils::tile_expolygons()`, and run each tile in parallel against only
-the clip polygons near it, cut to the tile's box. Below 128 pieces there is a
-single tile, and they are the plain `diff_ex()` / `intersection_ex()`.
-
-The result covers the same area as the plain call. Without the safety offset
-the rings are the same. With it, each tile unites only the clip polygons near
-it, so a clip edge that the whole-layer union splits where it crosses a distant
-clip polygon stays whole, and a crossing with the subject can round 1 unit
-differently. The tiles' results are concatenated in tile order, so the order of
-the output `ExPolygons` differs from the plain call.
-
 ### Offsets

 - Before offsetting, input vertices closer than
@@ -39,7 +39,7 @@ presets are never serialized — they have their own storage and their own lifec

 | Location | Contents on a shipped build | Role |
 |---|---|---|
-| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with and what installing copies from; read directly for vendors not installed |
+| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with; what installing copies from, and the only thing it is read for |
 | `<data_dir>/system/` | `<vendor>.opc` alone, or `<vendor>.json` + `<vendor>/` after an update | What the user has installed |
 | `<data_dir>/system/` (dev build) | `<vendor>.json` + `<vendor>/` + `<vendor>.opc` written at runtime | A developer tree caches as it parses |
 | `<data_dir>/cache/wizard_profile_data.json` | The wizard's derived vendor catalog plus the stamps it was built from | Written and read by the setup wizard only; never shipped (see "The wizard's profile-data cache") |
@@ -182,11 +182,10 @@ one startup.

 **A vendor is loaded from where it is installed and nowhere else.** For startup that
 is `<data_dir>/system/`; resources reaches the app by being *installed* into that
-directory first, never by being loaded from. (The setup wizard and the Create Printer
-dialog also offer vendors the user has not installed, and load those from
-`resources/profiles`; see "The wizard's profile-data cache". The dialog's vendor-only and
-filament-only scans read a cache only where it is the whole installation, and never write
-one.) There is one lookup tier and one parse source:
+directory first, never by being loaded from. (The setup wizard is the one caller with
+a different notion of "where": it also shows vendors the user has not installed, and
+loads those from `resources/profiles` — see "The wizard's profile-data cache".) There
+is one lookup tier and one parse source:

 ```
 load vendor V from <data_dir>/system:
@@ -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.
@@ -295,6 +295,8 @@ src/slic3r/GUI/CAD/DesignSketchTool.cpp
 src/slic3r/GUI/CAD/SketchInlineEditor.cpp
 src/slic3r/GUI/CAD/DesignOffer.hpp
 src/slic3r/GUI/CAD/DesignTextDialog.cpp
+src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
 src/slic3r/GUI/KeyChord.cpp
 src/slic3r/GUI/Shortcuts.cpp
 src/libslic3r/CAD/CadDocument.cpp
@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-"""Belt temperature-tower asset generator (discrete-provini design).
-
-A vertical temperature tower cannot be sliced on a belt printer, so lay a row of
-DISCRETE provini (one per temperature) along the belt (designed Y) with a fixed
-surface gap. Each provino is the chevron+arc unit (belt_temp_provino_unit.stl,
-keel-first); its temperature is ENGRAVED upright into the 50 mm face — a raised
-number would be an unsupported overhang on the belt. The C++ calib_temp belt branch
-(Plater.cpp) injects one M104 per zone 70 layers INTO provino i:
-  print_z[i] = i * PITCH * cos(theta) + 70 * layer_height   (theta = 45)
-inside the body, not in the empty inter-provino gap (which has no sliced layers for
-the event to attach to). PITCH below is the shared geometry contract with that code —
-keep them in sync.
-
-Generates one STL per filament temp range used by Temp_Calibration_Dlg.
-"""
-import numpy as np, trimesh, os
-from matplotlib.textpath import TextPath
-from matplotlib.font_manager import FontProperties
-from shapely.geometry import Polygon as ShPoly
-from shapely.ops import unary_union
-
-HERE = os.path.dirname(os.path.abspath(__file__))
-UNIT = os.path.join(HERE, 'belt_temp_provino_unit.stl')   # single provino, keel-first
-SURF_GAP = 25.0            # surface-to-surface gap between provini (mm) — user spec
-TEXT_H = 9.0
-TEXT_DEPTH = 0.8           # engraving depth (numbers are CUT into the face, not raised:
-                          # a raised number is an unsupported Y-overhang on the belt)
-TEXT_OVERSHOOT = 0.6       # extra height poking out of the face for a clean boolean cut
-
-# Temperature ranges (start, end) per filament family, 5 C step. File name encodes them.
-RANGES = [(230,190),(270,230),(250,230),(280,240),(240,210),(320,280)]
-
-unit = trimesh.load(UNIT)
-dY = unit.bounds[1,1] - unit.bounds[0,1]
-PITCH = dY + SURF_GAP                       # designed-Y pitch == C++ contract constant
-print(f"unit dY={dY:.2f}  PITCH={PITCH:.3f}  (C++ contract: print_z[i]=i*{PITCH:.3f}*cos45)")
-
-# 50 mm face normal (0,-1,1)/sqrt2 ; UPRIGHT basis u=+X det(+1) (verified non-mirrored)
-n = np.array([0,-1,1.])/np.sqrt(2)
-u = np.array([1,0,0.]); v = np.array([0,1,1.])/np.sqrt(2)
-R = np.column_stack([u,v,n])
-fn = unit.face_normals; fc = unit.triangles_center; fa = unit.area_faces
-sel = (fn@n) > 0.9
-face_c = (fc[sel]*fa[sel,None]).sum(0)/fa[sel].sum()
-
-def text_mesh(s):
-    tp = TextPath((0,0), s, size=TEXT_H, prop=FontProperties(family='DejaVu Sans'))
-    rings = [ShPoly(p) for p in tp.to_polygons() if len(p)>=3]
-    rings.sort(key=lambda r:r.area, reverse=True)
-    used=[False]*len(rings); parts=[]
-    for i,o in enumerate(rings):
-        if used[i]: continue
-        holes=[]
-        for j in range(i+1,len(rings)):
-            if not used[j] and o.contains(rings[j]): holes.append(rings[j].exterior.coords); used[j]=True
-        parts.append(ShPoly(o.exterior.coords,holes)); used[i]=True
-    poly = unary_union(parts)
-    geoms = list(poly.geoms) if poly.geom_type=='MultiPolygon' else [poly]
-    m = trimesh.util.concatenate([trimesh.creation.extrude_polygon(g,height=TEXT_DEPTH+TEXT_OVERSHOOT) for g in geoms])
-    c = m.bounds.mean(axis=0); m.apply_translation([-c[0],-c[1],0]); return m
-
-for t_start, t_end in RANGES:
-    temps = list(range(t_start, t_end-1, -5))
-    parts=[]
-    for i,T in enumerate(temps):
-        c = unit.copy(); c.apply_translation([0, i*PITCH, 0])
-        t = text_mesh(str(T)); M=np.eye(4); M[:3,:3]=R; t.apply_transform(M)
-        # place the text spanning from TEXT_DEPTH inside the face to TEXT_OVERSHOOT outside,
-        # then CUT it out of the provino (engrave) — no raised material, no Y-overhang.
-        t.apply_translation(face_c - n*TEXT_DEPTH + np.array([0,i*PITCH,0]))
-        c = trimesh.boolean.difference([c, t], engine='manifold')
-        parts.append(c)
-    asset = trimesh.util.concatenate(parts)
-    out = os.path.join(HERE, f"belt_temp_tower_{t_start}_{t_end}.stl")
-    asset.export(out)
-    dims = np.round(asset.bounds[1]-asset.bounds[0],1)
-    wt = all(p.is_watertight for p in parts)
-    print(f"  {t_start}->{t_end}: {len(temps)} zones  bbox={dims}  watertight={wt}  -> {os.path.basename(out)}")
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M5.5,14.5c-1.105,0-2-3.686-2-7s.895-7,2-7" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.67" y1="4.67" x2="14.33" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.33" y1="4.67" x2="8.67" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><path d="M3.5,13.7c-.294.511-.636.8-1,.8-1.1,0-2-3.686-2-7s.9-7,2-7c.365,0,.707.293,1,.805" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.727,4.5c.334-2.208,1-4,1.773-4,.354,0,.686.378.974,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M9.474,13.5c-.288.622-.62,1-.974,1-.77,0-1.439-1.792-1.773-4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0007 3.15607L5.26748 9.97446C5.0759 10.0857 4.8723 10.2988 4.71546 10.5713C4.55862 10.8438 4.47656 11.127 4.47656 11.349V24.4715C4.47656 24.6929 4.55879 24.9752 4.71606 25.2472C4.87328 25.5192 5.07737 25.7322 5.26956 25.8438L17.1143 32.6992C17.3061 32.8102 17.5904 32.8795 17.902 32.8782C18.2136 32.8768 18.4968 32.8049 18.6868 32.6927L30.2729 25.8523C30.4645 25.739 30.6677 25.524 30.8242 25.2501C30.9806 24.9761 31.0625 24.6919 31.0625 24.4693V11.2435C31.0625 11.0216 30.9805 10.7392 30.8238 10.4679C30.667 10.1966 30.4635 9.98491 30.2715 9.87455L18.582 3.15275C18.3912 3.04273 18.1054 2.97271 17.7915 2.97339C17.4777 2.97408 17.192 3.045 17.0007 3.15607ZM6.3957 11.3642C6.53284 11.1245 6.83831 11.0414 7.07799 11.1785L16.9733 16.8405C17.3553 17.0587 17.6738 17.4171 17.8953 17.7985C18.1169 18.1801 18.2703 18.6338 18.2717 19.0733L18.2893 30.4075C18.2897 30.6837 18.0662 30.9079 17.7901 30.9083C17.5139 30.9087 17.2897 30.6852 17.2893 30.4091L17.2717 19.0767C17.2708 18.8547 17.1879 18.5717 17.0305 18.3007C16.8729 18.0294 16.6691 17.8183 16.4776 17.709L6.58136 12.0465C6.34168 11.9093 6.25855 11.6039 6.3957 11.3642Z" fill="#4db6ac"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.0809 2.28613C18.7002 2.0665 18.2304 1.97243 17.7893 1.9734C17.3481 1.97436 16.8787 2.07053 16.4985 2.29133L4.76515 9.10978C4.38527 9.33044 4.06884 9.69007 3.84874 10.0725C3.6286 10.455 3.47656 10.9093 3.47656 11.349V24.4715C3.47656 24.9118 3.62953 25.3658 3.85033 25.7477C4.07118 26.1297 4.38804 26.4882 4.76735 26.7085L16.6135 33.5647C16.9954 33.7857 17.4651 33.8801 17.9064 33.8782C18.3475 33.8762 18.8161 33.7778 19.1954 33.5537L30.7814 26.7133C31.1591 26.4902 31.4737 26.1292 31.6925 25.746C31.9114 25.3627 32.0625 24.9084 32.0625 24.4693V11.2435C32.0625 10.8037 31.9104 10.3497 31.6896 9.96764C31.4689 9.58563 31.1515 9.22695 30.7698 9.00759L19.0809 2.28613ZM29.6625 11.8015C29.786 12.0485 29.6859 12.3489 29.4389 12.4723L20.3956 16.994C20.1486 17.1175 19.8483 17.0174 19.7248 16.7704C19.6013 16.5234 19.7014 16.2231 19.9484 16.0996L28.9917 11.5779C29.2387 11.4544 29.539 11.5545 29.6625 11.8015Z" fill="#bdbdbd"/>
+</svg>
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <!-- Pencil body -->
+  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#009688"/>
+  <!-- Pencil tip (dark) -->
+  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#2b3436"/>
+  <!-- Pencil line -->
+  <line x1="10" y1="26" x2="25" y2="11" stroke="#2b3436" stroke-width="2"/>
+</svg>
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <!-- Pencil body (dark mode colors) -->
+  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#4db6ac"/>
+  <!-- Pencil tip -->
+  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#e0e0e0"/>
+  <!-- Pencil line -->
+  <line x1="10" y1="26" x2="25" y2="11" stroke="#e0e0e0" stroke-width="2"/>
+</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>
@@ -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>
@@ -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>
@@ -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>
@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"
@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",
@@ -9,7 +9,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"
@@ -9,7 +9,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000"
@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",
@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",
@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"4000",
 		"4000",
@@ -11,7 +11,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"
@@ -10,7 +10,6 @@
 		"50",
 		"50"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -11,7 +11,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000",
@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"
@@ -10,7 +10,6 @@
 		"30",
 		"30"
 	],
-	"enable_arc_fitting": "0",
 	"default_acceleration": [
 		"10000",
 		"10000"
@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.87",
+	"version": "02.03.02.86",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [
--- a/Show More
+++ b/Show More
				`@@ -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>
				`@@ -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>`
				`@@ -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>`
				`@@ -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>