Merge remote-tracking branch 'refs/remotes/upstream/main' into enh-spoolman-support

2025-12-27 09:59:48 -07:00 · 2025-11-10 15:43:41 -05:00 · 2025-11-10 15:43:41 -05:00 · fb119ec215
commit fb119ec215
parent fe543c3026 a7adeb6305
549 changed files with 13790 additions and 7595 deletions
--- a/.github/actions/apt-install-deps/action.yml
+++ b/.github/actions/apt-install-deps/action.yml
@ -0,0 +1,11 @@
+name: 'Apt Install Deps'
+description: 'Install the packages needed for building and deploying'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install dependencies from build_linux.sh
+      shell: bash
+      run: |
+        mkdir -p ${{ github.workspace }}/deps/build/destdir
+        sudo env "ORCA_UPDATER_SIG_KEY=$ORCA_UPDATER_SIG_KEY" ./build_linux.sh -ur
+        sudo chown $USER -R ./
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@ -30,6 +30,9 @@ on:
     - 'build_release_macos.sh'
     - 'scripts/flatpak/**'

+  schedule:
+      - cron: '0 17 * * *' # run once a day at 1 AM Singapore time (UTC+8)
+
  workflow_dispatch: # allows for manual dispatch
    inputs:
      build-deps-only:
@ -43,24 +46,72 @@ concurrency:
  

 jobs:
+  build_linux:
+    name: Build Linux
+    strategy:
+      fail-fast: false
+    # Don't run scheduled builds on forks:
+    if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer') }}
+    uses: ./.github/workflows/build_check_cache.yml
+    with:
+      os: ubuntu-24.04
+      build-deps-only: ${{ inputs.build-deps-only || false }}
+    secrets: inherit
  build_all:
-    name: Build All
+    name: Build Non-Linux
    strategy:
      fail-fast: false
      matrix:
        include:
-          # Deprecate 20.04appimage
-          # - os: ubuntu-20.04
-          - os: ubuntu-24.04
          - os: windows-latest
          - os: macos-14
            arch: arm64
+    # Don't run scheduled builds on forks:
+    if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer') }}
    uses: ./.github/workflows/build_check_cache.yml
    with:
      os: ${{ matrix.os }}
      arch: ${{ matrix.arch }}
      build-deps-only: ${{ inputs.build-deps-only || false }}
+      force-build: ${{ github.event_name == 'schedule' }}
    secrets: inherit
+  unit_tests:
+    name: Unit Tests
+    runs-on: ubuntu-24.04
+    needs: build_linux
+    if: ${{ !cancelled() && success() }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          sparse-checkout: |
+            .github
+            scripts
+      - name: Apt-Install Dependencies
+        uses: ./.github/actions/apt-install-deps
+      - name: Restore Test Artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: ${{ github.sha }}-tests
+      - uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
+      - name: Unpackage and Run Unit Tests
+        timeout-minutes: 20
+        run: |
+          tar -xvf build_tests.tar
+          scripts/run_unit_tests.sh
+      - name: Upload Test Logs
+        uses: actions/upload-artifact@v5
+        if: ${{ failure() }}
+        with:
+          name: unit-test-logs
+          path: build/tests/**/*.log
+      - name: Publish Test Results
+        if: always()
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: "ctest_results.xml"
  flatpak:
    name: "Flatpak"
    container:
@ -79,6 +130,8 @@ jobs:
            runner: ubuntu-24.04
          - arch: aarch64
            runner: ubuntu-24.04-arm
+    # Don't run scheduled builds on forks:
+    if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer') }}
    runs-on: ${{ matrix.variant.runner }}
    env:
      date:
@ -112,12 +165,12 @@ jobs:
        arch: ${{ matrix.variant.arch }}
        upload-artifact: false
    - name: Upload artifacts Flatpak
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        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.ref == 'refs/heads/main'}}
+      if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main'
      uses: WebFreak001/deploy-nightly@v3.2.0
      with:
        upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
--- a/.github/workflows/build_check_cache.yml
+++ b/.github/workflows/build_check_cache.yml
@ -12,6 +12,9 @@ on:
      build-deps-only:
        required: false
        type: boolean
+      force-build:
+        required: false
+        type: boolean
  
 jobs:
  check_cache: # determines if there is a cache and outputs variables used in caching process
@ -55,4 +58,5 @@ jobs:
      os: ${{ inputs.os }}
      arch: ${{ inputs.arch }}
      build-deps-only: ${{ inputs.build-deps-only }}
+      force-build: ${{ inputs.force-build }}
    secrets: inherit
--- a/.github/workflows/build_deps.yml
+++ b/.github/workflows/build_deps.yml
@ -19,11 +19,14 @@ on:
      build-deps-only:
        required: false
        type: boolean
+      force-build:
+        required: false
+        type: boolean

 jobs:
  build_deps:
    name: Build Deps
-    if: inputs.build-deps-only || inputs.valid-cache != true
+    if: ${{ !cancelled() && (inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true) }}
    runs-on: ${{ inputs.os }}
    env:
      date:
@ -85,28 +88,15 @@ jobs:
            brew install zstd


-      - name: Install Ubuntu Build Dependencies
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
-        working-directory: ${{ github.workspace }}
-        env:
-          apt-cmd: ${{ (inputs.os == 'ubuntu-20.04' && 'apt-fast') || (inputs.os == 'ubuntu-24.04' && 'sudo apt-get') || '' }}
-          webkit-ver: ${{ (inputs.os == 'ubuntu-20.04' && '4.0') || (inputs.os == 'ubuntu-24.04' && '4.1') || '' }}
-        run: |
-            ${{ env.apt-cmd }} update
-            ${{ env.apt-cmd }} install -y cmake git g++ build-essential libgl1-mesa-dev m4 \
-            libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
-            libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-${{ env.webkit-ver }}-dev \
-            libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
-            gstreamer1.0-plugins-bad wget sudo autoconf curl libunwind-dev texinfo
+      - name: Apt-Install Dependencies
+        if: inputs.os == 'ubuntu-24.04'
+        uses: ./.github/actions/apt-install-deps

      - name: Build on Ubuntu
        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
        working-directory: ${{ github.workspace }}
        run: |
-            mkdir -p ${{ github.workspace }}/deps/build
            mkdir -p ${{ github.workspace }}/deps/build/destdir
-            sudo ./build_linux.sh -ur
-            sudo chown $USER -R ./
            ./build_linux.sh -dr
            cd deps/build
            tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
@ -115,14 +105,14 @@ jobs:
      # Upload Artifacts
      # - name: Upload Mac ${{ inputs.arch }} artifacts
      #   if: inputs.os == 'macos-14'
-      #   uses: actions/upload-artifact@v4
+      #   uses: actions/upload-artifact@v5
      #   with:
      #     name: OrcaSlicer_dep_mac_${{ env.date }}
      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz

      - name: Upload Windows artifacts
        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_dep_win64_${{ env.date }}
          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
@ -131,7 +121,7 @@ jobs:
        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
        env:
          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
@ -139,7 +129,7 @@ jobs:
  build_orca:
    name: Build OrcaSlicer
    needs: [build_deps]
-    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
+    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success())) }}
    uses: ./.github/workflows/build_orca.yml
    with:
      cache-key: ${{ inputs.cache-key }}
--- a/.github/workflows/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@ -108,7 +108,7 @@ jobs:

 # Thanks to RaySajuuk, it's working now
      - name: Sign app and notary
-        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14'
+        if: github.repository == 'SoftFever/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14'
        working-directory: ${{ github.workspace }}
        env:
          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@ -181,21 +181,21 @@ jobs:

      - name: Upload artifacts mac
        if: inputs.os == 'macos-14'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_Mac_universal_${{ env.ver }}
          path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg

      - name: Upload OrcaSlicer_profile_validator DMG mac
        if: inputs.os == 'macos-14'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }}
          path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
          if-no-files-found: ignore

      - name: Deploy Mac release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
+        if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
@ -206,7 +206,7 @@ jobs:
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

      - name: Deploy Mac OrcaSlicer_profile_validator DMG release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
+        if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
@ -255,34 +255,34 @@ jobs:

      - name: Upload artifacts Win zip
        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_Windows_${{ env.ver }}_portable
          path: ${{ github.workspace }}/build/OrcaSlicer

      - name: Upload artifacts Win installer
        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_Windows_${{ env.ver }}
          path: ${{ github.workspace }}/build/OrcaSlicer*.exe

      - name: Upload artifacts Win PDB
        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: PDB
          path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z

      - name: Upload OrcaSlicer_profile_validator Win
        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_profile_validator_Windows_${{ env.ver }}
          path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe

      - name: Deploy Windows release portable
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
@ -293,7 +293,7 @@ jobs:
          max_releases: 1

      - name: Deploy Windows release installer
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
@ -304,7 +304,7 @@ jobs:
          max_releases: 1

      - name: Deploy Windows OrcaSlicer_profile_validator release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        if: github.repository == 'SoftFever/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
@ -315,39 +315,34 @@ jobs:
          max_releases: 1

 # Ubuntu
-      - name: Install dependencies
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
-        env:
-          apt-cmd: ${{ (inputs.os == 'ubuntu-20.04' && 'apt-fast') || (inputs.os == 'ubuntu-24.04' && 'sudo apt-get') || '' }}
-          webkit-ver: ${{ (inputs.os == 'ubuntu-20.04' && '4.0') || (inputs.os == 'ubuntu-24.04' && '4.1') || '' }}
-          libfuse2-pkg: ${{ (inputs.os == 'ubuntu-20.04' && 'libfuse2') || (inputs.os == 'ubuntu-24.04' && 'libfuse2t64') || '' }}
-        run: |
-          ${{ env.apt-cmd }} update
-          ${{ env.apt-cmd }} install -y autoconf build-essential cmake curl eglexternalplatform-dev \
-          extra-cmake-modules file git libcairo2-dev libcurl4-openssl-dev libdbus-1-dev libglew-dev libglu1-mesa-dev \
-          libglu1-mesa-dev libgstreamer1.0-dev libgstreamerd-3-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev \
-          libgtk-3-dev libgtk-3-dev libmspack-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \
-          libwebkit2gtk-${{ env.webkit-ver }}-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget ${{ env.libfuse2-pkg }}
+      - name: Apt-Install Dependencies
+        if: inputs.os == 'ubuntu-24.04'
+        uses: ./.github/actions/apt-install-deps

-      - name: Install dependencies from build_linux.sh
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
-        shell: bash
-        run: sudo env "ORCA_UPDATER_SIG_KEY=$ORCA_UPDATER_SIG_KEY" ./build_linux.sh -ur
-
-      - name: Fix permissions
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
-        shell: bash
-        run: sudo chown $USER -R ./
-
-      - name: Build slicer
+        # Tests must built at the same time as the slicer;
+        # if you untangle them feel free to separate them here too
+      - name: Build slicer and tests
        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
        shell: bash
        env:
          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
        run: |
-          ./build_linux.sh -isr
+          ./build_linux.sh -istr
          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
          chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
+          tar -cvpf build_tests.tar build/tests
+
+        # Use tar because upload-artifacts won't always preserve directory structure
+        # and doesn't preserve file permissions
+      - name: Upload Test Artifact
+        if: inputs.os == 'ubuntu-24.04'
+        uses: actions/upload-artifact@v5
+        with:
+          name: ${{ github.sha }}-tests
+          overwrite: true
+          path: build_tests.tar
+          retention-days: 5
+          if-no-files-found: error

      - name: Build orca_custom_preset_tests
        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04'
@ -363,7 +358,7 @@ jobs:
        env:
          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
          path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
@ -372,13 +367,13 @@ jobs:
        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
        env:
          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
          path: './build/src/Release/OrcaSlicer_profile_validator'

      - name: Deploy Ubuntu release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
+        if: ${{ github.repository == 'SoftFever/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
        env:
          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
        uses: WebFreak001/deploy-nightly@v3.2.0
@ -390,7 +385,7 @@ jobs:
          asset_content_type: application/octet-stream
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
      - name: Deploy Ubuntu release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
+        if: ${{ github.repository == 'SoftFever/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
        uses: rickstaa/action-create-tag@v1
        with:
          tag: "nightly-builds"
@ -399,7 +394,7 @@ jobs:
          message: "nightly-builds"

      - name: Deploy Ubuntu OrcaSlicer_profile_validator release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
+        if: ${{ github.repository == 'SoftFever/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
        env:
          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
        uses: WebFreak001/deploy-nightly@v3.2.0
@ -412,7 +407,7 @@ jobs:
          max_releases: 1

      - name: Deploy orca_custom_preset_tests
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
+        if: ${{ github.repository == 'SoftFever/OrcaSlicer' && ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
        uses: WebFreak001/deploy-nightly@v3.2.0
        with:
          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -65,7 +65,8 @@ build_release_vs2022.bat slicer
 # Performance and debug options:
 ./build_linux.sh -j N  # limit to N cores
 ./build_linux.sh -1    # single core build
-./build_linux.sh -b    # debug build
+./build_linux.sh -b    # Debug build
+./build_linux.sh -e    # RelWithDebInfo build
 ./build_linux.sh -c    # clean build
 ./build_linux.sh -r    # skip RAM/disk checks
 ./build_linux.sh -l    # use Clang instead of GCC
@ -107,9 +108,10 @@ cd build && ctest --output-on-failure
 Run individual test suites:
 ```bash
 # From build directory
-./tests/libslic3r/libslic3r_tests
-./tests/fff_print/fff_print_tests
-./tests/sla_print/sla_print_tests
+ctest --test-dir ./tests/libslic3r/libslic3r_tests
+ctest --test-dir ./tests/fff_print/fff_print_tests
+ctest --test-dir ./tests/sla_print/sla_print_tests
+# and so on
 ```

 ## Architecture
@ -254,4 +256,4 @@ Run individual test suites:
 - **Regression testing** important due to algorithm complexity
 - **Performance benchmarks** help catch performance regressions
 - **Memory leak** detection important for long-running GUI application
- **Cross-platform** testing required before releases
+- **Cross-platform** testing required before releases
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -117,7 +117,6 @@ option(SLIC3R_PROFILE 			"Compile OrcaSlicer with an invasive Shiny profiler" 0)
 option(SLIC3R_PCH               "Use precompiled headers" 1)
 option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
 option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
-option(SLIC3R_PERL_XS           "Compile XS Perl module and enable Perl unit and integration tests" 0)
 option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
 # If SLIC3R_FHS is 1 -> SLIC3R_DESKTOP_INTEGRATION is always 0, othrewise variable.
 CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_INTEGRATION "Allow perfoming desktop integration during runtime" 1 "NOT SLIC3R_FHS" 0)
@ -171,7 +170,6 @@ endif ()

 if (IS_CROSS_COMPILE)
    message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
-    set(SLIC3R_PERL_XS OFF CACHE BOOL "" FORCE)
    set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
 endif ()

@ -883,13 +881,6 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT O

 add_dependencies(gettext_make_pot hintsToPot)

-# Perl bindings, currently only used for the unit / integration tests of libslic3r.
-# Also runs the unit / integration tests.
-#FIXME Port the tests into C++ to finally get rid of the Perl!
-if (SLIC3R_PERL_XS)
-    add_subdirectory(xs)
-endif ()
-
 if(SLIC3R_BUILD_SANDBOXES)
    add_subdirectory(sandboxes)
 endif()
--- a/build_linux.sh
+++ b/build_linux.sh
@ -7,7 +7,7 @@ SCRIPT_PATH=$(dirname "$(readlink -f "${0}")")
 pushd "${SCRIPT_PATH}" > /dev/null

 function usage() {
-    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-h][-i][-j N][-p][-r][-s][-t][-u][-l][-L]"
+    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-D][-e][-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 "   -b: build in Debug mode"
@ -21,7 +21,7 @@ function usage() {
    echo "   -p: boost ccache hit rate by disabling precompiled headers (default: ON)"
    echo "   -r: skip RAM and disk checks (low RAM compiling)"
    echo "   -s: build the Orca Slicer (optional)"
-    echo "   -t: build tests (optional)"
+    echo "   -t: build tests (optional), requires -s flag"
    echo "   -u: install system dependencies (asks for sudo password; build prerequisite)"
    echo "   -l: use Clang instead of GCC (default: GCC)"
    echo "   -L: use ld.lld as linker (if available)"
@ -102,6 +102,11 @@ if [ ${OPTIND} -eq 1 ] ; then
    exit 1
 fi

+if [[ -n "${BUILD_TESTS}" ]] && [[ -z "${BUILD_ORCA}" ]] ; then
+    echo "-t flag requires -s flag in the same invocation"
+    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
@ -243,19 +248,22 @@ if [[ -n "${BUILD_ORCA}" ]] ; then
    echo "Building OrcaSlicer_profile_validator .."
    print_and_run cmake --build $BUILD_DIR --config "${BUILD_CONFIG}" --target OrcaSlicer_profile_validator
    ./scripts/run_gettext.sh
+    if [[ -n "${BUILD_TESTS}" ]] ; then
+	echo "Building tests ..."
+	print_and_run cmake --build ${BUILD_DIR} --config "${BUILD_CONFIG}" --target tests/all
+    fi
    echo "done"
 fi

 if [[ -n "${BUILD_IMAGE}" || -n "${BUILD_ORCA}" ]] ; then
    pushd $BUILD_DIR > /dev/null
-    echo "[9/9] Generating Linux app..."
    build_linux_image="./src/build_linux_image.sh"
    if [[ -e ${build_linux_image} ]] ; then
        extra_script_args=""
        if [[ -n "${BUILD_IMAGE}" ]] ; then
            extra_script_args="-i"
        fi
-        print_and_run ${build_linux_image} ${extra_script_args}
+        print_and_run ${build_linux_image} ${extra_script_args} -R "${BUILD_CONFIG}"

        echo "done"
    fi
--- a/deps_src/imgui/imgui_widgets.cpp
+++ b/deps_src/imgui/imgui_widgets.cpp
@ -4415,7 +4415,7 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT

 bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
 {
-    return InputTextEx(label, NULL, buf, (int) buf_size, size, flags , callback, user_data);//ImGuiInputTextFlags_Multiline should manual input
+    return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data);
 }

 bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
--- a/doc/Home.md
+++ b/doc/Home.md
@ -152,6 +152,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki
 ![im_code](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/im_code.svg?raw=true) This is a documentation from someone exploring the code and is by no means complete or even completely accurate. Please edit the parts you might find inaccurate. This is probably going to be helpful nonetheless.

 - [How to build OrcaSlicer](How-to-build)
+- [How to run tests](How-to-test)
 - [Localization and translation guide](Localization_guide)
 - [How to create profiles](How-to-create-profiles)
 - [How to contribute to the wiki](How-to-wiki)
--- a/doc/developer-reference/How-to-build.md
+++ b/doc/developer-reference/How-to-build.md
@ -279,9 +279,9 @@ The build system supports multiple Linux distributions including Ubuntu/Debian a
   ./build_linux.sh -d
   ```

-3. **Build OrcaSlicer:**
+3. **Build OrcaSlicer with tests:**
   ```shell
-   ./build_linux.sh -s
+   ./build_linux.sh -st
   ```

 4. **Build AppImage (optional):**
@ -291,14 +291,15 @@ The build system supports multiple Linux distributions including Ubuntu/Debian a

 5. **All-in-one build (recommended):**
   ```shell
-   ./build_linux.sh -dsi
+   ./build_linux.sh -dsti
   ```

 **Additional build options:**

- `-b`: Build in debug mode
+- `-b`: Build in debug mode (mostly broken at runtime for a long time; avoid unless you want to be fixing failed assertions)
 - `-c`: Force a clean build
 - `-C`: Enable ANSI-colored compile output (GNU/Clang only)
+- `-e`: Build RelWithDebInfo (release + symbols)
 - `-j N`: Limit builds to N cores (useful for low-memory systems)
 - `-1`: Limit builds to one core
 - `-l`: Use Clang instead of GCC
@ -309,10 +310,14 @@ The build system supports multiple Linux distributions including Ubuntu/Debian a
 > The build script automatically detects your Linux distribution and uses the appropriate package manager (apt, pacman) to install dependencies.

 > [!TIP]
-> For first-time builds, use `./build_linux.sh -u` to install dependencies, then `./build_linux.sh -dsi` to build everything.
+> For first-time builds, use `./build_linux.sh -u` to install dependencies, then `./build_linux.sh -dsti` to build everything.

 > [!WARNING]
-> If you encounter memory issues during compilation, use `-j 1` or `-1` to limit parallel compilation, or `-r` to skip memory checks.
+> If you encounter memory issues during compilation, use `-j 1` or `-1` to limit parallel compilation and `-r` to skip memory checks.
+
+#### Unit Testing
+
+See [How to Test](How-to-test) for more details.

 ---

--- a/doc/developer-reference/How-to-test.md
+++ b/doc/developer-reference/How-to-test.md
@ -0,0 +1,27 @@
+# How to Test
+
+This wiki page describes how to build and run tests on Linux. It should eventually provide guidance on how to add tests for a new feature.
+
+## Build Tests
+
+Can be built when you are building Orca Slicer binary by including the `-t` flag for `build_linux.sh`:
+
+```
+build_linux.sh -st
+```
+
+Test binaries will then appear under `build/tests`. As of this writing, not all tests will be built.
+
+## Run Unit Tests
+
+### Run All
+
+```
+ctest --test-dir build/tests
+```
+
+### Run a Specific Set
+
+```
+ctest --test-dir build/tests/slic3rutils
+```
--- a/doc/print_settings/quality/quality_settings_ironing.md
+++ b/doc/print_settings/quality/quality_settings_ironing.md
@ -52,7 +52,17 @@ If this value is set to 0, the ironing toolpath will start directly at the perim

 ## Angle Offset

-The angle of ironing lines offset relative to the top surface solid infill direction. Commonly used ironing angle offsets are 0°, 45°, and 90° each producing a [different surface finish](https://github.com/SoftFever/OrcaSlicer/issues/10834#issuecomment-3322628589) which will depend on your printer nozzle.
+The angle of ironing lines offset relative to the top surface solid infill direction. 
+
+Commonly used ironing angle offsets are 0°, 45°, and 90° each producing a [different surface finish](https://github.com/SoftFever/OrcaSlicer/issues/10834#issuecomment-3322628589) which will depend on your printer nozzle.
+
+## Fixed Angle
+
+Use a fixed absolute angle for ironing that is not offset from the top surface infill direction. This results in an ironing finish that does not have alternating line directions and may result in a more uniform surface finish and reduced tiger striping effect when reflecting light.
+
+Set the Ironing Angle Offset to an angle with optimal ironing angle offsets from all affected top surface solid infill directions.
+
+Suggested fixed ironing angles are 0° and 90° if you are using the default solid infill direction of 45°.

 ## Speed

--- a/localization/i18n/OrcaSlicer.pot
+++ b/localization/i18n/OrcaSlicer.pot
--- a/localization/i18n/ca/OrcaSlicer_ca.po
+++ b/localization/i18n/ca/OrcaSlicer_ca.po
--- a/localization/i18n/cs/OrcaSlicer_cs.po
+++ b/localization/i18n/cs/OrcaSlicer_cs.po
--- a/localization/i18n/de/OrcaSlicer_de.po
+++ b/localization/i18n/de/OrcaSlicer_de.po
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
--- a/localization/i18n/es/OrcaSlicer_es.po
+++ b/localization/i18n/es/OrcaSlicer_es.po
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orca Slicer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-26 10:38+0800\n"
+"POT-Creation-Date: 2025-11-05 17:33+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Guislain Cyril, Thomas Lété\n"
@ -1138,7 +1138,7 @@ msgstr "Distance entre le centre du texte et la surface du modèle."
 msgid "Undo rotation"
 msgstr "Annuler la rotation"

-msgid "Rotate text Clock-wise."
+msgid "Rotate text Clockwise."
 msgstr "Rotation du texte dans le sens des aiguilles d’une montre."

 msgid "Unlock the text's rotation when moving text along the object's surface."
@ -2058,9 +2058,15 @@ msgstr "Recharger les pièces sélectionnées à partir du disque"
 msgid "Replace with STL"
 msgstr "Remplacer par le STL"

-msgid "Replace the selected part with new STL"
+msgid "Replace the selected part with new STL."
 msgstr "Remplacer la pièce sélectionnée par un nouveau STL"

+msgid "Replace all with STL"
+msgstr ""
+
+msgid "Replace all selected parts with STL from folder."
+msgstr ""
+
 msgid "Change filament"
 msgstr "Changer de filament"

@ -2244,6 +2250,30 @@ msgstr "Supprimer le plateau"
 msgid "Remove the selected plate"
 msgstr "Supprimer la plaque sélectionnée"

+msgid "Add instance"
+msgstr ""
+
+msgid "Add one more instance of the selected object"
+msgstr ""
+
+msgid "Remove instance"
+msgstr ""
+
+msgid "Remove one instance of the selected object"
+msgstr ""
+
+msgid "Set number of instances"
+msgstr ""
+
+msgid "Change the number of instances of the selected object"
+msgstr ""
+
+msgid "Fill bed with instances"
+msgstr ""
+
+msgid "Fill the remaining area of bed with instances of the selected object"
+msgstr ""
+
 msgid "Clone"
 msgstr "Cloner"

@ -2735,7 +2765,7 @@ msgstr ""

 msgid ""
 "Enabling filtration during printing may reduce cooling and affect print "
-"qulity. Please choose carefully"
+"quality. Please choose carefully."
 msgstr ""

 msgid ""
@ -2769,9 +2799,9 @@ msgid "Top"
 msgstr "Haut"

 msgid ""
-"The fan controls the temperature during printing to improve print "
-"quality.The system automatically adjusts the fan's switch and speed "
-"according to different printing materials."
+"The fan controls the temperature during printing to improve print quality."
+"The system automatically adjusts the fan's switch and speed according to "
+"different printing materials."
 msgstr ""

 msgid ""
@ -3042,7 +3072,25 @@ msgstr "Envoyée avec succès. Bascule automatique sur la page suivante dans %ss
 msgid "Access code:%s IP address:%s"
 msgstr ""

-msgid "Storage needs to be inserted before printing via LAN."
+msgid "A Storage needs to be inserted before printing via LAN."
+msgstr ""
+
+msgid ""
+"Sending print job over LAN, but the Storage in the printer is abnormal and "
+"print-issues may be caused by this."
+msgstr ""
+
+msgid ""
+"The Storage in the printer is abnormal. Please replace it with a normal "
+"Storage before sending print job to printer."
+msgstr ""
+
+msgid ""
+"The Storage in the printer is read-only. Please replace it with a normal "
+"Storage before sending print job to printer."
+msgstr ""
+
+msgid "Encountered an unknown error with the Storage status. Please try again."
 msgstr ""

 msgid "Sending G-code file over LAN"
@ -3058,6 +3106,21 @@ msgstr "Envoyé avec succès. Fermeture de la page actuelle dans %ss"
 msgid "Storage needs to be inserted before sending to printer."
 msgstr ""

+msgid ""
+"Sending G-code file over LAN, but the Storage in the printer is abnormal and "
+"print-issues may be caused by this."
+msgstr ""
+
+msgid ""
+"The Storage in the printer is abnormal. Please replace it with a normal "
+"Storage before sending to printer."
+msgstr ""
+
+msgid ""
+"The Storage in the printer is read-only. Please replace it with a normal "
+"Storage before sending to printer."
+msgstr ""
+
 msgid "Importing SLA archive"
 msgstr "Importation d'une archive SLA"

@ -3751,7 +3814,7 @@ msgid "Circular"
 msgstr "Circulaire"

 msgid "Load shape from STL..."
-msgstr "Charger une forme depuis un STL…"
+msgstr "Charger une forme depuis un STL …"

 msgid "Settings"
 msgstr "Réglages"
@ -3957,6 +4020,7 @@ msgstr ""
 "seam_slope_start_height doit être inférieur à la hauteur de couche.\n"
 "Remise à 0."

+#, c-format, boost-format
 msgid ""
 "Lock depth should smaller than skin depth.\n"
 "Reset to 50% of skin depth."
@ -4103,10 +4167,10 @@ msgstr ""
 msgid "Pause (nozzle clog)"
 msgstr ""

-msgid "Measuring motion percision"
+msgid "Measuring motion precision"
 msgstr ""

-msgid "Enhancing motion percision"
+msgid "Enhancing motion precision"
 msgstr ""

 msgid "Measure motion accuracy"
@ -4115,7 +4179,7 @@ msgstr ""
 msgid "Nozzle offset calibration"
 msgstr ""

-msgid "high temperature auto bed levelling"
+msgid "high temperature auto bed leveling"
 msgstr ""

 msgid "Auto Check: Quick Release Lever"
@ -4313,9 +4377,6 @@ msgstr ""
 msgid "Stop Drying"
 msgstr ""

-msgid "Cancle"
-msgstr ""
-
 msgid "Done"
 msgstr "Terminé"

@ -4906,6 +4967,9 @@ msgstr "Retour d'assemblage"
 msgid "Return"
 msgstr "Retour"

+msgid "Toggle Axis"
+msgstr ""
+
 msgid "Paint Toolbar"
 msgstr "Barre d'outils de peinture"

@ -4933,13 +4997,13 @@ msgstr "Le volume:"
 msgid "Size:"
 msgstr "Taille:"

-#, boost-format
+#, c-format, boost-format
 msgid ""
-"Conflicts of G-code paths have been found at layer %d, z = %.2lf mm. Please "
+"Conflicts of G-code paths have been found at layer %d, Z = %.2lfmm. Please "
 "separate the conflicted objects farther (%s <-> %s)."
 msgstr ""
 "Des conflits de chemins G-code ont été trouvés au niveau de la couche %d, z "
-"= %.2lf mm. Veuillez séparer davantage les objets en conflit (%s <-> %s)."
+"= %.2lfmm. Veuillez séparer davantage les objets en conflit (%s <-> %s)."

 msgid "An object is laid over the plate boundaries."
 msgstr "Un objet est posé sur la limite du plateau."
@ -4961,7 +5025,7 @@ msgstr ""

 #, c-format, boost-format
 msgid ""
-"Filaments %s is placed in the %s, but the generated G-code path exceeds the "
+"Filaments %s are placed in the %s, but the generated G-code path exceeds the "
 "printable range of the %s."
 msgstr ""

@ -4973,7 +5037,7 @@ msgstr ""

 #, c-format, boost-format
 msgid ""
-"Filaments %s is placed in the %s, but the generated G-code path exceeds the "
+"Filaments %s are placed in the %s, but the generated G-code path exceeds the "
 "printable height of the %s."
 msgstr ""

@ -5458,15 +5522,12 @@ msgstr "Test de rétraction"
 msgid "Max flowrate"
 msgstr "Débit maximal"

-msgid "Junction Deviation"
-msgstr ""
-
-msgid "Junction Deviation calibration"
-msgstr ""
-
 msgid "Cornering"
 msgstr ""

+msgid "Cornering calibration"
+msgstr ""
+
 msgid "Input Shaping Frequency"
 msgstr ""

@ -6009,7 +6070,7 @@ msgstr "Le nom ne doit pas commencer par un espace."
 msgid "The name is not allowed to end with space character."
 msgstr "Le nom ne doit pas se terminer par un espace."

-msgid "The name is not allowed to exceeds 32 characters."
+msgid "The name is not allowed to exceed 32 characters."
 msgstr ""

 msgid "Bind with Pin Code"
@ -6112,7 +6173,7 @@ msgstr "L'imprimante est occupée par un autre travail d'impression"
 msgid "Current extruder is busy changing filament"
 msgstr ""

-msgid "Current slot has alread been loaded"
+msgid "Current slot has already been loaded"
 msgstr ""

 msgid "The selected slot is empty."
@ -6136,10 +6197,6 @@ msgstr "Couche : %s"
 msgid "Layer: %d/%d"
 msgstr "Couche : %d/%d"

-#, c-format, boost-format
-msgid "(%d)"
-msgstr ""
-
 msgid ""
 "Please heat the nozzle to above 170°C before loading or unloading filament."
 msgstr ""
@ -6712,6 +6769,9 @@ msgstr "Déverrouiller le plateau actuel"
 msgid "Lock current plate"
 msgstr "Verrouiller le plateau actuel"

+msgid "Filament grouping"
+msgstr ""
+
 msgid "Edit current plate name"
 msgstr "Modifier le nom du plateau actuel"

@ -6872,7 +6932,7 @@ msgid "Sync filaments with AMS"
 msgstr "Synchroniser les filaments avec AMS"

 msgid ""
-"There are some unknown or uncompatible filaments mapped to generic preset.\n"
+"There are some unknown or incompatible filaments mapped to generic preset.\n"
 "Please update Orca Slicer or restart Orca Slicer to check if there is an "
 "update to system presets."
 msgstr ""
@ -6968,10 +7028,10 @@ msgstr ""

 #, c-format, boost-format
 msgid ""
-"The 3mf's version %s is newer than %s's version %s, found following "
+"The 3MF file version %s is newer than %s's version %s, found the following "
 "unrecognized keys:"
 msgstr ""
-"La version %s du 3mf est plus récente que la version %s de %s. Les clés "
+"La version %s du 3MF est plus récente que la version %s de %s. Les clés "
 "suivantes ne sont pas reconnues:"

 msgid "You'd better upgrade your software.\n"
@ -6979,10 +7039,10 @@ msgstr "Vous feriez mieux de mettre à jour votre logiciel.\n"

 #, c-format, boost-format
 msgid ""
-"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
-"software."
+"The 3MF file version %s is newer than %s's version %s, we suggest to "
+"upgrade your software."
 msgstr ""
-"La version %s du 3mf est plus récente que la version %s de %s. Nous vous "
+"La version %s du 3MF est plus récente que la version %s de %s. Nous vous "
 "suggérons de mettre à jour votre logiciel."

 msgid "The 3mf is generated by old OrcaSlicer, load geometry data only."
@ -7158,6 +7218,34 @@ msgstr "Sélectionnez un nouveau fichier"
 msgid "File for the replace wasn't selected"
 msgstr "Le fichier de remplacement n'a pas été sélectionné"

+msgid "Select folder to replace from"
+msgstr ""
+
+msgid "Directory for the replace wasn't selected"
+msgstr ""
+
+msgid "Replaced with STLs from directory:\n"
+msgstr ""
+
+#, boost-format
+msgid "✖ Skipped %1%: same file.\n"
+msgstr ""
+
+#, boost-format
+msgid "✖ Skipped %1%: file does not exist.\n"
+msgstr ""
+
+#, boost-format
+msgid "✖ Skipped %1%: failed to replace.\n"
+msgstr ""
+
+#, boost-format
+msgid "✔ Replaced %1%.\n"
+msgstr ""
+
+msgid "Replaced volumes"
+msgstr ""
+
 msgid "Please select a file"
 msgstr "Veuillez sélectionner un fichier"

@ -7970,6 +8058,14 @@ msgid ""
 "difference together."
 msgstr ""

+msgid "Allow Abnormal Storage"
+msgstr ""
+
+msgid ""
+"This allows the use of Storage that is marked as abnormal by the Printer.\n"
+"Use at your own risk, can cause issues!"
+msgstr ""
+
 msgid "Log Level"
 msgstr "Niveau de journalisation"

@ -8195,8 +8291,8 @@ msgstr ""
 msgid "Publish"
 msgstr "Publier"

-msgid "Publish was cancelled"
-msgstr ""
+msgid "Publish was canceled"
+msgstr "La publication a été annulée"

 msgid "Slicing Plate 1"
 msgstr "Découper Plaque 1"
@ -8551,7 +8647,10 @@ msgid ""
 "information."
 msgstr ""

-msgid "Storage is not available or is in read-only mode."
+msgid "Storage needs to be inserted before printing via LAN."
+msgstr ""
+
+msgid "Storage is in abnormal state or is in read-only mode."
 msgstr ""

 msgid "Storage needs to be inserted before printing."
@ -8867,12 +8966,18 @@ msgid ""
 "Are you sure to use them for support base? \n"
 msgstr ""

+#, fuzzy
 msgid ""
 "When using support material for the support interface, we recommend the "
 "following settings:\n"
 "0 top Z distance, 0 interface spacing, interlaced rectilinear pattern and "
-"disable independent support layer height"
+"disable independent support layer height."
 msgstr ""
+"Lorsque vous utilisez du matériel de support pour l'interface de support, "
+"nous vous recommandons d'utiliser les paramètres suivants :\n"
+"Distance Z supérieure nulle, espacement d'interface nul, motif "
+"concentrique et désactivation de la hauteur indépendante de la couche de "
+"support."

 msgid ""
 "Change these settings automatically?\n"
@ -8884,11 +8989,11 @@ msgstr ""
 "Non - Ne modifiez pas ces paramètres pour moi"

 msgid ""
-"When using soluble material for the support interface, We recommend the "
+"When using soluble material for the support interface, we recommend the "
 "following settings:\n"
-"0 top z distance, 0 interface spacing, interlaced rectilinear pattern, "
-"disable independent support layer height \n"
-"and use soluble materials for both support interface and support base"
+"0 top Z distance, 0 interface spacing, interlaced rectilinear pattern, "
+"disable independent support layer height\n"
+"and use soluble materials for both support interface and support base."
 msgstr ""

 msgid ""
@ -8971,8 +9076,8 @@ msgstr ""
 msgid ""
 "When recording timelapse without toolhead, it is recommended to add a "
 "\"Timelapse Wipe Tower\" \n"
-"by right-click the empty position of build plate and choose \"Add "
-"Primitive\"->\"Timelapse Wipe Tower\"."
+"by right-click the empty position of build plate and choose \"Add Primitive"
+"\"->\"Timelapse Wipe Tower\"."
 msgstr ""
 "Lorsque vous enregistrez un timelapse sans tête d’outil, il est recommandé "
 "d’ajouter une \"Tour d’essuyage timelapse\".\n"
@ -9462,10 +9567,6 @@ msgstr "Tour d’essuyage"
 msgid "Single extruder multi-material parameters"
 msgstr "Paramètres multi-matériaux pour extrudeur unique"

-#, c-format, boost-format
-msgid "Extruder %d"
-msgstr ""
-
 msgid ""
 "This is a single extruder multi-material printer, diameters of all extruders "
 "will be set to the new value. Do you want to proceed?"
@ -9853,9 +9954,6 @@ msgid ""
 " to continue or manually adjust it."
 msgstr ""

-msgid "—> "
-msgstr ""
-
 msgid ""
 "Synchronizing AMS filaments will discard your modified but unsaved filament "
 "presets.\n"
@ -9970,6 +10068,9 @@ msgid ""
 "nozzle type."
 msgstr ""

+msgid "Storage is not available or is in read-only mode."
+msgstr ""
+
 #, c-format, boost-format
 msgid ""
 "The selected printer (%s) is incompatible with the chosen printer profile in "
@ -12704,11 +12805,9 @@ msgid ""
 "option in most cases.\n"
 "\n"
 "Use Outer/Inner for the same external wall quality and dimensional accuracy "
-"benefits of Inner/Outer/Inner option. However, the z seams will appear less "
+"benefits of Inner/Outer/Inner option. However, the Z seams will appear less "
 "consistent as the first extrusion of a new layer starts on a visible "
-"surface.\n"
-"\n"
-" "
+"surface."
 msgstr ""
 "Séquence d'impression des parois internes (intérieures) et externes "
 "(extérieures).\n"
@ -12734,9 +12833,7 @@ msgstr ""
 "paroi externe et de la même précision dimensionnelle que l’option Intérieur/"
 "extérieur/intérieur. Cependant, les joints en z paraîtront moins cohérents "
 "car la première extrusion d’une nouvelle couche commence sur une surface "
-"visible.\n"
-"\n"
-" "
+"visible."

 msgid "Inner/Outer"
 msgstr "Intérieur/Extérieur"
@ -13327,14 +13424,14 @@ msgstr "Rétrécissement (XY)"
 #, no-c-format, no-boost-format
 msgid ""
 "Enter the shrinkage percentage that the filament will get after cooling (94% "
-"if you measure 94mm instead of 100mm). The part will be scaled in xy to "
+"if you measure 94mm instead of 100mm). The part will be scaled in XY to "
 "compensate. Only the filament used for the perimeter is taken into account.\n"
 "Be sure to allow enough space between objects, as this compensation is done "
 "after the checks."
 msgstr ""
 "Entrez le pourcentage de rétrécissement que le filament obtiendra après "
 "refroidissement (94% si vous mesurez 94mm au lieu de 100mm). La pièce sera "
-"mise à l’échelle en xy pour compenser. Seul le filament utilisé pour le "
+"mise à l’échelle en XY pour compenser. Seul le filament utilisé pour le "
 "périmètre est pris en compte.\n"
 "Veillez à laisser suffisamment d’espace entre les objets, car cette "
 "compensation est effectuée après les contrôles."
@ -13816,8 +13913,8 @@ msgid "mm/s² or %"
 msgstr "mm/s² ou %"

 msgid ""
-"Acceleration of sparse infill. If the value is expressed as a percentage "
-"(e.g. 100%), it will be calculated based on the default acceleration."
+"Acceleration of sparse infill. If the value is expressed as a percentage (e."
+"g. 100%), it will be calculated based on the default acceleration."
 msgstr ""
 "Accélération du remplissage interne. Si la valeur est exprimée en "
 "pourcentage (par exemple 100%), elle sera calculée en fonction de "
@ -13857,6 +13954,9 @@ msgstr ""
 msgid "Default jerk."
 msgstr ""

+msgid "Junction Deviation"
+msgstr ""
+
 msgid ""
 "Marlin Firmware Junction Deviation (replaces the traditional XY Jerk "
 "setting)."
@ -13936,10 +14036,10 @@ msgstr "Ventilateur à pleine vitesse à la couche"

 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
-"\"close_fan_the_first_x_layers\" to maximum at layer "
-"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
-"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
-"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
+"\". \"full_fan_speed_layer\" will be ignored if lower than "
+"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
+"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""
 "La vitesse du ventilateur augmentera de manière linéaire à partir de zéro à "
 "la couche \"close_fan_the_first_x_layers\" jusqu’au maximum à la couche "
@ -14172,7 +14272,7 @@ msgid "Precise Z height"
 msgstr "Hauteur précise du Z"

 msgid ""
-"Enable this to get precise z height of object after slicing. It will get the "
+"Enable this to get precise Z height of object after slicing. It will get the "
 "precise object height by fine-tuning the layer heights of the last few "
 "layers. Note that this is an experimental parameter."
 msgstr ""
@ -14784,6 +14884,12 @@ msgstr ""
 msgid "The angle of ironing lines offset from the top surface."
 msgstr ""

+msgid "Fixed ironing angle"
+msgstr ""
+
+msgid "Use a fixed absolute angle for ironing."
+msgstr ""
+
 msgid "This G-code is inserted at every layer change after the Z lift."
 msgstr ""
 "Cette partie G-code est insérée à chaque changement de couche après le "
@ -14920,7 +15026,9 @@ msgid "Maximum Junction Deviation"
 msgstr ""

 msgid ""
-"Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware)"
+"Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin "
+"Firmware\n"
+"If your Marlin 2 printer uses Classic Jerk set this value to 0.)"
 msgstr ""

 msgid "Minimum speed for extruding"
@ -15799,8 +15907,8 @@ msgid "Role base wipe speed"
 msgstr "Vitesse d’essuyage basée sur la vitesse d’extrusion"

 msgid ""
-"The wipe speed is determined by the speed of the current extrusion role. "
-"e.g. if a wipe action is executed immediately following an outer wall "
+"The wipe speed is determined by the speed of the current extrusion role. e."
+"g. if a wipe action is executed immediately following an outer wall "
 "extrusion, the speed of the outer wall extrusion will be utilized for the "
 "wipe action."
 msgstr ""
@ -16007,7 +16115,7 @@ msgstr ""
 "inférieure"

 msgid ""
-"Spiralize smooths out the z moves of the outer contour. And turns a solid "
+"Spiralize smooths out the Z moves of the outer contour. And turns a solid "
 "model into a single walled print with solid bottom layers. The final "
 "generated model has no seam."
 msgstr ""
@ -16214,8 +16322,8 @@ msgid ""
 "Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to "
 "close all holes in the model."
 msgstr ""
-"Utilisez « Pair-impair » pour les modèles d'avion 3DLabPrint. Utilisez "
-"« Fermer les trous » pour fermer tous les trous du modèle."
+"Utilisez « Pair-impair » pour les modèles d'avion 3DLabPrint. Utilisez « "
+"Fermer les trous » pour fermer tous les trous du modèle."

 msgid "Regular"
 msgstr "Standard"
@ -16267,7 +16375,7 @@ msgstr "Normal (manuel)"
 msgid "Tree (manual)"
 msgstr "Arbre (manuel)"

-msgid "Support/object xy distance"
+msgid "Support/object XY distance"
 msgstr "Distance support/objet xy"

 msgid "XY separation between an object and its support."
@ -16486,7 +16594,7 @@ msgstr "Hauteur de la couche de support indépendante"

 msgid ""
 "Support layer uses layer height independent with object layer. This is to "
-"support customizing z-gap and save print time. This option will be invalid "
+"support customizing Z-gap and save print time. This option will be invalid "
 "when the prime tower is enabled."
 msgstr ""
 "La couche de support utilise la hauteur de la couche indépendamment de la "
@ -16569,16 +16677,6 @@ msgstr ""
 "d’activer les interfaces de support supérieures au lieu d’une valeur de "
 "densité de branches élevée si des interfaces denses sont nécessaires."

-msgid "Adaptive layer height"
-msgstr "Hauteur de couche adaptative"
-
-msgid ""
-"Enabling this option means the height of tree support layer except the first "
-"will be automatically calculated."
-msgstr ""
-"L’activation de cette option signifie que la hauteur de couche des supports "
-"arborescents, à l’exception de la première, sera automatiquement calculée "
-
 msgid "Auto brim width"
 msgstr "Largeur de la bordure automatique"

@ -16676,8 +16774,8 @@ msgstr "Activer le contrôle de la température"

 msgid ""
 "Enable this option for automated chamber temperature control. This option "
-"activates the emitting of an M191 command before the "
-"\"machine_start_gcode\"\n"
+"activates the emitting of an M191 command before the \"machine_start_gcode"
+"\"\n"
 " which sets the chamber temperature and waits until it is reached. In "
 "addition, it emits an M141 command at the end of the print to turn off the "
 "chamber heater, if present.\n"
@ -17200,8 +17298,8 @@ msgid ""
 "Wipe tower is only compatible with relative mode. It is recommended on most "
 "printers. Default is checked."
 msgstr ""
-"L’extrusion relative est recommandée lors de l’utilisation de l’option "
-"« label_objects ». Certains extrudeurs fonctionnent mieux avec cette option "
+"L’extrusion relative est recommandée lors de l’utilisation de l’option « "
+"label_objects ». Certains extrudeurs fonctionnent mieux avec cette option "
 "non verrouillée (mode d’extrusion absolu). La tour d’essuyage n’est "
 "compatible qu’avec le mode relatif. Il est recommandé sur la plupart des "
 "imprimantes. L’option par défaut est cochée"
@ -17632,11 +17730,11 @@ msgid "Debug level"
 msgstr "Niveau de débogage"

 msgid ""
-"Sets debug logging level. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, "
-"5:trace\n"
+"Sets debug logging level. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:"
+"trace\n"
 msgstr ""
-"Définit le niveau de journalisation du débogage. 0 :fatal, 1 :erreur, "
-"2 :avertissement, 3 :info, 4 :débogage, 5 :trace\n"
+"Définit le niveau de journalisation du débogage. 0 :fatal, 1 :erreur, 2 :"
+"avertissement, 3 :info, 4 :débogage, 5 :trace\n"

 msgid "Enable timelapse for print"
 msgstr "Activer le timelapse pour l’impression"
@ -17892,12 +17990,12 @@ msgid ""
 "Contains a string with the information about what scaling was applied to the "
 "individual objects. Indexing of the objects is zero-based (first object has "
 "index 0).\n"
-"Example: 'x:100% y:50% z:100'."
+"Example: 'x:100% y:50% z:100%'."
 msgstr ""
 "Contient une chaîne de caractères contenant des informations sur la mise à "
 "l’échelle appliquée aux différents objets. L’indexation des objets est basée "
 "sur le zéro (le premier objet a l’index 0).\n"
-"Exemple : « x:100% y:50% z:100 »."
+"Exemple : « x:100% y:50% z:100% »."

 msgid "Input filename without extension"
 msgstr "Nom du fichier d’entrée sans extension"
@ -17906,12 +18004,12 @@ msgid "Source filename of the first object, without extension."
 msgstr "Nom du fichier source du premier objet, sans extension."

 msgid ""
-"The vector has two elements: x and y coordinate of the point. Values in mm."
+"The vector has two elements: X and Y coordinate of the point. Values in mm."
 msgstr ""
 "Le vecteur a deux éléments : les coordonnées x et y du point. Valeurs en mm."

 msgid ""
-"The vector has two elements: x and y dimension of the bounding box. Values "
+"The vector has two elements: X and Y dimension of the bounding box. Values "
 "in mm."
 msgstr ""
 "Le vecteur a deux éléments : les dimensions x et y de la boîte de "
@ -18119,13 +18217,13 @@ msgstr "Le fichier fourni n'a pas pu être lu car il est vide"
 msgid ""
 "Unknown file format. Input file must have .stl, .obj, .amf(.xml) extension."
 msgstr ""
-"Format de fichier inconnu : le fichier d'entrée doit porter "
-"l'extension .stl, .obj ou .amf (.xml)."
+"Format de fichier inconnu : le fichier d'entrée doit porter l'extension ."
+"stl, .obj ou .amf (.xml)."

 msgid "Unknown file format. Input file must have .3mf or .zip.amf extension."
 msgstr ""
-"Format de fichier inconnu : le fichier d'entrée doit porter l'extension "
-".3mf, .zip ou .amf."
+"Format de fichier inconnu : le fichier d'entrée doit porter "
+"l'extension .3mf, .zip ou .amf."

 msgid "load_obj: failed to parse"
 msgstr "load_obj : échec de l'analyse"
@ -18825,6 +18923,12 @@ msgstr "Liste d’accélérations d’impression séparées par des virgules"
 msgid "Comma-separated list of printing speeds"
 msgstr "Liste de vitesses d’impression séparées par des virgules"

+msgid "Pressure Advance Guide"
+msgstr ""
+
+msgid "Adaptive Pressure Advance Guide"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "Start PA: >= 0.0\n"
@ -18872,6 +18976,9 @@ msgstr "Temp. de fin: "
 msgid "Temp step: "
 msgstr "Intervalle de temp. : "

+msgid "Wiki Guide: Temperature Calibration"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "Start temp: <= 350\n"
@ -18888,6 +18995,9 @@ msgstr "Vitesse volumétrique de début: "
 msgid "End volumetric speed: "
 msgstr "Vitesse volumétrique de fin: "

+msgid "Wiki Guide: Volumetric Speed Calibration"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "start > 0\n"
@ -18908,6 +19018,9 @@ msgstr "Vitesse de début: "
 msgid "End speed: "
 msgstr "Vitesse de fin: "

+msgid "Wiki Guide: VFA"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "start > 10\n"
@ -18925,6 +19038,9 @@ msgstr "Longueur de rétraction de début: "
 msgid "End retraction length: "
 msgstr "Longueur de rétraction de fin: "

+msgid "Wiki Guide: Retraction Calibration"
+msgstr ""
+
 msgid "Input shaping Frequency test"
 msgstr ""

@ -18960,6 +19076,9 @@ msgid ""
 "This will use the printer's default or saved value."
 msgstr ""

+msgid "Wiki Guide: Input Shaping Calibration"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "(0 < FreqStart < FreqEnd < 500)"
@ -18995,27 +19114,52 @@ msgid ""
 "Please input a valid damping factor (0 <= DampingStart < DampingEnd <= 1)"
 msgstr ""

-msgid "Junction Deviation test"
+msgid "Cornering test"
 msgstr ""

-msgid "Start junction deviation: "
+msgid "SCV-V2"
 msgstr ""

-msgid "End junction deviation: "
+msgid "Start: "
 msgstr ""

-msgid "Junction Deviation settings"
+msgid "End: "
 msgstr ""

-msgid "Note: Lower values = sharper corners but slower speeds"
+msgid "Cornering settings"
+msgstr ""
+
+msgid "Note: Lower values = sharper corners but slower speeds.\n"
 msgstr ""

 msgid ""
-"Please input valid values:\n"
-"(0 <= Junction Deviation < 1)"
+"Marlin 2 Junction Deviation detected:\n"
+"To test Classic Jerk, set 'Maximum Junction Deviation' in Motion ability to "
+"0."
 msgstr ""

-msgid "NOTE: High values may cause Layer shift"
+msgid ""
+"Marlin 2 Classic Jerk detected:\n"
+"To test Junction Deviation, set 'Maximum Junction Deviation' in Motion "
+"ability to a value > 0."
+msgstr ""
+
+msgid ""
+"RepRap detected: Jerk in mm/s.\n"
+"OrcaSlicer will convert the values to mm/min when necessary."
+msgstr ""
+
+msgid "Wiki Guide: Cornering Calibration"
+msgstr ""
+
+#, c-format, boost-format
+msgid ""
+"Please input valid values:\n"
+"(0 <= Cornering <= %s)"
+msgstr ""
+
+#, c-format, boost-format
+msgid "NOTE: High values may cause Layer shift (>%s)"
 msgstr ""

 msgid "Send G-code to printer host"
@ -19293,8 +19437,8 @@ msgstr ""
 "Voulez-vous le réécrire ?"

 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you "
-"selected\".\n"
+"We would rename the presets as \"Vendor Type Serial @printer you selected"
+"\".\n"
 "To add preset for more printers, please go to printer selection"
 msgstr ""
 "Nous renommerions les préréglages en « Vendor Type Serial @printer you "
@ -19744,8 +19888,8 @@ msgid "nozzle size memorized: %d"
 msgstr ""

 msgid ""
-"The size of nozzle type in preset is not consistent with memorized "
-"nozzle.Did you change your nozzle lately ? "
+"The size of nozzle type in preset is not consistent with memorized nozzle."
+"Did you change your nozzle lately ? "
 msgstr ""

 #, c-format, boost-format
@ -20394,8 +20538,8 @@ msgstr "Nom de l’appareil"
 msgid "Device Status"
 msgstr "État de l’appareil"

-msgid "Ams Status"
-msgstr ""
+msgid "AMS Status"
+msgstr "Statut de l’AMS"

 msgid ""
 "Please select the devices you would like to manage here (up to 6 devices)"
@ -20516,9 +20660,6 @@ msgstr "Échec de l’impression"
 msgid "Removed"
 msgstr "Supprimé"

-msgid "Filament grouping"
-msgstr ""
-
 msgid "Don't remind me again"
 msgstr ""

@ -20560,7 +20701,7 @@ msgstr ""
 msgid "We will slice according to this grouping method:"
 msgstr ""

-msgid "Tips: You can drag the filaments to reassign them to different nozzles."
+msgid "Tip: You can drag the filaments to reassign them to different nozzles."
 msgstr ""

 msgid ""
@ -20610,8 +20751,8 @@ msgstr ""
 "Un événement inattendu s’est produit lors de la connexion, veuillez "
 "réessayer."

-msgid "User cancelled."
-msgstr ""
+msgid "User canceled."
+msgstr "L’utilisateur a annulé."

 msgid "Head diameter"
 msgstr "Diamètre de la tête"
@ -20665,9 +20806,6 @@ msgstr ""
 msgid "Zoom Out"
 msgstr ""

-msgid "100 %"
-msgstr ""
-
 msgid "Zoom In"
 msgstr ""

@ -20677,14 +20815,6 @@ msgstr ""
 msgid "Loading ..."
 msgstr ""

-#, c-format, boost-format
-msgid "%d%%"
-msgstr ""
-
-#, c-format, boost-format
-msgid "%d"
-msgstr ""
-
 #, c-format, boost-format
 msgid "/%d Selected"
 msgstr ""
@ -21129,6 +21259,17 @@ msgstr ""
 "déformer, tels que l’ABS, une augmentation appropriée de la température du "
 "plateau chauffant peut réduire la probabilité de déformation?"

+#~ msgid "Adaptive layer height"
+#~ msgstr "Hauteur de couche adaptative"
+
+#~ msgid ""
+#~ "Enabling this option means the height of tree support layer except the "
+#~ "first will be automatically calculated."
+#~ msgstr ""
+#~ "L’activation de cette option signifie que la hauteur de couche des "
+#~ "supports arborescents, à l’exception de la première, sera automatiquement "
+#~ "calculée "
+
 #~ msgid "AMS not connected"
 #~ msgstr "AMS non connecté"

@ -21191,9 +21332,6 @@ msgstr ""
 #~ "jour des infos du filament. Pendant l'impression, la capacité restante "
 #~ "sera automatiquement mise à jour."

-#~ msgid "AMS Status"
-#~ msgstr "Statut de l’AMS"
-
 #~ msgid ""
 #~ "The recommended minimum temperature is less than 190°C or the recommended "
 #~ "maximum temperature is greater than 300°C.\n"
@ -21886,9 +22024,6 @@ msgstr ""
 #~ msgid "Invalid number"
 #~ msgstr "Numéro invalide"

-#~ msgid "Publish was canceled"
-#~ msgstr "La publication a été annulée"
-
 #, c-format, boost-format
 #~ msgid "nozzle memorized: %.2f %s"
 #~ msgstr "buse mémorisée : %.2f %s"
@ -22176,9 +22311,6 @@ msgstr ""
 #~ msgid "Could not connect to Flashforge"
 #~ msgstr "Impossible de se connecter à Flashforge"

-#~ msgid "User canceled."
-#~ msgstr "L’utilisateur a annulé."
-
 #~ msgid "Set the brim type to \"painted\""
 #~ msgstr "Régler le type de bordure sur « peint »"

@ -22202,18 +22334,6 @@ msgstr ""
 #~ "moins 0,1 mm de distance entre le haut et le z ou l'utilisation de "
 #~ "matériaux de support sur l'interface."

-#~ msgid ""
-#~ "When using support material for the support interface, we recommend the "
-#~ "following settings:\n"
-#~ "0 top z distance, 0 interface spacing, concentric pattern and disable "
-#~ "independent support layer height"
-#~ msgstr ""
-#~ "Lorsque vous utilisez du matériel de support pour l'interface de support, "
-#~ "nous vous recommandons d'utiliser les paramètres suivants :\n"
-#~ "Distance Z supérieure nulle, espacement d'interface nul, motif "
-#~ "concentrique et désactivation de la hauteur indépendante de la couche de "
-#~ "support."
-
 #~ msgid "Branch Diameter with double walls"
 #~ msgstr "Diamètre des branches à double parois"

@ -22622,8 +22742,8 @@ msgstr ""
 #~ "modèle. Réglez le « seuil d’une paroi » dans les paramètres avancés ci-"
 #~ "dessous pour ajuster la sensibilité de ce qui est considéré comme une "
 #~ "surface supérieure. Le « seuil d’une paroi » n’est visible que si ce "
-#~ "paramètre est supérieur à la valeur par défaut de 0,5 ou si l’option "
-#~ "« surfaces supérieures à une paroi » est activée."
+#~ "paramètre est supérieur à la valeur par défaut de 0,5 ou si l’option « "
+#~ "surfaces supérieures à une paroi » est activée."

 #, c-format, boost-format
 #~ msgid ""
@ -23452,8 +23572,8 @@ msgstr ""
 #~ "thickness (top+bottom solid layers)"
 #~ msgstr ""
 #~ "Ajoutez du remplissage solide à proximité des surfaces inclinées pour "
-#~ "garantir l'épaisseur verticale de la coque (couches solides "
-#~ "supérieure+inférieure)."
+#~ "garantir l'épaisseur verticale de la coque (couches solides supérieure"
+#~ "+inférieure)."

 #~ msgid "Further reduce solid infill on walls (beta)"
 #~ msgstr "Réduire davantage le remplissage solide des parois (expérimental)"
--- a/localization/i18n/hu/OrcaSlicer_hu.po
+++ b/localization/i18n/hu/OrcaSlicer_hu.po
--- a/localization/i18n/it/OrcaSlicer_it.po
+++ b/localization/i18n/it/OrcaSlicer_it.po
--- a/localization/i18n/ja/OrcaSlicer_ja.po
+++ b/localization/i18n/ja/OrcaSlicer_ja.po
--- a/localization/i18n/ko/OrcaSlicer_ko.po
+++ b/localization/i18n/ko/OrcaSlicer_ko.po
--- a/localization/i18n/lt/OrcaSlicer_lt.po
+++ b/localization/i18n/lt/OrcaSlicer_lt.po
--- a/localization/i18n/nl/OrcaSlicer_nl.po
+++ b/localization/i18n/nl/OrcaSlicer_nl.po
--- a/localization/i18n/pl/OrcaSlicer_pl.po
+++ b/localization/i18n/pl/OrcaSlicer_pl.po
--- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
--- a/localization/i18n/ru/OrcaSlicer_ru.po
+++ b/localization/i18n/ru/OrcaSlicer_ru.po
--- a/localization/i18n/sv/OrcaSlicer_sv.po
+++ b/localization/i18n/sv/OrcaSlicer_sv.po
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
--- a/localization/i18n/uk/OrcaSlicer_uk.po
+++ b/localization/i18n/uk/OrcaSlicer_uk.po
--- a/localization/i18n/vi/OrcaSlicer_vi.po
+++ b/localization/i18n/vi/OrcaSlicer_vi.po
--- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
+++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
--- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
+++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
--- a/resources/i18n/vi/OrcaSlicer.mo
+++ b/resources/i18n/vi/OrcaSlicer.mo
--- a/resources/images/axis_toggle.svg
+++ b/resources/images/axis_toggle.svg
@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
+   id="svg4"
+   sodipodi:docname="axis_toggle.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="true"
+   inkscape:zoom="64.833333"
+   inkscape:cx="9"
+   inkscape:cy="8.6915168"
+   inkscape:window-width="2560"
+   inkscape:window-height="1369"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g15"><inkscape:grid
+     id="grid4"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="1"
+     spacingy="1"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     enabled="true"
+     visible="false" /><inkscape:grid
+     type="axonomgrid"
+     id="grid8"
+     units="pt"
+     originx="9"
+     originy="9"
+     spacingx="3.7795276"
+     spacingy="1.3333333"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="4"
+     dotted="false"
+     gridanglex="36"
+     gridanglez="36"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="modular"
+     id="grid9"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="151.1811"
+     spacingy="151.1811"
+     empcolor="#0047cb"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="0"
+     marginx="0"
+     marginy="0"
+     gapx="37.795276"
+     gapy="37.795276"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="axonomgrid"
+     id="grid10"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="3.7795276"
+     spacingy="3.7795276"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     dotted="false"
+     gridanglex="30"
+     gridanglez="30"
+     enabled="false"
+     visible="true" /></sodipodi:namedview><defs
+   id="defs4" />
+    <g
+   id="g15"
+   transform="matrix(0.129199,0,0,0.129199,22.9215,0.522556)">
+        <g
+   transform="matrix(8.25599,0,0,8.25599,-182.056,-21.0726)"
+   id="g1"
+   style="display:inline">
+            <circle
+   cx="9"
+   cy="10.5"
+   r="7.5"
+   style="display:inline;fill:#c4c4c4"
+   id="circle1" />
+        </g>
+        
+        
+        
+    <g
+   id="g19"
+   inkscape:label="grid"
+   style="display:inline;stroke:#8d8d8d;stroke-opacity:1;stroke-linecap:square"><path
+     id="path3"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -157.72198 101.92044 L -57.660489 29.22151 " /><path
+     id="path8"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16207 123.17697 L -45.951829 61.994656 " /><path
+     id="path10"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 62.090704 L -85.342701 123.17697 " /><path
+     id="path21"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 69.140098 L -85.210515 7.9577807 " /><path
+     id="path23"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16206 8.0538225 L -46.084024 69.140097 " /><path
+     id="path25"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -57.782786 101.92044 L -157.72198 29.310363 " /><circle
+     cx="9"
+     cy="10.5"
+     r="7.5"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;fill:none;stroke:#000000;stroke-opacity:1;stroke-width:0.28125025;stroke-dasharray:none;stroke-dashoffset:0"
+     id="circle2"
+     transform="matrix(8.2559904,0,0,8.2559904,-182.056,-21.0726)" /></g><path
+   style="display:inline;fill:#ff3c5b;fill-opacity:1;stroke:#ff3c5b;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -114.85451,70.775398 -31.59786,22.95719"
+   id="path6"
+   sodipodi:nodetypes="cc" /><path
+   style="display:inline;fill:#64c818;fill-opacity:1;stroke:#64c818;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -100.65025,70.775398 31.597858,22.95719"
+   id="path5"
+   sodipodi:nodetypes="cc" /><path
+   style="clip-rule:evenodd;display:inline;fill:#2f88e9;fill-opacity:1;fill-rule:evenodd;stroke:#2f88e9;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="M 8.9999995,8 V 3"
+   id="path4"
+   sodipodi:nodetypes="cc"
+   transform="matrix(7.739998,0,0,7.739998,-177.41236,-4.0445824)" /><path
+   style="display:none;fill:#e6e6e6;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -86.44599,50.135404 -21.30639,-15.479996 -21.30638,15.479996 21.30638,15.479996 z"
+   id="path11" /><path
+   style="display:none;fill:#b3b3b3;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -129.05876,50.135404 v 30.959992 l 21.30638,15.479996 V 65.6154 Z"
+   id="path12" /><path
+   style="display:none;fill:#999999;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="M -107.75238,96.575392 -86.44599,81.095396 V 50.135404 L -107.75238,65.6154 Z"
+   id="path13" /></g>
+</svg>
--- a/resources/images/axis_toggle_dark.svg
+++ b/resources/images/axis_toggle_dark.svg
@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
+   id="svg4"
+   sodipodi:docname="axis_toggle_dark_test.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="true"
+   inkscape:zoom="64.833333"
+   inkscape:cx="9"
+   inkscape:cy="8.6915168"
+   inkscape:window-width="2560"
+   inkscape:window-height="1369"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g19"><inkscape:grid
+     id="grid4"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="1"
+     spacingy="1"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     enabled="true"
+     visible="false" /><inkscape:grid
+     type="axonomgrid"
+     id="grid8"
+     units="pt"
+     originx="9"
+     originy="9"
+     spacingx="3.7795276"
+     spacingy="1.3333333"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="4"
+     dotted="false"
+     gridanglex="36"
+     gridanglez="36"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="modular"
+     id="grid9"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="151.1811"
+     spacingy="151.1811"
+     empcolor="#0047cb"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="0"
+     marginx="0"
+     marginy="0"
+     gapx="37.795276"
+     gapy="37.795276"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="axonomgrid"
+     id="grid10"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="3.7795276"
+     spacingy="3.7795276"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     dotted="false"
+     gridanglex="30"
+     gridanglez="30"
+     enabled="false"
+     visible="true" /></sodipodi:namedview><defs
+   id="defs4" />
+    <g
+   id="g15"
+   transform="matrix(0.129199,0,0,0.129199,22.9215,0.522556)">
+        <g
+   transform="matrix(8.25599,0,0,8.25599,-182.056,-21.0726)"
+   id="g1"
+   style="display:inline">
+            <circle
+   cx="9"
+   cy="10.5"
+   r="7.5"
+   style="display:inline;fill:#3b3b3b"
+   id="circle1" />
+        </g>
+        
+        
+        
+    <g
+   id="g19"
+   inkscape:label="grid"
+   style="display:inline;stroke:#8d8d8d;stroke-opacity:1;stroke-linecap:square"><path
+     id="path3"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -157.72198 101.92044 L -57.660489 29.22151 " /><path
+     id="path8"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16207 123.17697 L -45.951829 61.994656 " /><path
+     id="path10"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 62.090704 L -85.342701 123.17697 " /><path
+     id="path21"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 69.140098 L -85.210515 7.9577807 " /><path
+     id="path23"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16206 8.0538225 L -46.084024 69.140097 " /><path
+     id="path25"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -57.782786 101.92044 L -157.72198 29.310363 " /><circle
+     cx="9"
+     cy="10.5"
+     r="7.5"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;fill:none;stroke:#000000;stroke-opacity:1;stroke-width:0.28125025;stroke-dasharray:none;stroke-dashoffset:0"
+     id="circle2"
+     transform="matrix(8.2559904,0,0,8.2559904,-182.056,-21.0726)" /></g><path
+   style="display:inline;fill:#ff3c5b;fill-opacity:1;stroke:#ff3c5b;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -114.85451,70.775398 -31.59786,22.95719"
+   id="path6"
+   sodipodi:nodetypes="cc" /><path
+   style="display:inline;fill:#64c818;fill-opacity:1;stroke:#64c818;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -100.65025,70.775398 31.597858,22.95719"
+   id="path5"
+   sodipodi:nodetypes="cc" /><path
+   style="clip-rule:evenodd;display:inline;fill:#2f88e9;fill-opacity:1;fill-rule:evenodd;stroke:#2f88e9;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m 8.9999995,8 0,-5"
+   id="path4"
+   sodipodi:nodetypes="cc"
+   transform="matrix(7.739998,0,0,7.739998,-177.41236,-4.0445824)" /><path
+   style="display:none;fill:#e6e6e6;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -86.44599,50.135404 -21.30639,-15.479996 -21.30638,15.479996 21.30638,15.479996 z"
+   id="path11" /><path
+   style="display:none;fill:#b3b3b3;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -129.05876,50.135404 v 30.959992 l 21.30638,15.479996 V 65.6154 Z"
+   id="path12" /><path
+   style="display:none;fill:#999999;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="M -107.75238,96.575392 -86.44599,81.095396 V 50.135404 L -107.75238,65.6154 Z"
+   id="path13" /></g>
+</svg>
--- a/resources/images/axis_toggle_hover.svg
+++ b/resources/images/axis_toggle_hover.svg
@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
+   id="svg4"
+   sodipodi:docname="axis_toggle_hover.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="true"
+   inkscape:zoom="64.833333"
+   inkscape:cx="9"
+   inkscape:cy="8.6915168"
+   inkscape:window-width="2560"
+   inkscape:window-height="1369"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g15"><inkscape:grid
+     id="grid4"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="1"
+     spacingy="1"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     enabled="true"
+     visible="false" /><inkscape:grid
+     type="axonomgrid"
+     id="grid8"
+     units="pt"
+     originx="9"
+     originy="9"
+     spacingx="3.7795276"
+     spacingy="1.3333333"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="4"
+     dotted="false"
+     gridanglex="36"
+     gridanglez="36"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="modular"
+     id="grid9"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="151.1811"
+     spacingy="151.1811"
+     empcolor="#0047cb"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="0"
+     marginx="0"
+     marginy="0"
+     gapx="37.795276"
+     gapy="37.795276"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="axonomgrid"
+     id="grid10"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="3.7795276"
+     spacingy="3.7795276"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     dotted="false"
+     gridanglex="30"
+     gridanglez="30"
+     enabled="false"
+     visible="true" /></sodipodi:namedview><defs
+   id="defs4" />
+    <g
+   id="g15"
+   transform="matrix(0.129199,0,0,0.129199,22.9215,0.522556)">
+        <g
+   transform="matrix(8.25599,0,0,8.25599,-182.056,-21.0726)"
+   id="g1"
+   style="display:inline">
+            <circle
+   cx="9"
+   cy="10.5"
+   r="7.5"
+   style="display:inline;fill:#c4c4c4"
+   id="circle1" />
+        </g>
+        
+        
+        
+    <g
+   id="g19"
+   inkscape:label="grid"
+   style="display:inline;stroke:#8d8d8d;stroke-opacity:1;stroke-linecap:square"><path
+     id="path3"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -157.72198 101.92044 L -57.660489 29.22151 " /><path
+     id="path8"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16207 123.17697 L -45.951829 61.994656 " /><path
+     id="path10"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 62.090704 L -85.342701 123.17697 " /><path
+     id="path21"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 69.140098 L -85.210515 7.9577807 " /><path
+     id="path23"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16206 8.0538225 L -46.084024 69.140097 " /><path
+     id="path25"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -57.782786 101.92044 L -157.72198 29.310363 " /><circle
+     cx="9"
+     cy="10.5"
+     r="7.5"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;fill:none;stroke:#000000;stroke-opacity:1;stroke-width:0.28125025;stroke-dasharray:none;stroke-dashoffset:0"
+     id="circle2"
+     transform="matrix(8.2559904,0,0,8.2559904,-182.056,-21.0726)" /></g><path
+   style="display:none;fill:#ff3c5b;fill-opacity:1;stroke:#ff3c5b;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -114.85451,70.775398 -31.59786,22.95719"
+   id="path6"
+   sodipodi:nodetypes="cc" /><path
+   style="display:none;fill:#64c818;fill-opacity:1;stroke:#64c818;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -100.65025,70.775398 31.597858,22.95719"
+   id="path5"
+   sodipodi:nodetypes="cc" /><path
+   style="clip-rule:evenodd;display:none;fill:#2f88e9;fill-opacity:1;fill-rule:evenodd;stroke:#2f88e9;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="M 8.9999995,8 V 3"
+   id="path4"
+   sodipodi:nodetypes="cc"
+   transform="matrix(7.739998,0,0,7.739998,-177.41236,-4.0445824)" /><path
+   style="display:none;fill:#e6e6e6;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -86.44599,50.135404 -21.30639,-15.479996 -21.30638,15.479996 21.30638,15.479996 z"
+   id="path11" /><path
+   style="display:none;fill:#b3b3b3;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -129.05876,50.135404 v 30.959992 l 21.30638,15.479996 V 65.6154 Z"
+   id="path12" /><path
+   style="display:none;fill:#999999;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="M -107.75238,96.575392 -86.44599,81.095396 V 50.135404 L -107.75238,65.6154 Z"
+   id="path13" /></g>
+</svg>
--- a/resources/images/axis_toggle_hover_dark.svg
+++ b/resources/images/axis_toggle_hover_dark.svg
@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"
+   id="svg4"
+   sodipodi:docname="axis_toggle_hover_dark.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="true"
+   inkscape:zoom="64.833333"
+   inkscape:cx="9"
+   inkscape:cy="8.6915168"
+   inkscape:window-width="2560"
+   inkscape:window-height="1369"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g19"><inkscape:grid
+     id="grid4"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="1"
+     spacingy="1"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     enabled="true"
+     visible="false" /><inkscape:grid
+     type="axonomgrid"
+     id="grid8"
+     units="pt"
+     originx="9"
+     originy="9"
+     spacingx="3.7795276"
+     spacingy="1.3333333"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="4"
+     dotted="false"
+     gridanglex="36"
+     gridanglez="36"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="modular"
+     id="grid9"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="151.1811"
+     spacingy="151.1811"
+     empcolor="#0047cb"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="0"
+     marginx="0"
+     marginy="0"
+     gapx="37.795276"
+     gapy="37.795276"
+     enabled="true"
+     visible="true" /><inkscape:grid
+     type="axonomgrid"
+     id="grid10"
+     units="px"
+     originx="0"
+     originy="0"
+     spacingx="3.7795276"
+     spacingy="3.7795276"
+     empcolor="#0099e5"
+     empopacity="0.30196078"
+     color="#0099e5"
+     opacity="0.14901961"
+     empspacing="5"
+     dotted="false"
+     gridanglex="30"
+     gridanglez="30"
+     enabled="false"
+     visible="true" /></sodipodi:namedview><defs
+   id="defs4" />
+    <g
+   id="g15"
+   transform="matrix(0.129199,0,0,0.129199,22.9215,0.522556)">
+        <g
+   transform="matrix(8.25599,0,0,8.25599,-182.056,-21.0726)"
+   id="g1"
+   style="display:inline">
+            <circle
+   cx="9"
+   cy="10.5"
+   r="7.5"
+   style="display:inline;fill:#3b3b3b"
+   id="circle1" />
+        </g>
+        
+        
+        
+    <g
+   id="g19"
+   inkscape:label="grid"
+   style="display:inline;stroke:#8d8d8d;stroke-opacity:1;stroke-linecap:square"><path
+     id="path3"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -157.72198 101.92044 L -57.660489 29.22151 " /><path
+     id="path8"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16207 123.17697 L -45.951829 61.994656 " /><path
+     id="path10"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 62.090704 L -85.342701 123.17697 " /><path
+     id="path21"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -169.42074 69.140098 L -85.210515 7.9577807 " /><path
+     id="path23"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -130.16206 8.0538225 L -46.084024 69.140097 " /><path
+     id="path25"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;stroke:#8d8d8d;stroke-opacity:1;fill:none;fill-opacity:0.7;stroke-width:1.032;stroke-dasharray:none;paint-order:fill markers stroke"
+     d="M -57.782786 101.92044 L -157.72198 29.310363 " /><circle
+     cx="9"
+     cy="10.5"
+     r="7.5"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;display:inline;fill:none;stroke:#000000;stroke-opacity:1;stroke-width:0.28125025;stroke-dasharray:none;stroke-dashoffset:0"
+     id="circle2"
+     transform="matrix(8.2559904,0,0,8.2559904,-182.056,-21.0726)" /></g><path
+   style="display:none;fill:#ff3c5b;fill-opacity:1;stroke:#ff3c5b;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -114.85451,70.775398 -31.59786,22.95719"
+   id="path6"
+   sodipodi:nodetypes="cc" /><path
+   style="display:none;fill:#64c818;fill-opacity:1;stroke:#64c818;stroke-width:10.32;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="m -100.65025,70.775398 31.597858,22.95719"
+   id="path5"
+   sodipodi:nodetypes="cc" /><path
+   style="clip-rule:evenodd;display:none;fill:#2f88e9;fill-opacity:1;fill-rule:evenodd;stroke:#2f88e9;stroke-width:1.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;paint-order:fill markers stroke"
+   d="M 8.9999995,8 V 3"
+   id="path4"
+   sodipodi:nodetypes="cc"
+   transform="matrix(7.739998,0,0,7.739998,-177.41236,-4.0445824)" /><path
+   style="display:none;fill:#e6e6e6;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -86.44599,50.135404 -21.30639,-15.479996 -21.30638,15.479996 21.30638,15.479996 z"
+   id="path11" /><path
+   style="display:none;fill:#b3b3b3;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="m -129.05876,50.135404 v 30.959992 l 21.30638,15.479996 V 65.6154 Z"
+   id="path12" /><path
+   style="display:none;fill:#999999;fill-opacity:0.7;stroke:#1a1a1a;stroke-width:1.032;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+   d="M -107.75238,96.575392 -86.44599,81.095396 V 50.135404 L -107.75238,65.6154 Z"
+   id="path13" /></g>
+</svg>
--- a/resources/images/flush_mode_panel_icon.svg
+++ b/resources/images/flush_mode_panel_icon.svg
@ -1,7 +1 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.07262 4.61082C3.35049 5.95191 2.88086 7.8561 2.88086 10.0005C2.88086 12.1449 3.35049 14.0491 4.07262 15.3902C4.8112 16.7618 5.70585 17.3755 6.50586 17.3755C7.30587 17.3755 8.20052 16.7618 8.9391 15.3902C9.66123 14.0491 10.1309 12.1449 10.1309 10.0005C10.1309 7.8561 9.66123 5.95191 8.9391 4.61082C8.20052 3.23918 7.30587 2.62549 6.50586 2.62549C5.70585 2.62549 4.8112 3.23918 4.07262 4.61082ZM2.75191 3.89967C3.59678 2.33064 4.88962 1.12549 6.50586 1.12549C8.1221 1.12549 9.41494 2.33064 10.2598 3.89967C11.1211 5.49925 11.6309 7.65756 11.6309 10.0005C11.6309 12.3434 11.1211 14.5017 10.2598 16.1013C9.41494 17.6703 8.1221 18.8755 6.50586 18.8755C4.88962 18.8755 3.59678 17.6703 2.75191 16.1013C1.8906 14.5017 1.38086 12.3434 1.38086 10.0005C1.38086 7.65756 1.8906 5.49925 2.75191 3.89967Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8071 5H7.13086C6.09533 5 5.25586 6.84409 5.25586 10C5.25586 13.1559 6.09533 15 7.13086 15H11.8071C11.2267 13.6213 10.8809 11.8857 10.8809 10C10.8809 8.11434 11.2267 6.37871 11.8071 5Z" fill="#D9D9D9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0988 4.375H7.13086C6.19757 4.375 5.58064 5.18705 5.22406 6.08611C4.84543 7.04076 4.63086 8.37669 4.63086 10C4.63086 11.6233 4.84543 12.9592 5.22406 13.9139C5.58064 14.813 6.19757 15.625 7.13086 15.625H12.0988C11.9011 15.2423 11.7233 14.8237 11.5686 14.375H7.13086C7.02862 14.375 6.70804 14.265 6.38601 13.453C6.08602 12.6967 5.88086 11.5326 5.88086 10C5.88086 8.46739 6.08602 7.30333 6.38601 6.54696C6.70804 5.73499 7.02862 5.625 7.13086 5.625H11.5686C11.7233 5.1763 11.9011 4.75771 12.0988 4.375Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8226 4.61082C12.1005 5.95191 11.6309 7.8561 11.6309 10.0005C11.6309 12.1449 12.1005 14.0491 12.8226 15.3902C13.5612 16.7618 14.4558 17.3755 15.2559 17.3755C16.0559 17.3755 16.9505 16.7618 17.6891 15.3902C18.4112 14.0491 18.8809 12.1449 18.8809 10.0005C18.8809 7.8561 18.4112 5.95191 17.6891 4.61082C16.9505 3.23918 16.0559 2.62549 15.2559 2.62549C14.4558 2.62549 13.5612 3.23918 12.8226 4.61082ZM11.5019 3.89967C12.3468 2.33064 13.6396 1.12549 15.2559 1.12549C16.8721 1.12549 18.1649 2.33064 19.0098 3.89967C19.8711 5.49925 20.3809 7.65756 20.3809 10.0005C20.3809 12.3434 19.8711 14.5017 19.0098 16.1013C18.1649 17.6703 16.8721 18.8755 15.2559 18.8755C13.6396 18.8755 12.3468 17.6703 11.5019 16.1013C10.6406 14.5017 10.1309 12.3434 10.1309 10.0005C10.1309 7.65756 10.6406 5.49925 11.5019 3.89967Z" fill="#262E30"/>
-<ellipse cx="15.2559" cy="10" rx="1.25" ry="2.5" fill="#D9D9D9" stroke="#262E30" stroke-width="0.6" stroke-linejoin="round"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M6.3,17.19c-.38.83-.82,1.31-1.3,1.31-1.38,0-2.5-4.03-2.5-9S3.62.5,5,.5c.49,0,.95.51,1.33,1.38M14,.5c1.38,0,2.5,4.03,2.5,9s-1.12,9-2.5,9-2.5-4.03-2.5-9S12.62.5,14,.5Z" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M11,17.44c-.51-.54-1.5-3.19-1.5-7.94s.99-7.4,1.5-7.94M9,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M7,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94" style="fill:none; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/flush_mode_panel_icon_disabled.svg
+++ b/resources/images/flush_mode_panel_icon_disabled.svg
@ -1,7 +1 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.07262 4.61082C3.35049 5.95191 2.88086 7.8561 2.88086 10.0005C2.88086 12.1449 3.35049 14.0491 4.07262 15.3902C4.8112 16.7618 5.70585 17.3755 6.50586 17.3755C7.30587 17.3755 8.20052 16.7618 8.9391 15.3902C9.66123 14.0491 10.1309 12.1449 10.1309 10.0005C10.1309 7.8561 9.66123 5.95191 8.9391 4.61082C8.20052 3.23918 7.30587 2.62549 6.50586 2.62549C5.70585 2.62549 4.8112 3.23918 4.07262 4.61082ZM2.75191 3.89967C3.59678 2.33064 4.88962 1.12549 6.50586 1.12549C8.1221 1.12549 9.41494 2.33064 10.2598 3.89967C11.1211 5.49925 11.6309 7.65756 11.6309 10.0005C11.6309 12.3434 11.1211 14.5017 10.2598 16.1013C9.41494 17.6703 8.1221 18.8755 6.50586 18.8755C4.88962 18.8755 3.59678 17.6703 2.75191 16.1013C1.8906 14.5017 1.38086 12.3434 1.38086 10.0005C1.38086 7.65756 1.8906 5.49925 2.75191 3.89967Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8071 5H7.13086C6.09533 5 5.25586 6.84409 5.25586 10C5.25586 13.1559 6.09533 15 7.13086 15H11.8071C11.2267 13.6213 10.8809 11.8857 10.8809 10C10.8809 8.11434 11.2267 6.37871 11.8071 5Z" fill="#D9D9D9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0988 4.375H7.13086C6.19757 4.375 5.58064 5.18705 5.22406 6.08611C4.84543 7.04076 4.63086 8.37669 4.63086 10C4.63086 11.6233 4.84543 12.9592 5.22406 13.9139C5.58064 14.813 6.19757 15.625 7.13086 15.625H12.0988C11.9011 15.2423 11.7233 14.8237 11.5686 14.375H7.13086C7.02862 14.375 6.70804 14.265 6.38601 13.453C6.08602 12.6967 5.88086 11.5326 5.88086 10C5.88086 8.46739 6.08602 7.30333 6.38601 6.54696C6.70804 5.73499 7.02862 5.625 7.13086 5.625H11.5686C11.7233 5.1763 11.9011 4.75771 12.0988 4.375Z" fill="#262E30"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8226 4.61082C12.1005 5.95191 11.6309 7.8561 11.6309 10.0005C11.6309 12.1449 12.1005 14.0491 12.8226 15.3902C13.5612 16.7618 14.4558 17.3755 15.2559 17.3755C16.0559 17.3755 16.9505 16.7618 17.6891 15.3902C18.4112 14.0491 18.8809 12.1449 18.8809 10.0005C18.8809 7.8561 18.4112 5.95191 17.6891 4.61082C16.9505 3.23918 16.0559 2.62549 15.2559 2.62549C14.4558 2.62549 13.5612 3.23918 12.8226 4.61082ZM11.5019 3.89967C12.3468 2.33064 13.6396 1.12549 15.2559 1.12549C16.8721 1.12549 18.1649 2.33064 19.0098 3.89967C19.8711 5.49925 20.3809 7.65756 20.3809 10.0005C20.3809 12.3434 19.8711 14.5017 19.0098 16.1013C18.1649 17.6703 16.8721 18.8755 15.2559 18.8755C13.6396 18.8755 12.3468 17.6703 11.5019 16.1013C10.6406 14.5017 10.1309 12.3434 10.1309 10.0005C10.1309 7.65756 10.6406 5.49925 11.5019 3.89967Z" fill="#262E30"/>
-<ellipse cx="15.2559" cy="10" rx="1.25" ry="2.5" fill="#D9D9D9" stroke="#262E30" stroke-width="0.6" stroke-linejoin="round"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M6.3,17.19c-.38.83-.82,1.31-1.3,1.31-1.38,0-2.5-4.03-2.5-9S3.62.5,5,.5c.49,0,.95.51,1.33,1.38M14,.5c1.38,0,2.5,4.03,2.5,9s-1.12,9-2.5,9-2.5-4.03-2.5-9S12.62.5,14,.5ZM11,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M9,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M7,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/map_mode_disabled.svg
+++ b/resources/images/map_mode_disabled.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" fill="#F1F1F1" stroke="#DBDBDB"/>
-</svg>
--- a/resources/images/map_mode_off.svg
+++ b/resources/images/map_mode_off.svg
@ -1,3 +0,0 @@
-<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8.29004" cy="8.23108" r="7.5" stroke="#C2C2C2"/>
-</svg>
--- a/resources/images/map_mode_off_hovered.svg
+++ b/resources/images/map_mode_off_hovered.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="7.5" fill="#009688" fill-opacity="0.16" stroke="#009688"/>
-</svg>
--- a/resources/images/map_mode_on.svg
+++ b/resources/images/map_mode_on.svg
@ -1,4 +0,0 @@
-<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.290039" y="0.231079" width="16" height="16" rx="8" fill="#009688"/>
-<circle cx="8.29004" cy="8.23108" r="3" fill="#F7F7F7"/>
-</svg>
--- a/resources/images/map_mode_on_hovered.svg
+++ b/resources/images/map_mode_on_hovered.svg
@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="16" height="16" rx="8" fill="#009688"/>
-<circle cx="8" cy="8" r="3" fill="#F7F7F7"/>
-</svg>
--- a/resources/images/match_mode_panel_icon.svg
+++ b/resources/images/match_mode_panel_icon.svg
@ -1,3 +1 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8223 0.670677C18.5805 0.604357 18.3102 0.624806 18.0559 0.763978L1.22745 9.97419C0.29897 10.4823 0.417205 11.8517 1.41905 12.1932L5.9217 13.728C6.32217 13.8645 6.75749 13.6505 6.89399 13.25C7.0305 12.8495 6.81651 12.4142 6.41603 12.2777L2.59174 10.9742L15.6966 3.80188L8.1136 12.895C7.72855 13.3567 7.51766 13.9389 7.51766 14.5401V18.5996C7.51766 19.0227 7.86065 19.3657 8.28376 19.3657C8.70686 19.3657 9.04985 19.0227 9.04985 18.5996V14.5401C9.04985 14.2975 9.13495 14.0626 9.29032 13.8763L17.6718 3.82563L15.5515 15.8879L11.0451 14.228C10.6481 14.0818 10.2077 14.2851 10.0615 14.6821C9.91523 15.0791 10.1185 15.5195 10.5156 15.6658L15.3763 17.4562C16.0882 17.7184 16.8638 17.2723 16.9952 16.5251L19.5743 1.85264C19.6457 1.44649 19.4792 1.08673 19.2029 0.865349C19.1918 0.854897 19.1803 0.844711 19.1684 0.834808C19.0651 0.748615 18.9457 0.694265 18.8223 0.670677Z" fill="#262E30"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M7.2,12.73l-5.79-1.04c-.33-.07-.42-.5-.13-.69L17.5.5v13.01c0,.52-.46.91-.97.82l-6.44-1.14M17.5.5l-8.08,10.77c-.6.8-.92,1.77-.92,2.77v4.46l3-5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.5,16.5l1.54-1.54M.84,15.05l.54-.72M15.65,17.29l.72-.96M6.38,15.33l-1.29,1.73M13.38,16.33l-1.29,1.73" style="fill:none; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/match_mode_panel_icon_disabled.svg
+++ b/resources/images/match_mode_panel_icon_disabled.svg
@ -1,3 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.1255 0.670677C18.8837 0.604357 18.6134 0.624806 18.3591 0.763978L1.53067 9.97419C0.602193 10.4823 0.720428 11.8517 1.72227 12.1932L6.22492 13.728C6.6254 13.8645 7.06071 13.6505 7.19722 13.25C7.33372 12.8495 7.11973 12.4142 6.71925 12.2777L2.89496 10.9742L15.9998 3.80188L8.41683 12.895C8.03177 13.3567 7.82088 13.9389 7.82088 14.5401V18.5996C7.82088 19.0227 8.16388 19.3657 8.58698 19.3657C9.01008 19.3657 9.35307 19.0227 9.35307 18.5996V14.5401C9.35307 14.2975 9.43817 14.0626 9.59354 13.8763L17.9751 3.82563L15.8547 15.8879L11.3484 14.228C10.9513 14.0818 10.5109 14.2851 10.3647 14.6821C10.2185 15.0791 10.4218 15.5195 10.8188 15.6658L15.6795 17.4562C16.3914 17.7184 17.1671 17.2723 17.2984 16.5251L19.8776 1.85264C19.949 1.44649 19.7824 1.08673 19.5062 0.865349C19.495 0.854897 19.4835 0.844711 19.4717 0.834808C19.3683 0.748615 19.249 0.694265 19.1255 0.670677Z" fill="#CECECE"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M7.2,12.73l-5.79-1.04c-.33-.07-.42-.5-.13-.69L17.5.5v13.01c0,.52-.46.91-.97.82l-6.44-1.14M17.5.5l-8.08,10.77c-.6.8-.92,1.77-.92,2.77v4.46l3-5" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.5,16.5l1.54-1.54M.84,15.05l.54-.72M15.65,17.29l.72-.96M6.38,15.33l-1.29,1.73M13.38,16.33l-1.29,1.73" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/plate_set_filament_map.svg
+++ b/resources/images/plate_set_filament_map.svg
@ -1,12 +1 @@
-<svg width="42" height="43" viewBox="0 0 42 43" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37.1 40.6832H4.89996C3.29996 40.6832 2 39.3832 2 37.7832V5.6832C2 4.0832 3.29996 2.7832 4.89996 2.7832H37.1C38.7 2.7832 40 4.0832 40 5.6832V37.8832C40 39.3832 38.7 40.6832 37.1 40.6832Z" fill="#E9E9E9"/>
-<path d="M37.0992 41.5824H4.89923C2.79923 41.5824 1.19922 39.8824 1.19922 37.8824V5.68242C1.19922 3.58242 2.89923 1.98242 4.89923 1.98242H37.0992C39.1992 1.98242 40.7993 3.68242 40.7993 5.68242V37.8824C40.8993 39.8824 39.1992 41.5824 37.0992 41.5824ZM4.99927 3.68242C3.89927 3.68242 2.99927 4.58242 2.99927 5.68242V37.8824C2.99927 38.9824 3.89927 39.8824 4.99927 39.8824H37.0992C38.1992 39.8824 39.0992 38.9824 39.0992 37.8824V5.68242C39.0992 4.58242 38.1992 3.68242 37.0992 3.68242H4.99927Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2734 8.95319C12.2734 7.51959 11.1113 6.35742 9.67767 6.35742C8.24406 6.35742 7.0819 7.51959 7.0819 8.95319V34.8425C7.0819 36.2761 8.24406 37.4383 9.67767 37.4383C11.1113 37.4383 12.2734 36.2761 12.2734 34.8425V8.95319ZM9.67767 8.05742C10.1724 8.05742 10.5734 8.45847 10.5734 8.95319V34.8425C10.5734 35.3372 10.1724 35.7383 9.67767 35.7383C9.18295 35.7383 8.7819 35.3372 8.7819 34.8425V8.95319C8.7819 8.45847 9.18295 8.05742 9.67767 8.05742Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.1094 30.0704L33.0632 24.7941L26.9708 24.7941L23.9245 30.0704L26.9708 35.3466L33.0632 35.3466L36.1094 30.0704ZM37.8992 30.5704C38.0779 30.261 38.0779 29.8798 37.8992 29.5704L34.3911 23.4941C34.2125 23.1847 33.8824 22.9941 33.5251 22.9941L26.5089 22.9941C26.1516 22.9941 25.8215 23.1847 25.6429 23.4941L22.1348 29.5704C21.9561 29.8798 21.9561 30.261 22.1348 30.5704L25.6429 36.6466C25.8215 36.956 26.1516 37.1466 26.5089 37.1466L33.5251 37.1466C33.8824 37.1466 34.2125 36.956 34.3911 36.6466L37.8992 30.5704Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.5901 30.0698C28.5901 30.8574 29.2285 31.4959 30.0161 31.4959C30.8037 31.4959 31.4422 30.8574 31.4422 30.0698C31.4422 29.2822 30.8037 28.6437 30.0161 28.6437C29.2285 28.6437 28.5901 29.2822 28.5901 30.0698ZM26.7901 30.0698C26.7901 31.8515 28.2344 33.2959 30.0161 33.2959C31.7978 33.2959 33.2422 31.8515 33.2422 30.0698C33.2422 28.2881 31.7978 26.8437 30.0161 26.8437C28.2344 26.8437 26.7901 28.2881 26.7901 30.0698Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9629 13.1328H12.2109V30.6621H18.9857L18.6882 30.1468L20.9629 26.2068V13.1328Z" fill="#5FEDF6"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7148 13.1328H20.9629V26.2068L24.2013 20.5977L29.7148 20.5977V13.1328Z" fill="#FA6666"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.2481 6.35742C33.6817 6.35742 34.8439 7.51959 34.8439 8.95319V20.5977H33.1439V8.95319C33.1439 8.45847 32.7428 8.05742 32.2481 8.05742C31.7534 8.05742 31.3523 8.45847 31.3523 8.95319V20.5977L29.6523 20.5977V8.95319C29.6523 7.51959 30.8145 6.35742 32.2481 6.35742Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.6523 13.1336H12.1426V11.4336H29.6523V13.1336Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.0477 32.3621H12.1426V30.6621H19.0664L20.0477 32.3621Z" fill="#545454"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="43" height="43" viewBox="0 0 43 43"><rect x="1.5" y="1.5" width="40" height="40" rx="3.5" ry="3.5" style="fill:#e9e9e9;"/><path d="M38,2c1.66,0,3,1.34,3,3v33c0,1.66-1.34,3-3,3H5c-1.66,0-3-1.34-3-3V5c0-1.66,1.34-3,3-3h33M38,1H5C2.79,1,1,2.79,1,5v33c0,2.21,1.79,4,4,4h33c2.21,0,4-1.79,4-4V5c0-2.21-1.79-4-4-4Z" style="fill:#545454;"/><circle cx="17.36" cy="17.51" r="11.5" style="fill:#e9e9e9; stroke:#545454; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="17.36" cy="17.51" r="3.5" style="fill:#e9e9e9; stroke:#545454; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="11.5" style="fill:#e9e9e9; stroke:#545454; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="3.5" style="fill:#e9e9e9; stroke:#545454; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/plate_set_filament_map_dark.svg
+++ b/resources/images/plate_set_filament_map_dark.svg
@ -1,12 +1 @@
-<svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37.1 39.902H4.89996C3.29996 39.902 2 38.602 2 37.002V4.90195C2 3.30195 3.29996 2.00195 4.89996 2.00195H37.1C38.7 2.00195 40 3.30195 40 4.90195V37.102C40 38.602 38.7 39.902 37.1 39.902Z" fill="#57565B"/>
-<path d="M37.0992 40.8012H4.89923C2.79923 40.8012 1.19922 39.1012 1.19922 37.1012V4.90117C1.19922 2.80117 2.89923 1.20117 4.89923 1.20117H37.0992C39.1992 1.20117 40.7993 2.90117 40.7993 4.90117V37.1012C40.8993 39.1012 39.1992 40.8012 37.0992 40.8012ZM4.99927 2.90117C3.89927 2.90117 2.99927 3.80117 2.99927 4.90117V37.1012C2.99927 38.2012 3.89927 39.1012 4.99927 39.1012H37.0992C38.1992 39.1012 39.0992 38.2012 39.0992 37.1012V4.90117C39.0992 3.80117 38.1992 2.90117 37.0992 2.90117H4.99927Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2734 8.17194C12.2734 6.73834 11.1113 5.57617 9.67767 5.57617C8.24406 5.57617 7.0819 6.73834 7.0819 8.17194V34.0613C7.0819 35.4949 8.24406 36.657 9.67767 36.657C11.1113 36.657 12.2734 35.4949 12.2734 34.0613V8.17194ZM9.67767 7.27617C10.1724 7.27617 10.5734 7.67722 10.5734 8.17194V34.0613C10.5734 34.556 10.1724 34.957 9.67767 34.957C9.18295 34.957 8.7819 34.556 8.7819 34.0613V8.17194C8.7819 7.67722 9.18295 7.27617 9.67767 7.27617Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.1094 29.2891L33.0632 24.0129L26.9708 24.0129L23.9245 29.2891L26.9708 34.5653L33.0632 34.5653L36.1094 29.2891ZM37.8992 29.7891C38.0779 29.4797 38.0779 29.0985 37.8992 28.7891L34.3911 22.7129C34.2125 22.4035 33.8824 22.2129 33.5251 22.2129L26.5089 22.2129C26.1516 22.2129 25.8215 22.4035 25.6429 22.7129L22.1348 28.7891C21.9561 29.0985 21.9561 29.4797 22.1348 29.7891L25.6429 35.8653C25.8215 36.1747 26.1516 36.3653 26.5089 36.3653L33.5251 36.3653C33.8824 36.3653 34.2125 36.1747 34.3911 35.8653L37.8992 29.7891Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.5901 29.2886C28.5901 30.0761 29.2285 30.7146 30.0161 30.7146C30.8037 30.7146 31.4422 30.0761 31.4422 29.2886C31.4422 28.501 30.8037 27.8625 30.0161 27.8625C29.2285 27.8625 28.5901 28.501 28.5901 29.2886ZM26.7901 29.2886C26.7901 31.0703 28.2344 32.5146 30.0161 32.5146C31.7978 32.5146 33.2422 31.0703 33.2422 29.2886C33.2422 27.5069 31.7978 26.0625 30.0161 26.0625C28.2344 26.0625 26.7901 27.5069 26.7901 29.2886Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9629 12.3516H12.2109V29.8809H18.9857L18.6882 29.3655L20.9629 25.4256V12.3516Z" fill="#53F5FF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7148 12.3516H20.9629V25.4256L24.2013 19.8164L29.7148 19.8164V12.3516Z" fill="#FF5E5E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.2481 5.57617C33.6817 5.57617 34.8439 6.73834 34.8439 8.17194V19.8164H33.1439V8.17194C33.1439 7.67722 32.7428 7.27617 32.2481 7.27617C31.7534 7.27617 31.3523 7.67722 31.3523 8.17194V19.8164L29.6523 19.8164V8.17194C29.6523 6.73834 30.8145 5.57617 32.2481 5.57617Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.6523 12.3523H12.1426V10.6523H29.6523V12.3523Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.0477 31.5809H12.1426V29.8809H19.0664L20.0477 31.5809Z" fill="#99989B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="43" height="43" viewBox="0 0 43 43"><rect x="1.5" y="1.5" width="40" height="40" rx="3.5" ry="3.5" style="fill:#54545a;"/><path d="M38,2c1.66,0,3,1.34,3,3v33c0,1.66-1.34,3-3,3H5c-1.66,0-3-1.34-3-3V5c0-1.66,1.34-3,3-3h33M38,1H5C2.79,1,1,2.79,1,5v33c0,2.21,1.79,4,4,4h33c2.21,0,4-1.79,4-4V5c0-2.21-1.79-4-4-4Z" style="fill:#b3b3b3;"/><circle cx="17.36" cy="17.51" r="11.5" style="fill:#54545a; stroke:#c4c4c4; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="17.36" cy="17.51" r="3.5" style="fill:#54545a; stroke:#c4c4c4; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="11.5" style="fill:#54545a; stroke:#c4c4c4; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="3.5" style="fill:#54545a; stroke:#c4c4c4; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/plate_set_filament_map_hover.svg
+++ b/resources/images/plate_set_filament_map_hover.svg
@ -1,12 +1 @@
-<svg width="42" height="43" viewBox="0 0 42 43" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37.1 40.4961H4.89996C3.29996 40.4961 2 39.1961 2 37.5961V5.3961C2 3.7961 3.29996 2.49609 4.89996 2.49609H37.1C38.7 2.49609 40 3.7961 40 5.3961V37.5961C40 39.1961 38.7 40.4961 37.1 40.4961Z" fill="#D6D6D6"/>
-<path d="M37.0992 41.3969H4.89923C2.79923 41.3969 1.19922 39.6969 1.19922 37.6969V5.49687C1.19922 3.39687 2.89923 1.79688 4.89923 1.79688H37.0992C39.1992 1.79688 40.7993 3.49687 40.7993 5.49687V37.5969C40.8993 39.6969 39.1992 41.3969 37.0992 41.3969ZM4.99927 3.49687C3.89927 3.49687 2.99927 4.39687 2.99927 5.49687V37.5969C2.99927 38.6969 3.89927 39.5969 4.99927 39.5969H37.0992C38.1992 39.5969 39.0992 38.6969 39.0992 37.5969V5.39688C39.0992 4.29688 38.1992 3.39688 37.0992 3.39688H4.99927V3.49687Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3477 8.7696C12.3477 7.33599 11.1855 6.17383 9.75189 6.17383C8.31828 6.17383 7.15612 7.33599 7.15612 8.7696V34.6589C7.15612 36.0925 8.31828 37.2547 9.75189 37.2547C11.1855 37.2547 12.3477 36.0925 12.3477 34.6589V8.7696ZM9.75189 7.87383C10.2466 7.87383 10.6477 8.27488 10.6477 8.7696V34.6589C10.6477 35.1536 10.2466 35.5547 9.75189 35.5547C9.25717 35.5547 8.85612 35.1536 8.85612 34.6589V8.7696C8.85612 8.27488 9.25717 7.87383 9.75189 7.87383Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.1837 29.8868L33.1374 24.6105L27.045 24.6105L23.9988 29.8868L27.045 35.163L33.1374 35.163L36.1837 29.8868ZM37.9734 30.3868C38.1521 30.0774 38.1521 29.6962 37.9734 29.3868L34.4653 23.3105C34.2867 23.0011 33.9566 22.8105 33.5993 22.8105L26.5831 22.8105C26.2258 22.8105 25.8957 23.0011 25.7171 23.3105L22.209 29.3868C22.0303 29.6962 22.0303 30.0774 22.209 30.3868L25.7171 36.463C25.8957 36.7724 26.2258 36.963 26.5831 36.963L33.5993 36.963C33.9566 36.963 34.2867 36.7724 34.4653 36.463L37.9734 30.3868Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6643 29.8862C28.6643 30.6738 29.3028 31.3123 30.0904 31.3123C30.8779 31.3123 31.5164 30.6738 31.5164 29.8862C31.5164 29.0986 30.8779 28.4602 30.0904 28.4602C29.3028 28.4602 28.6643 29.0986 28.6643 29.8862ZM26.8643 29.8862C26.8643 31.6679 28.3087 33.1123 30.0904 33.1123C31.8721 33.1123 33.3164 31.6679 33.3164 29.8862C33.3164 28.1045 31.8721 26.6602 30.0904 26.6602C28.3087 26.6602 26.8643 28.1045 26.8643 29.8862Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0371 12.9492H12.2852V30.4785H19.0599L18.7624 29.9632L21.0371 26.0232V12.9492Z" fill="#5FECF6"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7891 12.9492H21.0371V26.0233L24.2756 20.4141L29.7891 20.4141V12.9492Z" fill="#FA6666"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3223 6.17383C33.7559 6.17383 34.9181 7.33599 34.9181 8.7696V20.4141H33.2181V8.7696C33.2181 8.27488 32.817 7.87383 32.3223 7.87383C31.8276 7.87383 31.4266 8.27488 31.4266 8.7696V20.4141L29.7266 20.4141V8.7696C29.7266 7.33599 30.8887 6.17383 32.3223 6.17383Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7266 12.95H12.2168V11.25H29.7266V12.95Z" fill="#545454"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.1219 32.1785H12.2168V30.4785H19.1406L20.1219 32.1785Z" fill="#545454"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="43" height="43" viewBox="0 0 43 43"><rect x="1.5" y="1.5" width="40" height="40" rx="3.5" ry="3.5" style="fill:#e9e9e9;"/><path d="M38,2c1.66,0,3,1.34,3,3v33c0,1.66-1.34,3-3,3H5c-1.66,0-3-1.34-3-3V5c0-1.66,1.34-3,3-3h33M38,1H5C2.79,1,1,2.79,1,5v33c0,2.21,1.79,4,4,4h33c2.21,0,4-1.79,4-4V5c0-2.21-1.79-4-4-4Z" style="fill:#009688;"/><circle cx="17.36" cy="17.51" r="11.5" style="fill:#e9e9e9; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="17.36" cy="17.51" r="3.5" style="fill:#e9e9e9; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="11.5" style="fill:#e9e9e9; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="3.5" style="fill:#e9e9e9; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/images/plate_set_filament_map_hover_dark.svg
+++ b/resources/images/plate_set_filament_map_hover_dark.svg
@ -1,12 +1 @@
-<svg width="43" height="42" viewBox="0 0 43 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37.2386 39.902H5.03864C3.43864 39.902 2.13867 38.602 2.13867 37.002V4.90195C2.13867 3.30195 3.43864 2.00195 5.03864 2.00195H37.2386C38.8386 2.00195 40.1387 3.30195 40.1387 4.90195V37.102C40.1387 38.602 38.8386 39.902 37.2386 39.902Z" fill="#4E4E55"/>
-<path d="M37.2379 40.8012H5.0379C2.9379 40.8012 1.33789 39.1012 1.33789 37.1012V4.90117C1.33789 2.80117 3.0379 1.20117 5.0379 1.20117H37.2379C39.3379 1.20117 40.9379 2.90117 40.9379 4.90117V37.1012C41.0379 39.1012 39.3379 40.8012 37.2379 40.8012ZM5.13794 2.90117C4.03794 2.90117 3.13794 3.80117 3.13794 4.90117V37.1012C3.13794 38.2012 4.03794 39.1012 5.13794 39.1012H37.2379C38.3379 39.1012 39.2379 38.2012 39.2379 37.1012V4.90117C39.2379 3.80117 38.3379 2.90117 37.2379 2.90117H5.13794Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4121 8.17194C12.4121 6.73834 11.2499 5.57617 9.81634 5.57617C8.38274 5.57617 7.22057 6.73834 7.22057 8.17194V34.0613C7.22057 35.4949 8.38274 36.657 9.81634 36.657C11.2499 36.657 12.4121 35.4949 12.4121 34.0613V8.17194ZM9.81634 7.27617C10.3111 7.27617 10.7121 7.67722 10.7121 8.17194V34.0613C10.7121 34.556 10.3111 34.957 9.81634 34.957C9.32162 34.957 8.92057 34.556 8.92057 34.0613V8.17194C8.92057 7.67722 9.32162 7.27617 9.81634 7.27617Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M36.2481 29.2891L33.2019 24.0129L27.1094 24.0129L24.0632 29.2891L27.1094 34.5653L33.2019 34.5653L36.2481 29.2891ZM38.0379 29.7891C38.2165 29.4797 38.2165 29.0985 38.0379 28.7891L34.5298 22.7129C34.3512 22.4035 34.021 22.2129 33.6638 22.2129L26.6476 22.2129C26.2903 22.2129 25.9602 22.4035 25.7815 22.7129L22.2734 28.7891C22.0948 29.0985 22.0948 29.4797 22.2734 29.7891L25.7815 35.8653C25.9602 36.1747 26.2903 36.3653 26.6476 36.3653L33.6638 36.3653C34.021 36.3653 34.3512 36.1747 34.5298 35.8653L38.0379 29.7891Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.7288 29.2886C28.7288 30.0761 29.3672 30.7146 30.1548 30.7146C30.9424 30.7146 31.5809 30.0761 31.5809 29.2886C31.5809 28.501 30.9424 27.8625 30.1548 27.8625C29.3672 27.8625 28.7288 28.501 28.7288 29.2886ZM26.9288 29.2886C26.9288 31.0703 28.3731 32.5146 30.1548 32.5146C31.9365 32.5146 33.3809 31.0703 33.3809 29.2886C33.3809 27.5069 31.9365 26.0625 30.1548 26.0625C28.3731 26.0625 26.9288 27.5069 26.9288 29.2886Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.1016 12.3516H12.3496V29.8809H19.1244L18.8268 29.3655L21.1016 25.4256V12.3516Z" fill="#53F5FF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8535 12.3516H21.1016V25.4256L24.34 19.8164L29.8535 19.8164V12.3516Z" fill="#FF5E5E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3868 5.57617C33.8204 5.57617 34.9825 6.73834 34.9825 8.17194V19.8164H33.2825V8.17194C33.2825 7.67722 32.8815 7.27617 32.3868 7.27617C31.8921 7.27617 31.491 7.67722 31.491 8.17194V19.8164L29.791 19.8164V8.17194C29.791 6.73834 30.9532 5.57617 32.3868 5.57617Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.791 12.3523H12.2812V10.6523H29.791V12.3523Z" fill="#99989B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.1864 31.5809H12.2812V29.8809H19.2051L20.1864 31.5809Z" fill="#99989B"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="43" height="43" viewBox="0 0 43 43"><rect x="1.5" y="1.5" width="40" height="40" rx="3.5" ry="3.5" style="fill:#54545a;"/><path d="M38,2c1.66,0,3,1.34,3,3v33c0,1.66-1.34,3-3,3H5c-1.66,0-3-1.34-3-3V5c0-1.66,1.34-3,3-3h33M38,1H5C2.79,1,1,2.79,1,5v33c0,2.21,1.79,4,4,4h33c2.21,0,4-1.79,4-4V5c0-2.21-1.79-4-4-4Z" style="fill:#009688;"/><circle cx="17.36" cy="17.51" r="11.5" style="fill:#54545a; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="17.36" cy="17.51" r="3.5" style="fill:#54545a; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="11.5" style="fill:#54545a; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><circle cx="25.14" cy="25.99" r="3.5" style="fill:#54545a; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
--- a/resources/profiles/Afinia/Afinia
+++ b/resources/profiles/Afinia/Afinia
--- a/resources/profiles/Anker/Anker
+++ b/resources/profiles/Anker/Anker
--- a/resources/profiles/Anker/Anker
+++ b/resources/profiles/Anker/Anker
--- a/resources/profiles/Anker/Anker
+++ b/resources/profiles/Anker/Anker
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/Anycubic
+++ b/resources/profiles/Anycubic/Anycubic
--- a/resources/profiles/Anycubic/machine/Anycubic
+++ b/resources/profiles/Anycubic/machine/Anycubic
@ -108,7 +108,7 @@
    ],
    "machine_start_gcode": "G90 ;Use absolute coordinates\nM83 ;Extruder relative mode\nM104 S[first_layer_temperature] ;Set extruder temp\nM140 S[first_layer_bed_temperature] ;Set bed temp\nM190 S[first_layer_bed_temperature] ;Wait for bed temp\nM109 S[first_layer_temperature] ;Wait for extruder temp\nG28 ;Move X/Y/Z to min endstops\nG1 Z0.28 ;Lift nozzle a bit\nG92 E0 ;Specify current extruder position as zero\nG1 Y3 F1800 ;Move Y to purge point\nG1 X60 E25 F500 ;Extrude 25mm of filament in a 5cm line\nG92 E0 ;Zero the extruded length again\nG1 E-2 F500 ;Retract a little\nG1 X70 F4000 ;Quickly wipe away from the filament line\nM117",
    "machine_end_gcode": "M104 S0 ;Extruder off\nM140 S0 ;Heatbed off\nM107 ;Fan off\nG91 ;Relative positioning\nG1 E-5 F3000 ;Retract filament\nG1 Z+0.3 F3000 ;Lift print head\nG28 X0 F3000 ;Home X axis\nM84 ;Disable stepper motors",
-    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n[layer_num] @ [layer_z]mm/nG92 E0",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n[layer_num] @ [layer_z]mm\nG92 E0",
    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n[layer_num] @ [layer_z]mm",
    "scan_first_layer": "0"
-}
+}
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/Artillery/Artillery
+++ b/resources/profiles/Artillery/Artillery
--- a/resources/profiles/BBL.json
+++ b/resources/profiles/BBL.json
@ -7013,6 +7013,46 @@
            "name": "Overture TPU @BBL X1C 0.2 nozzle",
            "sub_path": "filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json"
        },
+        {
+            "name": "Numakers PLA+ @base",
+            "sub_path": "filament/Numakers/Numakers PLA+ @base.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL A1",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL A1 0.2 nozzle",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL A1M",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL A1M 0.2 nozzle",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL P1P",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL P1P 0.2 nozzle",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL X1",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL X1C",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C.json"
+        },
+        {
+            "name": "Numakers PLA+ @BBL X1C 0.2 nozzle",
+            "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json"
+        },
        {
            "name": "fdm_filament_dual_common",
            "sub_path": "filament/fdm_filament_dual_common.json"
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/Bambu
+++ b/resources/profiles/BBL/Bambu
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,41 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL A1 0.2 nozzle",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS04_00",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_max_speed": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "2"
+    ],
+    "hot_plate_temp": [
+        "65"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "65"
+    ],
+    "pre_start_fan_time": [
+        "2"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "compatible_printers": [
+        "Bambu Lab A1 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,40 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL A1",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS04",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_max_speed": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "60"
+    ],
+    "hot_plate_temp": [
+        "65"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "65"
+    ],
+    "pre_start_fan_time": [
+        "2"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "compatible_printers": [
+        "Bambu Lab A1 0.4 nozzle",
+        "Bambu Lab A1 0.6 nozzle",
+        "Bambu Lab A1 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,44 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL A1M 0.2 nozzle",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS05_00",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_max_speed": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "60"
+    ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_max_volumetric_speed": [
+        "2"
+    ],
+    "hot_plate_temp": [
+        "60"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "60"
+    ],
+    "pre_start_fan_time": [
+        "2"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "compatible_printers": [
+        "Bambu Lab A1 mini 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,40 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL A1M",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS05",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_max_speed": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "60"
+    ],
+    "hot_plate_temp": [
+        "60"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "60"
+    ],
+    "pre_start_fan_time": [
+        "2"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "compatible_printers": [
+        "Bambu Lab A1 mini 0.4 nozzle",
+        "Bambu Lab A1 mini 0.6 nozzle",
+        "Bambu Lab A1 mini 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,125 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL P1P 0.2 nozzle",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS03_00",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "50"
+    ],
+    "filament_max_volumetric_speed": [
+        "2",
+        "2"
+    ],
+    "filament_deretraction_speed": [
+        "nil",
+        "nil"
+    ],
+    "filament_flush_temp": [
+        "0",
+        "0"
+    ],
+    "filament_flush_volumetric_speed": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_volumetric_speed": [
+        "-1",
+        "-1"
+    ],
+    "filament_retract_before_wipe": [
+        "nil",
+        "nil"
+    ],
+    "filament_retract_restart_extra": [
+        "nil",
+        "nil"
+    ],
+    "filament_retract_when_changing_layer": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_length": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_minimum_travel": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_speed": [
+        "nil",
+        "nil"
+    ],
+    "filament_wipe": [
+        "nil",
+        "nil"
+    ],
+    "filament_wipe_distance": [
+        "nil",
+        "nil"
+    ],
+    "filament_z_hop": [
+        "nil",
+        "nil"
+    ],
+    "filament_z_hop_types": [
+        "nil",
+        "nil"
+    ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
+    ],
+    "filament_adaptive_volumetric_speed": [
+        "0",
+        "0"
+    ],
+    "hot_plate_temp": [
+        "65"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "65"
+    ],
+    "long_retractions_when_ec": [
+        "0",
+        "0"
+    ],
+    "nozzle_temperature": [
+        "225",
+        "225"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "225",
+        "225"
+    ],
+    "retraction_distances_when_ec": [
+        "0",
+        "0"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "volumetric_speed_coefficients": [
+        "0 0 0 0 0 0",
+        "0 0 0 0 0 0"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1P 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/BBL/filament/Numakers/Numakers
+++ b/resources/profiles/BBL/filament/Numakers/Numakers
@ -0,0 +1,126 @@
+{
+    "type": "filament",
+    "name": "Numakers PLA+ @BBL P1P",
+    "inherits": "Numakers PLA+ @base",
+    "from": "system",
+    "setting_id": "GFNMKS03",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "50"
+    ],
+    "filament_deretraction_speed": [
+        "nil",
+        "nil"
+    ],
+    "filament_flush_temp": [
+        "0",
+        "0"
+    ],
+    "filament_flush_volumetric_speed": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_volumetric_speed": [
+        "-1",
+        "-1"
+    ],
+    "filament_retract_before_wipe": [
+        "nil",
+        "nil"
+    ],
+    "filament_retract_restart_extra": [
+        "nil",
+        "nil"
+    ],
+    "filament_retract_when_changing_layer": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_length": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_minimum_travel": [
+        "nil",
+        "nil"
+    ],
+    "filament_retraction_speed": [
+        "nil",
+        "nil"
+    ],
+    "filament_wipe": [
+        "nil",
+        "nil"
+    ],
+    "filament_wipe_distance": [
+        "nil",
+        "nil"
+    ],
+    "filament_z_hop": [
+        "nil",
+        "nil"
+    ],
+    "filament_z_hop_types": [
+        "nil",
+        "nil"
+    ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
+    ],
+    "filament_adaptive_volumetric_speed": [
+        "0",
+        "0"
+    ],
+    "hot_plate_temp": [
+        "65"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "65"
+    ],
+    "long_retractions_when_ec": [
+        "0",
+        "0"
+    ],
+    "nozzle_temperature": [
+        "225",
+        "225"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "225",
+        "225"
+    ],
+    "retraction_distances_when_ec": [
+        "0",
+        "0"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "textured_plate_temp": [
+        "65"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "65"
+    ],
+    "volumetric_speed_coefficients": [
+        "0 0 0 0 0 0",
+        "0 0 0 0 0 0"
+    ],
+    "compatible_printers": [
+        "Bambu Lab P1P 0.4 nozzle",
+        "Bambu Lab P1P 0.6 nozzle",
+        "Bambu Lab P1P 0.8 nozzle"
+    ]
+}
--- a/Show more
+++ b/Show more