Merge branch 'OrcaSlicer:main' into main

2026-04-06 00:32:05 +02:00 · 2026-03-17 01:36:52 +03:00
parent 4d7dee77df 0f25137853
commit 8df73358d0
221 changed files with 2452 additions and 658 deletions
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -134,7 +134,7 @@ jobs:
  flatpak:
    name: "Flatpak"
    container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49
      options: --privileged
      volumes:
        - /usr/local/lib/android:/usr/local/lib/android
@@ -170,7 +170,7 @@ jobs:
          git_commit_hash="${{ github.event.pull_request.head.sha }}"
        else
          ver=V$ver_pure
-          git_commit_hash=""
+          git_commit_hash="${{ github.sha }}"
        fi
        echo "ver=$ver" >> $GITHUB_ENV
        echo "ver_pure=$ver_pure" >> $GITHUB_ENV
@@ -194,7 +194,12 @@ jobs:
        restore-keys: flatpak-builder-${{ matrix.variant.arch }}-
    - name: Disable debug info for faster CI builds
      run: |
-        sed -i '0,/^finish-args:/s//build-options:\n  no-debuginfo: true\n  strip: true\nfinish-args:/' \
+        sed -i '/^build-options:/a\  no-debuginfo: true\n  strip: true' \
+          scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml
+      shell: bash
+    - name: Inject git commit hash into Flatpak manifest
+      run: |
+        sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n    build-options:\n      env:\n        git_commit_hash: \"$git_commit_hash\"|}" \
          scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml
      shell: bash
    - uses: flatpak/flatpak-github-actions/flatpak-builder@master
@@ -219,3 +224,4 @@ jobs:
        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
        asset_content_type: application/octet-stream
        max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+
--- a/.github/workflows/check_profiles.yml
+++ b/.github/workflows/check_profiles.yml
@@ -15,12 +15,11 @@ on:
        default: 'warning'

 permissions:
-  pull-requests: write
  contents: read


 jobs:
-  check_translation:
+  check_profiles:
    name: Check profiles
    runs-on: ubuntu-24.04
    steps:
@@ -62,11 +61,11 @@ jobs:
          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_custom.log
          exit ${PIPESTATUS[0]}

-      - name: Post error comment on PR
+      - name: Prepare comment artifact
        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
-        env:
-          GH_TOKEN: ${{ github.token }}
        run: |
+          mkdir -p ${{ runner.temp }}/profile-check-results
+
          {
            echo "## :x: Profile Validation Errors"
            echo ""
@@ -100,16 +99,20 @@ jobs:

            echo "---"
            echo "*Please fix the above errors and push a new commit.*"
-          } > ${{ runner.temp }}/pr_comment.md
+          } > ${{ runner.temp }}/profile-check-results/pr_comment.md

-          gh pr comment ${{ github.event.pull_request.number }} --body-file ${{ runner.temp }}/pr_comment.md
+          echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
+
+      - name: Upload comment artifact
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: profile-check-results
+          path: ${{ runner.temp }}/profile-check-results/
+          retention-days: 1

      - name: Fail if any check failed
        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
        run: |
          echo "One or more profile checks failed. See above for details."
          exit 1
-
-
-
-
--- a/.github/workflows/check_profiles_comment.yml
+++ b/.github/workflows/check_profiles_comment.yml
@@ -0,0 +1,46 @@
+name: Post profile check comment
+
+# NOTE: The workflow name in the 'workflows' filter below must match the 'name'
+# field in check_profiles.yml exactly. If that name changes, update it here too.
+on:
+  workflow_run:
+    workflows: ["Check profiles"]
+    types:
+      - completed
+
+permissions:
+  pull-requests: write
+
+jobs:
+  post_comment:
+    name: Post PR comment
+    runs-on: ubuntu-24.04
+    if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - name: Download artifact
+        id: download
+        uses: actions/download-artifact@v4
+        continue-on-error: true
+        with:
+          name: profile-check-results
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ github.token }}
+
+      - name: Post comment on PR
+        if: ${{ steps.download.outcome == 'success' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          if [ ! -f pr_number.txt ] || [ ! -f pr_comment.md ]; then
+            echo "No comment artifact found, skipping."
+            exit 0
+          fi
+
+          PR_NUMBER=$(cat pr_number.txt)
+          if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
+            echo "Invalid PR number: $PR_NUMBER"
+            exit 1
+          fi
+
+          gh pr comment "$PR_NUMBER" --body-file pr_comment.md
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ test.js
 /.cache/
 .clangd
 internal_docs/
+*.flatpak
+/flatpak-repo/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,10 +89,9 @@ else ()
 endif ()

 find_package(Git)
-if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
-        message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
-
+if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
+    message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
+    if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
        # Convert the given hash to short hash
        execute_process(
            COMMAND ${GIT_EXECUTABLE} rev-parse --short "$ENV{git_commit_hash}"
@@ -100,17 +99,20 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
            OUTPUT_VARIABLE GIT_COMMIT_HASH
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )
-        add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
    else()
-        # Check current Git commit hash
-        execute_process(
-            COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            OUTPUT_VARIABLE GIT_COMMIT_HASH
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-        add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+        # No .git directory (e.g., Flatpak sandbox) — truncate directly
+        string(SUBSTRING "$ENV{git_commit_hash}" 0 7 GIT_COMMIT_HASH)
    endif()
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
+elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    # Check current Git commit hash
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
 endif()

 if(DEFINED ENV{SLIC3R_STATIC})
@@ -171,10 +173,7 @@ option(BUILD_TESTS       "Build unit tests" OFF)
 option(ORCA_TOOLS       "Build Orca tools" OFF)

 if (FLATPAK)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20")
-    set(SLIC3R_PCH OFF CACHE BOOL "" FORCE)
    set(SLIC3R_FHS ON CACHE BOOL "" FORCE)
-    set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
    set(SLIC3R_DESKTOP_INTEGRATION OFF CACHE BOOL "" FORCE)
 endif ()

@@ -455,9 +454,12 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
        add_compile_options(-Wno-unknown-pragmas)
    endif()

-    # Bit of a hack for flatpak building: compress the debug info with zstd to save space in CI
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
-        add_compile_options(-gz=zstd)
+    # Compress the debug info with zstd to save space in Flatpak CI builds
+    if(FLATPAK)
+        if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0) OR
+           ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0))
+            add_compile_options(-gz=zstd)
+        endif()
    endif()

    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
@@ -491,7 +493,8 @@ if (APPLE)
 endif ()

 if(MSVC)
-# 添加编译选项，忽略警告 C4305 （格式转换截断）
+# Ignore truncating casts in initializers & constructors
+# https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4305
 add_compile_options(/wd4305)
 endif()

--- a/build_flatpak.sh
+++ b/build_flatpak.sh
@@ -198,22 +198,22 @@ echo -e "${GREEN}All required dependencies found${NC}"
 # Install runtime and SDK if requested
 if [[ "$INSTALL_RUNTIME" == true ]]; then
    echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}"
-    flatpak install --user -y flathub org.gnome.Platform//48
-    flatpak install --user -y flathub org.gnome.Sdk//48
+    flatpak install --user -y flathub org.gnome.Platform//49
+    flatpak install --user -y flathub org.gnome.Sdk//49
 fi

 # Check if required runtime is available
-if ! flatpak info --user org.gnome.Platform//48 &> /dev/null; then
-    echo -e "${RED}Error: GNOME Platform 48 runtime is not installed.${NC}"
+if ! flatpak info --user org.gnome.Platform//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME Platform 49 runtime is not installed.${NC}"
    echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Platform//48"
+    echo "flatpak install --user flathub org.gnome.Platform//49"
    exit 1
 fi

-if ! flatpak info --user org.gnome.Sdk//48 &> /dev/null; then
-    echo -e "${RED}Error: GNOME SDK 48 is not installed.${NC}"
+if ! flatpak info --user org.gnome.Sdk//49 &> /dev/null; then
+    echo -e "${RED}Error: GNOME SDK 49 is not installed.${NC}"
    echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Sdk//48"
+    echo "flatpak install --user flathub org.gnome.Sdk//49"
    exit 1
 fi

@@ -318,7 +318,7 @@ fi
 MANIFEST="scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml"
 if [[ "$NO_DEBUGINFO" == true ]]; then
    MANIFEST="scripts/flatpak/io.github.orcaslicer.OrcaSlicer.no-debug.yml"
-    sed '0,/^finish-args:/s//build-options:\n  no-debuginfo: true\n  strip: true\nfinish-args:/' \
+    sed '/^build-options:/a\  no-debuginfo: true\n  strip: true' \
        scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml > "$MANIFEST"
    echo -e "${YELLOW}Debug info disabled (using temp manifest)${NC}"
 fi
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -189,6 +189,9 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
            -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
            -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
+            -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
+            -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
            -DBUILD_SHARED_LIBS:BOOL=OFF
            ${_cmake_osx_arch}
            "${_configs_line}"
--- a/deps/TBB/TBB.cmake
+++ b/deps/TBB/TBB.cmake
@@ -1,4 +1,4 @@
-if (FLATPAK)
+if (FLATPAK AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake)
 else()
    set(_patch_command "")
--- a/localization/i18n/OrcaSlicer.pot
+++ b/localization/i18n/OrcaSlicer.pot
@@ -13699,7 +13699,7 @@ msgstr ""
 msgid "Topmost surface"
 msgstr ""

-msgid "All solid layer"
+msgid "All solid layers"
 msgstr ""

 msgid "Ironing Pattern"
@@ -14125,7 +14125,7 @@ msgid ""
 "conical material. A value of 0 will fill all the holes in the model base."
 msgstr ""

-msgid "Detect overhang wall"
+msgid "Detect overhang walls"
 msgstr ""

 #, possible-c-format, possible-boost-format
@@ -14675,7 +14675,7 @@ msgid "Minimum sparse infill threshold"
 msgstr ""

 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""

@@ -15281,12 +15281,12 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr ""

-msgid "Detect thin wall"
+msgid "Detect thin walls"
 msgstr ""

 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""

 msgid ""
@@ -15748,7 +15748,7 @@ msgid ""
 "itself. It's expressed as a percentage over nozzle diameter."
 msgstr ""

-msgid "Detect narrow internal solid infill"
+msgid "Detect narrow internal solid infills"
 msgstr ""

 msgid ""
--- a/localization/i18n/ca/OrcaSlicer_ca.po
+++ b/localization/i18n/ca/OrcaSlicer_ca.po
@@ -15335,7 +15335,8 @@ msgstr "Totes les superfícies superiors"
 msgid "Topmost surface"
 msgstr "Només la última superfície superior"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Tota la capa sòlida"

 msgid "Ironing Pattern"
@@ -15862,7 +15863,8 @@ msgstr ""
 "Àrea màxima d'un forat a la base del model abans que s'ompli amb material "
 "cònic. Un valor de 0 omplirà tots els forats de la base del model."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Detectar voladís de perímetre"

 #, c-format, boost-format
@@ -16560,8 +16562,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Llindar mínim de farciment poc dens"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "L'àrea de farciment poc dens que sigui més petita que el valor del llindar "
@@ -17321,12 +17324,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Temperatura del broquet per les capes després de l'inicial"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Detectar perímetres prims"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Detecta un perímetre prim que no pugui contenir dues línies d'amplada. I "
 "utilitzar una sola línia per imprimir. Potser no s'imprimeix gaire bé, "
@@ -17940,7 +17945,8 @@ msgstr ""
 "fina que el gruix de l'element el perímetre esdevindrà tan gruixut com el "
 "propi element. S'expressa en percentatge sobre el diàmetre del broquet"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Detectar de farciment sòlid intern estret"

 msgid ""
--- a/localization/i18n/cs/OrcaSlicer_cs.po
+++ b/localization/i18n/cs/OrcaSlicer_cs.po
@@ -14975,7 +14975,8 @@ msgstr "Horní povrchy"
 msgid "Topmost surface"
 msgstr "Nejvyšší povrch"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Všechny pevné vrstvy"

 msgid "Ironing Pattern"
@@ -15464,7 +15465,8 @@ msgstr ""
 "Maximální plocha otvoru ve spodní části modelu, než bude vyplněn kuželovitým "
 "materiálem. Hodnota 0 vyplní všechny otvory ve spodní části modelu."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Detekovat převislou stěnu"

 #, c-format, boost-format
@@ -16143,8 +16145,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Minimální práh řídké výplně"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Oblast řídké výplně menší než prahová hodnota bude nahrazena vnitřní plnou "
@@ -16867,12 +16870,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Teplota trysky pro vrstvy po úvodní vrstvě."

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Detekovat tenkou stěnu"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Detekovat tenkou stěnu, do které se nevejdou dvě šířky čáry. A použít pro "
 "tisk pouze jednu čáru. Tisk nemusí být zcela kvalitní, protože nejde o "
@@ -17476,7 +17481,8 @@ msgstr ""
 "modelu. Pokud je minimální šířka stěny menší než tloušťka prvku, bude stěna "
 "tak silná, jako je samotný prvek. Je vyjádřena jako procento průměru trysky."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Detekovat úzkou vnitřní plnou výplň"

 msgid ""
--- a/localization/i18n/de/OrcaSlicer_de.po
+++ b/localization/i18n/de/OrcaSlicer_de.po
@@ -16128,7 +16128,8 @@ msgstr "Obere Oberflächen"
 msgid "Topmost surface"
 msgstr "Oberste Oberfläche"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Alle soliden Schichten"

 msgid "Ironing Pattern"
@@ -16661,7 +16662,8 @@ msgstr ""
 "konischem Material gefüllt wird. Ein Wert von 0 füllt alle Löcher in der "
 "Basis des Modells."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Erkennen von Wandüberhängen"

 #, c-format, boost-format
@@ -17370,8 +17372,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Mindestschwelle für Füllung"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Innere Füllbereiche, die kleiner als dieser Wert sind, werden durch massive "
@@ -18165,12 +18168,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Düsentemperatur nach der ersten Schicht"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Dünne Wand erkennen"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Erkennt dünne Wände, die keine zwei Linienbreiten enthalten können. Und "
 "verwendet eine einzelne Linie zum Drucken. Diese wird vielleicht nicht sehr "
@@ -18823,7 +18828,8 @@ msgstr ""
 "Dicke des Features, wird die Wand so dick wie das Feature selbst. Wird als "
 "Prozentsatz des Düsendurchmessers angegeben."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Erkennen einer schmalen internen soliden Füllung"

 msgid ""
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
@@ -14006,8 +14006,8 @@ msgstr "All top surfaces"
 msgid "Topmost surface"
 msgstr "Topmost surface only"

-msgid "All solid layer"
-msgstr "All solid layers"
+msgid "All solid layers"
+msgstr ""

 msgid "Ironing Pattern"
 msgstr ""
@@ -14444,8 +14444,8 @@ msgid ""
 "conical material. A value of 0 will fill all the holes in the model base."
 msgstr ""

-msgid "Detect overhang wall"
-msgstr "Detect overhang walls"
+msgid "Detect overhang walls"
+msgstr ""

 #, c-format, boost-format
 msgid ""
@@ -15008,7 +15008,7 @@ msgid "Minimum sparse infill threshold"
 msgstr ""

 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Sparse infill areas which are smaller than this threshold value are replaced "
@@ -15641,12 +15641,12 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Nozzle temperature after the first layer"

-msgid "Detect thin wall"
-msgstr "Detect thin walls"
+msgid "Detect thin walls"
+msgstr ""

 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "This detects thin walls which can’t contain two lines and uses a single line "
 "to print. It may not print as well because it’s not a closed loop."
@@ -16148,7 +16148,7 @@ msgid ""
 "itself. It's expressed as a percentage over nozzle diameter."
 msgstr ""

-msgid "Detect narrow internal solid infill"
+msgid "Detect narrow internal solid infills"
 msgstr ""

 msgid ""
@@ -16170,7 +16170,7 @@ msgid " not in range "
 msgstr ""

 msgid "Export 3MF"
-msgstr "Export 3mf"
+msgstr ""

 msgid "Export project as 3MF."
 msgstr "This exports the project as a 3MF file."
--- a/localization/i18n/es/OrcaSlicer_es.po
+++ b/localization/i18n/es/OrcaSlicer_es.po
@@ -16065,7 +16065,8 @@ msgstr "Todas las superficies superiores"
 msgid "Topmost surface"
 msgstr "Sólo la superficie superior"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Todas la capas sólidas"

 msgid "Ironing Pattern"
@@ -16617,7 +16618,7 @@ msgstr ""
 "material cónico. El valor 0 llenará todos los orificios en la base del "
 "modelo."

-msgid "Detect overhang wall"
+msgid "Detect overhang walls"
 msgstr "Detectar perímetros en voladizo"

 #, c-format, boost-format
@@ -17325,8 +17326,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Umbral de área mínima de relleno de baja densidad"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "El área de relleno de baja densidad que es menor que este valor de umbral se "
@@ -18117,12 +18119,12 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Temperatura de la boquilla después de la primera capa."

-msgid "Detect thin wall"
+msgid "Detect thin walls"
 msgstr "Detección de perímetros delgados"

 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Detectar los perímetros delgados que no pueden contener dos líneas de ancho, "
 "y utilizar una sola línea para imprimir. Tal vez no se imprima muy bien, "
@@ -18777,7 +18779,8 @@ msgstr ""
 "propia característica. Se expresa en porcentaje en base al diámetro de la "
 "boquilla."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Detección de relleno interno estrecho"

 msgid ""
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
@@ -15465,7 +15465,8 @@ msgstr "Surfaces supérieures"
 msgid "Topmost surface"
 msgstr "Surface la plus élevée"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Toutes les couches pleines"

 msgid "Ironing Pattern"
@@ -16001,7 +16002,8 @@ msgstr ""
 "par un matériau conique. Une valeur de 0 remplira tous les trous dans la "
 "base du modèle."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Détecter une paroi en surplomb"

 #, c-format, boost-format
@@ -16704,8 +16706,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Seuil minimum de remplissage"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "La zone de remplissage inférieure à la valeur seuil est remplacée par un "
@@ -17475,12 +17478,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Température de la buse pour les couches après la première"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Détecter les parois fines"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Détecte les parois fines qui ne peuvent pas contenir deux largeurs de ligne. "
 "Et utilisez une seule ligne pour imprimer. Peut ne pas être très bien "
@@ -18098,7 +18103,8 @@ msgstr ""
 "l'élément lui-même. Elle est exprimée en pourcentage par rapport au diamètre "
 "de la buse"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Détecter un remplissage plein interne étroit"

 msgid ""
--- a/localization/i18n/hu/OrcaSlicer_hu.po
+++ b/localization/i18n/hu/OrcaSlicer_hu.po
@@ -15675,7 +15675,8 @@ msgstr "Felső felületek"
 msgid "Topmost surface"
 msgstr "Legfelső felület"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Összes szilárd réteg"

 msgid "Ironing Pattern"
@@ -16205,7 +16206,8 @@ msgstr ""
 "A modell alján lévő lyuk maximális területe, mielőtt kúpos anyag töltené "
 "ki. A 0 érték a modellalap összes lyukát kitölti."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Túlnyúló fal felismerése"

 #, c-format, boost-format
@@ -16902,8 +16904,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Ritkás kitöltés küszöbértéke"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "A küszöbérték alatti ritkás kitöltési terület belső szilárd kitöltéssel "
@@ -17680,12 +17683,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Fúvóka hőmérséklete az első réteg után"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Vékony fal felismerése"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Felismeri a vékony falat, amit nem lehet két vonalnyi szélességgel "
 "nyomtatni, és egyetlen vonallal nyomtatja"
@@ -18319,7 +18324,8 @@ msgstr ""
 "mint a nyomtatandó elem vastagsága, akkor a fal olyan vastag lesz, mint maga "
 "a nyomtatott elem. A fúvóka átmérőjének százalékában van kifejezve"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Keskeny belső szilárd kitöltés felismerése"

 msgid ""
--- a/localization/i18n/it/OrcaSlicer_it.po
+++ b/localization/i18n/it/OrcaSlicer_it.po
@@ -15411,7 +15411,7 @@ msgstr "Superfici superiori"
 msgid "Topmost surface"
 msgstr "Superficie superiore più alta"

-msgid "All solid layer"
+msgid "All solid layers"
 msgstr "Tutti gli strati solidi"

 msgid "Ironing Pattern"
@@ -15945,7 +15945,8 @@ msgstr ""
 "una forma conica. Un valore pari a 0 riempirà tutti i fori nella base del "
 "modello."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Rileva parete sporgente"

 #, c-format, boost-format
@@ -16651,8 +16652,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Soglia minima riempimento sparso"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "L'area del riempimento sparso che è inferiore al valore di soglia, viene "
@@ -17422,12 +17424,13 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Temperatura dell'ugello per gli strati successivi a quello iniziale."

-msgid "Detect thin wall"
+msgid "Detect thin walls"
 msgstr "Rileva pareti sottili"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Rileva le pareti sottili che non possono contenere due linee di larghezza, "
 "utilizzandone quindi una sola per la stampa. Potrebbe non essere stampato "
@@ -18044,7 +18047,8 @@ msgstr ""
 "spessa quanto l'elemento stesso. Questo valore è espresso come percentuale "
 "rispetto al diametro dell'ugello."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Rileva riempimento solido interno stretto"

 msgid ""
--- a/localization/i18n/ja/OrcaSlicer_ja.po
+++ b/localization/i18n/ja/OrcaSlicer_ja.po
@@ -14082,7 +14082,8 @@ msgstr "全てのトップ面"
 msgid "Topmost surface"
 msgstr "最上部のみ"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "全てのソリッド積層"

 msgid "Ironing Pattern"
@@ -14525,7 +14526,8 @@ msgid ""
 "conical material. A value of 0 will fill all the holes in the model base."
 msgstr ""

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "オーバーハングを検出"

 #, c-format, boost-format
@@ -15097,8 +15099,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "スパース インフィルの下閾値"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "スパース インフィルの面積がこの値以下の場合、ソリッド インフィルに変換されま"
@@ -15743,12 +15746,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "1層目後のノズル温度"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "薄い壁を検出"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "2ラインの入らない薄い壁面を検出し、1ラインで造形します。仕上がりが悪くなり可"
 "能性があります。"
@@ -16251,7 +16256,8 @@ msgid ""
 "itself. It's expressed as a percentage over nozzle diameter."
 msgstr ""

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "薄いソリッド インフィル検出"

 msgid ""
--- a/localization/i18n/ko/OrcaSlicer_ko.po
+++ b/localization/i18n/ko/OrcaSlicer_ko.po
@@ -14809,7 +14809,8 @@ msgstr "상단 표면"
 msgid "Topmost surface"
 msgstr "최상단 표면"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "모든 꽉찬 레이어"

 msgid "Ironing Pattern"
@@ -15303,7 +15304,8 @@ msgstr ""
 "원뿔형 재료로 채워지기 전에 모델 베이스에 있는 구멍의 최대 면적입니다. 값이 0"
 "이면 모델 베이스의 모든 구멍이 채워집니다."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "오버행 벽 감지"

 #, c-format, boost-format
@@ -15962,8 +15964,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "최소 드문 채우기 임계값"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr "임계값보다 작은 드문 채우기 영역은 꽉찬 내부 채우기로 대체됩니다"

@@ -16671,12 +16674,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "초기 레이어 이후의 노즐 온도"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "얇은 벽 감지"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "두개의 선 너비를 포함할 수 없는 얇은 벽을 감지합니다. 그리고 한 선으로 출력합"
 "니다. 폐쇄 루프가 아니기 때문에 출력이 잘 되지 않을 수 있습니다"
@@ -17246,7 +17251,8 @@ msgstr ""
 "비가 형상의 두께보다 얇은 경우 벽은 형상 자체만큼 두꺼워집니다. 노즐 직경에 "
 "대한 백분율로 표시됩니다"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "좁은 꽉찬 내부 채우기 감지"

 msgid ""
--- a/localization/i18n/lt/OrcaSlicer_lt.po
+++ b/localization/i18n/lt/OrcaSlicer_lt.po
@@ -15362,7 +15362,8 @@ msgstr "Viršutiniai paviršiai"
 msgid "Topmost surface"
 msgstr "Aukščiausias paviršius"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Visas vientisas sluoksnis"

 msgid "Ironing Pattern"
@@ -15891,7 +15892,8 @@ msgstr ""
 "Didžiausias modelio pagrindo skylės plotas prieš ją užpildant kūgine "
 "medžiaga. 0 reikšmė užpildys visas modelio pagrindo skyles."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Aptikti išsikišusią sieną"

 #, c-format, boost-format
@@ -16581,8 +16583,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Minimali reto užpildymo riba"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Reto užpildymo sritys, kurios yra mažesnės už šią ribinę vertę, pakeičiamos "
@@ -17342,12 +17345,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Po pradinio sluoksnio esančių sluoksnių purkštuko temperatūra."

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Aptikti plonas sieneles"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Aptikti ploną sienelę, kurioje negali būti dviejų eilučių pločio. "
 "Spausdinimui naudoti vieną liniją. Gali būti, kad nebus išspausdinta labai "
@@ -17975,7 +17980,8 @@ msgstr ""
 "siena taps tokio pat storio kaip ir pats elementas. Jis išreiškiamas "
 "procentais nuo purkštuko skersmens."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Aptikti siaurą vidinį vientisą užpildą"

 msgid ""
--- a/localization/i18n/nl/OrcaSlicer_nl.po
+++ b/localization/i18n/nl/OrcaSlicer_nl.po
@@ -14479,7 +14479,8 @@ msgstr "Alle bovenoppervlakken"
 msgid "Topmost surface"
 msgstr "Alleen het bovenste oppervlak"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Alle vaste lagen"

 msgid "Ironing Pattern"
@@ -14942,7 +14943,8 @@ msgid ""
 "conical material. A value of 0 will fill all the holes in the model base."
 msgstr ""

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Overhange wand detecteren"

 #, c-format, boost-format
@@ -15538,8 +15540,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Minimale drempel voor dunne opvulling (infill)"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Dunne opvullingen (infill) die kleiner zijn dan deze drempelwaarde worden "
@@ -16216,12 +16219,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Mondstuk temperatuur voor de lagen na de eerste laag"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Detecteer dunne wanden"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Dit detecteert dunne wanden die geen twee lijnen kunnen bevatten en gebruikt "
 "een enkele lijn tijdens het printen. Het kan zijn dat de kwaliteit minder "
@@ -16772,7 +16777,8 @@ msgstr ""
 "van het element, wordt de muur net zo dik als het object zelf. Dit wordt "
 "uitgedrukt als een percentage ten opzichte van de diameter van het mondstuk"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Detecteer dichte interne solide vulling (infill)"

 msgid ""
--- a/localization/i18n/pl/OrcaSlicer_pl.po
+++ b/localization/i18n/pl/OrcaSlicer_pl.po
@@ -15262,7 +15262,8 @@ msgstr "Górne powierzchnie"
 msgid "Topmost surface"
 msgstr "Tylko ostatnia warstwa"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Wszystkie jednolite warstwy"

 msgid "Ironing Pattern"
@@ -15789,7 +15790,8 @@ msgstr ""
 "Maksymalna powierzchnia otworu w podstawie modelu przed jego wypełnieniem "
 "materiałem stożkowym. Wartość 0 wypełni wszystkie otwory w podstawie modelu."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Wykrywanie ścian nawisu"

 #, c-format, boost-format
@@ -16486,8 +16488,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Minimalny próg wypełnienia"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Obszar wypełnienia, który jest mniejszy od wartości progowej zostaje "
@@ -17239,12 +17242,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Temperatura dyszy dla warstw po początkowej"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Wykrywanie cienkich ścian"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Wykrywaj ściany o grubości jednego obrysu. Są to obszary, gdzie 2 obrysy nie "
 "zmieszczą się i trzeba będzie połączyć je w jedną linię"
@@ -17850,7 +17855,8 @@ msgstr ""
 "grubość detalu, obrys będzie miał taką samą grubość jak sam element. Jest "
 "wyrażona w procentach i zostanie obliczona na podstawie średnicy dyszy."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Wykryj wąskie wewnętrzne pełne wypełnienie"

 msgid ""
--- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
@@ -15957,7 +15957,7 @@ msgstr "Superfícies superiores"
 msgid "Topmost surface"
 msgstr "Superfície superior mais alta"

-msgid "All solid layer"
+msgid "All solid layers"
 msgstr "Todas as camadas sólidas"

 msgid "Ironing Pattern"
@@ -16497,7 +16497,7 @@ msgstr ""
 "Área maxima de um furo na base do modelo antes que ele seja preenchido por "
 "uma forma cônica. Um valor 0 irá preencher todos os furos do modelo."

-msgid "Detect overhang wall"
+msgid "Detect overhang walls"
 msgstr "Detectar paredes salientes"

 #, c-format, boost-format
@@ -17197,11 +17197,11 @@ msgid "Minimum sparse infill threshold"
 msgstr "Limiar mínimo de preenchimento esparso"

 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
-"A área de preenchimento esparso que é menor que o valor limiar é substituída "
-"por preenchimento sólido interno."
+"Áreas de preenchimento esparso menores que este valor limiar são "
+"substituídas por preenchimento sólido interno."

 msgid "Solid infill"
 msgstr "Preenchimento sólido"
@@ -17980,15 +17980,15 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Temperatura do bico para camadas após a inicial."

-msgid "Detect thin wall"
-msgstr "Detectar parede fina"
+msgid "Detect thin walls"
+msgstr "Detectar paredes finas"

 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
-"Detecta paredes finas que não podem conter duas larguras de linha. E usa uma "
-"linha única para imprimir. Talvez seja impresso não muito bem, porque não é "
+"Detecta paredes finas que não podem conter duas larguras de linha, e usa uma "
+"linha única para imprimir. Talvez não seja impresso muito bem, porque não é "
 "uma volta fechada."

 msgid ""
@@ -18625,8 +18625,8 @@ msgstr ""
 "do que a espessura do elemento, a parede será tão espesso quanto o próprio "
 "elemento. É expresso como uma porcentagem sobre o diâmetro do bico."

-msgid "Detect narrow internal solid infill"
-msgstr "Detectar preenchimento sólido interno estreito"
+msgid "Detect narrow internal solid infills"
+msgstr "Detectar preenchimentos sólidos internos estreitos"

 msgid ""
 "This option will auto-detect narrow internal solid infill areas. If enabled, "
--- a/localization/i18n/ru/OrcaSlicer_ru.po
+++ b/localization/i18n/ru/OrcaSlicer_ru.po
@@ -16035,7 +16035,8 @@ msgstr "Поверхности"
 msgid "Topmost surface"
 msgstr "Верхний слой"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Сплошные слои"

 msgid "Ironing Pattern"
@@ -16589,7 +16590,8 @@ msgstr ""
 "материалом конической геометрии. При 0 все отверстия в основании модели "
 "будут заполнены."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Обнаруживать нависающие периметры"

 #, c-format, boost-format
@@ -17327,8 +17329,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Заполнять области менее"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Заполнять целиком области внутри слоя с площадью меньше указанного значения."
@@ -18167,12 +18170,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Температура при печати последующих слоёв."

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Обнаруживать тонкие стенки"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Обнаруживать стенки, которые можно напечатать только в одну линию. Возможно, "
 "будет напечатано не очень хорошо, так как это разомкнутый контур.\n"
@@ -18852,7 +18857,8 @@ msgstr ""
 "подогнана под размер элемента, если значение этого параметра меньше его "
 "ширины. Можно указать процент от диаметра сопла."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Оптимизация заполнения узких мест"

 msgid ""
--- a/localization/i18n/sv/OrcaSlicer_sv.po
+++ b/localization/i18n/sv/OrcaSlicer_sv.po
@@ -14263,7 +14263,8 @@ msgstr "Top ytor"
 msgid "Topmost surface"
 msgstr "Endast högsta ytan"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Alla solida lager"

 msgid "Ironing Pattern"
@@ -14704,7 +14705,8 @@ msgid ""
 "conical material. A value of 0 will fill all the holes in the model base."
 msgstr ""

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Upptäck överhängs vägg"

 #, c-format, boost-format
@@ -15283,8 +15285,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Min sparsam ifyllnads gräns"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Sparsam ifyllnads ytor som är mindre än detta gränsvärde ersätts med inre "
@@ -15939,12 +15942,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Nozzel temperatur efter första lager"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Upptäck tunna väggar"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Upptäck tunna väggar som inte kan ha två linjer och använder en linje för "
 "att skrivas ut. Utskrifts kvaliteten begränsas efter som det inte är en "
@@ -16472,7 +16477,8 @@ msgstr ""
 "elementet blir väggen lika tjock som själva elementet. Den uttrycks i "
 "procent av nozzel diametern."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Upptäck tight inre solid ifyllnad"

 msgid ""
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
@@ -15259,7 +15259,8 @@ msgstr "Üst yüzeyler"
 msgid "Topmost surface"
 msgstr "En üst yüzey"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Tamamı katı katman"

 msgid "Ironing Pattern"
@@ -15787,7 +15788,8 @@ msgstr ""
 "Modelin tabanındaki bir deliğin, konik malzemeyle doldurulmadan önce "
 "maksimum alanı. 0 değeri, model tabanındaki tüm delikleri dolduracaktır."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Çıkıntılı duvarı algıla"

 #, c-format, boost-format
@@ -16482,8 +16484,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Minimum seyrek dolgu"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Eşik değerinden küçük olan seyrek dolgu alanı, yerini iç katı dolguya "
@@ -17237,12 +17240,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "İlk katmandan sonraki katmanlar için nozul sıcaklığı."

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "İnce duvarı algıla"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "İki çizgi genişliğini içeremeyen ince duvarı tespit edin. Ve yazdırmak için "
 "tek satır kullanın. Kapalı döngü olmadığından pek iyi basılmamış olabilir."
@@ -17867,7 +17872,8 @@ msgstr ""
 "duvar, özelliğin kendisi kadar kalın olacaktır. Nozul çapına göre yüzde "
 "olarak ifade edilir."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Dar iç katı dolguyu tespit et"

 msgid ""
--- a/localization/i18n/uk/OrcaSlicer_uk.po
+++ b/localization/i18n/uk/OrcaSlicer_uk.po
@@ -15263,7 +15263,8 @@ msgstr "Верхові поверхні"
 msgid "Topmost surface"
 msgstr "Найвища поверхня"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Весь суцільний шар"

 msgid "Ironing Pattern"
@@ -15780,7 +15781,8 @@ msgstr ""
 "Максимальна площа отвору в основі моделі перед заповненням його конічним "
 "матеріалом. Значення 0 заповнює всі отвори в основі моделі."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Виявлення стінок що нависають"

 #, c-format, boost-format
@@ -16468,8 +16470,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Мінімальний поріг часткового заповнення"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Ділянки часткового заповнення, менші за порогове значення, замінюються "
@@ -17212,12 +17215,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Температура сопла для шарів після першого"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Виявлення тонкої стінки"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Виявляти тонкі стінки, товщина яких менше ніж ширина двох ліній і "
 "використовувати лише одну лінію для друку. Можуть бути надруковані не дуже "
@@ -17815,7 +17820,8 @@ msgstr ""
 "елемента, то товщина периметра дорівнюватиме товщині самого елемента. Він "
 "виражається у відсотках від діаметра сопла"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Виявлення вузького внутрішнього суцільного заповнення"

 msgid ""
--- a/localization/i18n/vi/OrcaSlicer_vi.po
+++ b/localization/i18n/vi/OrcaSlicer_vi.po
@@ -15026,7 +15026,8 @@ msgstr "Bề mặt trên"
 msgid "Topmost surface"
 msgstr "Bề mặt trên cùng"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "Tất cả lớp đặc"

 msgid "Ironing Pattern"
@@ -15542,7 +15543,8 @@ msgstr ""
 "Diện tích tối đa của lỗ ở đáy model trước khi nó được lấp bởi vật liệu hình "
 "nón. Giá trị 0 sẽ lấp tất cả các lỗ ở đáy model."

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "Phát hiện thành nhô"

 #, c-format, boost-format
@@ -16213,8 +16215,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "Ngưỡng infill thưa tối thiểu"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr ""
 "Vùng infill thưa nhỏ hơn giá trị ngưỡng được thay thế bằng infill đặc bên "
@@ -16948,12 +16951,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "Nhiệt độ đầu phun cho các lớp sau lớp đầu tiên."

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "Phát hiện thành mỏng"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "Phát hiện thành mỏng không thể chứa hai độ rộng đường. Và sử dụng đường đơn "
 "để in. Có thể in không tốt lắm, vì nó không phải vòng kín."
@@ -17560,7 +17565,8 @@ msgstr ""
 "thành sẽ trở nên dày như tính năng đó. Nó được biểu thị dưới dạng phần trăm "
 "trên đường kính đầu phun."

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "Phát hiện infill đặc bên trong hẹp"

 msgid ""
--- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
+++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
@@ -14570,7 +14570,8 @@ msgstr "顶面"
 msgid "Topmost surface"
 msgstr "最顶面"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "所有实心层"

 msgid "Ironing Pattern"
@@ -15044,7 +15045,8 @@ msgstr ""
 "模型底部的孔洞在被圆锥形材料填充前所允许的最大面积。值为0将填充模型底部的所有"
 "孔洞。"

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "识别悬垂外墙"

 #, c-format, boost-format
@@ -15654,8 +15656,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "稀疏填充最小阈值"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr "小于这个阈值的稀疏填充区域将会被内部实心填充替代。"

@@ -16342,12 +16345,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "除首层外的其它层的喷嘴温度"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "检查薄壁"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "检查无法容纳两条走线的薄壁。使用单条走线打印。可能会打地不是很好，因为走线不"
 "再闭合。"
@@ -16910,7 +16915,8 @@ msgstr ""
 "用于替换模型上的细小特征（根据最小特征尺寸决定）的墙线宽。如果最小墙宽度小于"
 "最小特征宽度，则墙将变得和特征本身一样厚。本设置以喷嘴直径的百分比表示。"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "识别狭窄的内部实心填充"

 msgid ""
--- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
+++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
@@ -14694,7 +14694,8 @@ msgstr "頂面"
 msgid "Topmost surface"
 msgstr "最頂面"

-msgid "All solid layer"
+#, fuzzy
+msgid "All solid layers"
 msgstr "所有實心層"

 msgid "Ironing Pattern"
@@ -15174,7 +15175,8 @@ msgstr ""
 "模型底部的孔洞在被圓錐形材料填充前所允許的最大面積。值為 0 將填充模型底部的所"
 "有孔洞。"

-msgid "Detect overhang wall"
+#, fuzzy
+msgid "Detect overhang walls"
 msgstr "檢測懸空外牆"

 #, c-format, boost-format
@@ -15786,8 +15788,9 @@ msgstr ""
 msgid "Minimum sparse infill threshold"
 msgstr "稀疏填充最小臨界值"

+#, fuzzy
 msgid ""
-"Sparse infill area which is smaller than threshold value is replaced by "
+"Sparse infill areas smaller than this threshold value are replaced by "
 "internal solid infill."
 msgstr "小於設定閾值的稀疏填充區域將替換為內部實心填充"

@@ -16482,12 +16485,14 @@ msgstr ""
 msgid "Nozzle temperature for layers after the initial one."
 msgstr "除首層外的其它層的噴嘴溫度"

-msgid "Detect thin wall"
+#, fuzzy
+msgid "Detect thin walls"
 msgstr "檢查薄壁"

+#, fuzzy
 msgid ""
-"Detect thin wall which can't contain two line width. And use single line to "
-"print. Maybe printed not very well, because it's not closed loop."
+"Detect thin walls which can't contain two line widths, and use single line "
+"to print. Maybe not printed very well, because it's not a closed loop."
 msgstr ""
 "檢查無法容納兩條走線的薄壁。使用單條走線列印。可能會打地不是很好，因為走線不"
 "再閉合"
@@ -17045,7 +17050,8 @@ msgstr ""
 "設定替代模型中細薄特徵（依據最小特徵尺寸）的牆體寬度。若最小牆寬小於特徵厚"
 "度，牆體將與特徵的厚度一致。此值以噴嘴直徑的百分比表示"

-msgid "Detect narrow internal solid infill"
+#, fuzzy
+msgid "Detect narrow internal solid infills"
 msgstr "識別狹窄內部實心填充"

 msgid ""
--- a/resources/profiles/Elegoo.json
+++ b/resources/profiles/Elegoo.json
@@ -86,6 +86,10 @@
            "name": "fdm_process_elegoo_common",
            "sub_path": "process/fdm_process_elegoo_common.json"
        },
+        {
+            "name": "fdm_process_elegoo_02010",
+            "sub_path": "process/fdm_process_elegoo_02010.json"
+        },
        {
            "name": "fdm_process_ecc",
            "sub_path": "process/ECC/fdm_process_ecc.json"
@@ -1104,6 +1108,10 @@
            "name": "fdm_filament_pla",
            "sub_path": "filament/fdm_filament_pla.json"
        },
+        {
+            "name": "fdm_filament_paht",
+            "sub_path": "filament/fdm_filament_paht.json"
+        },
        {
            "name": "Elegoo ASA @base",
            "sub_path": "filament/BASE/Elegoo ASA @base.json"
@@ -1136,6 +1144,26 @@
            "name": "Elegoo RAPID PLA+ @base",
            "sub_path": "filament/BASE/Elegoo RAPID PLA+ @base.json"
        },
+        {
+            "name": "Elegoo TPU @base",
+            "sub_path": "filament/BASE/Elegoo TPU @base.json"
+        },
+        {
+            "name": "Elegoo PETG @base",
+            "sub_path": "filament/BASE/Elegoo PETG @base.json"
+        },
+        {
+            "name": "Elegoo ABS @base",
+            "sub_path": "filament/BASE/Elegoo ABS @base.json"
+        },
+        {
+            "name": "Elegoo PAHT @base",
+            "sub_path": "filament/BASE/Elegoo PAHT @base.json"
+        },
+        {
+            "name": "Elegoo PC @base",
+            "sub_path": "filament/BASE/Elegoo PC @base.json"
+        },
        {
            "name": "Elegoo TPU 95A @base",
            "sub_path": "filament/BASE/Elegoo TPU 95A @base.json"
@@ -1172,6 +1200,10 @@
            "name": "Elegoo ASA @0.2 nozzle",
            "sub_path": "filament/ELEGOO/Elegoo ASA @0.2 nozzle.json"
        },
+        {
+            "name": "Elegoo PETG @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo PETG @0.2 nozzle.json"
+        },
        {
            "name": "Elegoo ASA @EC",
            "sub_path": "filament/EC/Elegoo ASA @EC.json"
@@ -1212,6 +1244,26 @@
            "name": "Elegoo RAPID PETG @0.2 nozzle",
            "sub_path": "filament/ELEGOO/Elegoo RAPID PETG @0.2 nozzle.json"
        },
+        {
+            "name": "Elegoo ABS @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo ABS @0.2 nozzle.json"
+        },
+        {
+            "name": "Elegoo PC @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo PC @0.2 nozzle.json"
+        },
+        {
+            "name": "Elegoo PC-FR @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo PC-FR @0.2 nozzle.json"
+        },
+        {
+            "name": "Elegoo PLA Basic @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo PLA Basic @0.2 nozzle.json"
+        },
+        {
+            "name": "Elegoo PETG Translucent @0.2 nozzle",
+            "sub_path": "filament/ELEGOO/Elegoo PETG Translucent @0.2 nozzle.json"
+        },
        {
            "name": "Elegoo RAPID PETG @EC",
            "sub_path": "filament/EC/Elegoo RAPID PETG @EC.json"
@@ -1368,6 +1420,66 @@
            "name": "Elegoo TPU 95A @ECC2",
            "sub_path": "filament/ECC2/Elegoo TPU 95A @ECC2.json"
        },
+        {
+            "name": "Elegoo PLA @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA @ECC2.json"
+        },
+        {
+            "name": "Elegoo PETG @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PETG @ECC2.json"
+        },
+        {
+            "name": "Elegoo ABS @ECC2",
+            "sub_path": "filament/ECC2/Elegoo ABS @ECC2.json"
+        },
+        {
+            "name": "Elegoo PLA Galaxy @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA Galaxy @ECC2.json"
+        },
+        {
+            "name": "Elegoo PLA Basic @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA Basic @ECC2.json"
+        },
+        {
+            "name": "Elegoo PLA Marble @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA Marble @ECC2.json"
+        },
+        {
+            "name": "Elegoo PLA Sparkle @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA Sparkle @ECC2.json"
+        },
+        {
+            "name": "Elegoo PLA Wood @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PLA Wood @ECC2.json"
+        },
+        {
+            "name": "Elegoo PAHT-CF @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PAHT-CF @ECC2.json"
+        },
+        {
+            "name": "Elegoo PC @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PC @ECC2.json"
+        },
+        {
+            "name": "Elegoo PC-FR @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PC-FR @ECC2.json"
+        },
+        {
+            "name": "Elegoo PETG-CF @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PETG-CF @ECC2.json"
+        },
+        {
+            "name": "Elegoo PETG-GF @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PETG-GF @ECC2.json"
+        },
+        {
+            "name": "Elegoo PETG Translucent @ECC2",
+            "sub_path": "filament/ECC2/Elegoo PETG Translucent @ECC2.json"
+        },
+        {
+            "name": "Elegoo RAPID TPU 95A @ECC2",
+            "sub_path": "filament/ECC2/Elegoo RAPID TPU 95A @ECC2.json"
+        },
        {
            "name": "Elegoo ASA @Elegoo Giga",
            "sub_path": "filament/EOSGIGA/Elegoo ASA @Elegoo Giga.json"
@@ -1575,4 +1687,4 @@
            "sub_path": "machine/ECC2/Elegoo Centauri Carbon 2 0.8 nozzle.json"
        }
    ]
-}
+}
--- a/resources/profiles/Elegoo/Elegoo
+++ b/resources/profiles/Elegoo/Elegoo
--- a/resources/profiles/Elegoo/filament/BASE/Elegoo
+++ b/resources/profiles/Elegoo/filament/BASE/Elegoo
@@ -0,0 +1,23 @@
+{
+    "type": "filament",
+    "name": "Elegoo ABS @base",
+    "inherits": "fdm_filament_abs",
+    "from": "system",
+    "filament_id": "EABSB00",
+    "instantiation": "false",
+    "filament_vendor": [
+        "Elegoo"
+    ],
+    "filament_density": [
+        "1.1"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "fan_cooling_layer_time": [
+        "35"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/BASE/Elegoo
+++ b/resources/profiles/Elegoo/filament/BASE/Elegoo
@@ -0,0 +1,23 @@
+{
+    "type": "filament",
+    "name": "Elegoo PAHT @base",
+    "inherits": "fdm_filament_paht",
+    "from": "system",
+    "filament_id": "EPAHTB00",
+    "instantiation": "false",
+    "filament_cost": [
+        "0"
+    ],
+    "filament_density": [
+        "1.25"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_vendor": [
+        "Elegoo"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/BASE/Elegoo
+++ b/resources/profiles/Elegoo/filament/BASE/Elegoo
@@ -0,0 +1,23 @@
+{
+    "type": "filament",
+    "name": "Elegoo PC @base",
+    "inherits": "fdm_filament_pc",
+    "from": "system",
+    "filament_id": "EPCB00",
+    "instantiation": "false",
+    "filament_cost": [
+        "0"
+    ],
+    "filament_density": [
+        "1.25"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_vendor": [
+        "Elegoo"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/BASE/Elegoo
+++ b/resources/profiles/Elegoo/filament/BASE/Elegoo
@@ -0,0 +1,83 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG @base",
+    "inherits": "fdm_filament_pet",
+    "from": "system",
+    "filament_id": "EPETGB00",
+    "instantiation": "false",
+    "cool_plate_temp": [
+        "0"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "0"
+    ],
+    "eng_plate_temp": [
+        "70"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "70"
+    ],
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "fan_max_speed": [
+        "40"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_cost": [
+        "0"
+    ],
+    "filament_density": [
+        "1.25"
+    ],
+    "filament_max_volumetric_speed": [
+        "8"
+    ],
+    "filament_vendor": [
+        "Elegoo"
+    ],
+    "hot_plate_temp": [
+        "70"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "70"
+    ],
+    "nozzle_temperature_range_high": [
+        "270"
+    ],
+    "nozzle_temperature_range_low": [
+        "230"
+    ],
+    "nozzle_temperature": [
+        "240"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "90"
+    ],
+    "overhang_fan_threshold": [
+        "10%"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "textured_plate_temp": [
+        "70"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "70"
+    ],
+    "filament_start_gcode": [
+        "; Filament start gcode\n"
+    ],
+    "filament_end_gcode": [
+        "; filament end gcode \n"
+    ],
+    "filament_type": [
+        "PETG"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/BASE/Elegoo
+++ b/resources/profiles/Elegoo/filament/BASE/Elegoo
@@ -0,0 +1,26 @@
+{
+    "type": "filament",
+    "name": "Elegoo TPU @base",
+    "inherits": "fdm_filament_tpu",
+    "from": "system",
+    "filament_id": "ETPUB00",
+    "instantiation": "false",
+    "filament_max_volumetric_speed": [
+        "3.6"
+    ],
+    "filament_vendor": [
+        "Elegoo"
+    ],
+    "filament_density": [
+        "1.21"
+    ],
+    "nozzle_temperature": [
+        "225"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "225"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,29 @@
+{
+    "type": "filament",
+    "name": "Elegoo ABS @ECC2",
+    "inherits": "Elegoo ABS @base",
+    "from": "system",
+    "setting_id": "EABSECC2",
+    "instantiation": "true",
+    "fan_max_speed": [
+        "40"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
+  
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,70 @@
+{
+    "type": "filament",
+    "name": "Elegoo PAHT-CF @ECC2",
+    "inherits": "Elegoo PAHT @base",
+    "from": "system",
+    "setting_id": "EPAHTCFECC2",
+    "instantiation": "true",
+    "close_fan_the_first_x_layers": [
+        "3"
+    ],
+    "fan_cooling_layer_time": [
+        "5"
+    ],
+    "fan_max_speed": [
+        "30"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_flow_ratio": [
+        "0.96"
+    ],
+    "filament_max_volumetric_speed": [
+        "8"
+    ],
+    "nozzle_temperature": [
+        "290"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "290"
+    ],
+    "nozzle_temperature_range_high": [
+        "290"
+    ],
+    "nozzle_temperature_range_low": [
+        "260"
+    ],
+    "overhang_fan_speed": [
+        "40"
+    ],
+    "overhang_fan_threshold": [
+        "0%"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "0"
+    ],
+    "slow_down_layer_time": [
+        "2"
+    ],
+    "slow_down_min_speed": [
+        "10"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,55 @@
+{
+    "type": "filament",
+    "name": "Elegoo PC @ECC2",
+    "inherits": "Elegoo PC @base",
+    "from": "system",
+    "setting_id": "EPCECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "nozzle_temperature_range_high": [
+        "270"
+    ],
+    "nozzle_temperature_range_low": [
+        "250"
+    ],
+    "overhang_fan_threshold": [
+        "25%"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "fan_max_speed": [
+        "35"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_start_gcode": [
+      "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,41 @@
+{
+    "type": "filament",
+    "name": "Elegoo PC-FR @ECC2",
+    "inherits": "Elegoo PC @base",
+    "from": "system",
+    "setting_id": "EPCFRECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "280"
+    ],
+    "nozzle_temperature_range_high": [
+        "290"
+    ],
+    "nozzle_temperature_range_low": [
+        "260"
+    ],
+    "slow_down_layer_time": [
+        "10"
+    ],
+    "fan_max_speed": [
+        "40"
+    ],
+    "filament_density": [
+		"1.1"
+	],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
+  
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,28 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG @ECC2",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETGECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "overhang_fan_threshold": [
+		"50%"
+	],
+    "nozzle_temperature": [
+        "250"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "250"
+    ],
+    "filament_max_volumetric_speed": [
+        "11"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo PETG PRO @ECC2",
-    "inherits": "Elegoo PETG PRO @base",
+    "inherits": "Elegoo PETG @base",
    "from": "system",
    "setting_id": "EPETGPROECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,28 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG Translucent @ECC2",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETGTRANSECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "fan_max_speed": [
+        "35"
+    ],
+    "filament_max_volumetric_speed": [
+        "10"
+    ],
+    "nozzle_temperature": [
+        "255"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "255"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,43 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG-CF @ECC2",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETGCFECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "nozzle_temperature": [
+        "250"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "250"
+    ],
+    "fan_max_speed": [
+        "40"
+    ],
+    "fan_min_speed": [
+        "5"
+    ],
+    "filament_max_volumetric_speed": [
+        "15"
+    ],
+    "nozzle_temperature_range_low": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "100"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,43 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG-GF @ECC2",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETGFECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "filament_density": [
+        "1.26"
+    ],
+    "nozzle_temperature": [
+        "250"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "250"
+    ],
+    "fan_max_speed": [
+        "40"
+    ],
+    "fan_min_speed": [
+        "5"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "nozzle_temperature_range_low": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "100"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLAECC2",
+    "instantiation": "true",
+    "filament_max_volumetric_speed": [
+      "21"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "210"
+    ],
+    "nozzle_temperature": [
+        "210"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+      "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,34 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Basic @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLABASICECC2",
+    "instantiation": "true",
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_high": [
+        "230"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Galaxy @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLAGALAXYECC2",
+    "instantiation": "true",
+    "fan_min_speed": [
+        "80"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_high": [
+        "220"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+      "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Marble @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLAMARBLEECC2",
+    "instantiation": "true",
+    "fan_min_speed": [
+        "80"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_high": [
+        "220"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo PLA Matte @ECC2",
-    "inherits": "Elegoo PLA Matte @base",
+    "inherits": "Elegoo PLA @base",
    "from": "system",
    "setting_id": "EPLAMECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo PLA Silk @ECC2",
-    "inherits": "Elegoo PLA Silk @base",
+    "inherits": "Elegoo PLA @base",
    "from": "system",
    "setting_id": "EPLASECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Sparkle @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLASPARKLEECC2",
+    "instantiation": "true",
+    "fan_min_speed": [
+        "80"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_high": [
+        "220"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Wood @ECC2",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLAWOODECC2",
+    "instantiation": "true",
+    "fan_min_speed": [
+        "80"
+    ],
+    "filament_max_volumetric_speed": [
+        "15"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_low": [
+        "200"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo PLA-CF @ECC2",
-    "inherits": "Elegoo PLA-CF @base",
+    "inherits": "Elegoo PLA @base",
    "from": "system",
    "setting_id": "EPLACFECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo RAPID PETG @ECC2",
-    "inherits": "Elegoo RAPID PETG @base",
+    "inherits": "Elegoo PETG @base",
    "from": "system",
    "setting_id": "ERPETGECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -0,0 +1,28 @@
+{
+    "type": "filament",
+    "name": "Elegoo RAPID TPU 95A @ECC2",
+    "inherits": "Elegoo TPU @base",
+    "from": "system",
+    "setting_id": "ERTPU95AECC2",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "230"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "230"
+    ],
+    "nozzle_temperature_range_high": [
+        "230"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri Carbon 2 0.4 nozzle",
+        "Elegoo Centauri Carbon 2 0.6 nozzle",
+        "Elegoo Centauri Carbon 2 0.8 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
    "type": "filament",
    "name": "Elegoo TPU 95A @ECC2",
-    "inherits": "Elegoo TPU 95A @base",
+    "inherits": "Elegoo TPU @base",
    "from": "system",
    "setting_id": "ETPU95AECC2",
    "instantiation": "true",
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,35 @@
+{
+    "type": "filament",
+    "name": "Elegoo ABS @0.2 nozzle",
+    "inherits": "Elegoo ABS @base",
+    "from": "system",
+    "setting_id": "EABS00020",
+    "instantiation": "true",
+    "fan_max_speed": [
+        "40"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,62 @@
+{
+    "type": "filament",
+    "name": "Elegoo PC @0.2 nozzle",
+    "inherits": "Elegoo PC @base",
+    "from": "system",
+    "setting_id": "EPC00020",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "nozzle_temperature_range_high": [
+        "270"
+    ],
+    "nozzle_temperature_range_low": [
+        "250"
+    ],
+    "overhang_fan_threshold": [
+        "25%"
+    ],
+    "slow_down_layer_time": [
+        "6"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "fan_max_speed": [
+        "35"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,47 @@
+{
+    "type": "filament",
+    "name": "Elegoo PC-FR @0.2 nozzle",
+    "inherits": "Elegoo PC @base",
+    "from": "system",
+    "setting_id": "EPCFR00020",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "280"
+    ],
+    "nozzle_temperature_range_high": [
+        "290"
+    ],
+    "nozzle_temperature_range_low": [
+        "260"
+    ],
+    "slow_down_layer_time": [
+        "10"
+    ],
+    "fan_max_speed": [
+        "40"
+    ],
+    "filament_density": [
+        "1.1"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,35 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG @0.2 nozzle",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETG00020",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "overhang_fan_threshold": [
+        "50%"
+    ],
+    "nozzle_temperature": [
+        "250"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "250"
+    ],
+    "filament_max_volumetric_speed": [
+        "11"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,35 @@
+{
+    "type": "filament",
+    "name": "Elegoo PETG Translucent @0.2 nozzle",
+    "inherits": "Elegoo PETG @base",
+    "from": "system",
+    "setting_id": "EPETGTRAN00020",
+    "instantiation": "true",
+    "pressure_advance": [
+        "0.024"
+    ],
+    "fan_max_speed": [
+        "35"
+    ],
+    "filament_max_volumetric_speed": [
+        "10"
+    ],
+    "nozzle_temperature": [
+        "255"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "255"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
+++ b/resources/profiles/Elegoo/filament/ELEGOO/Elegoo
@@ -0,0 +1,41 @@
+{
+    "type": "filament",
+    "name": "Elegoo PLA Basic @0.2 nozzle",
+    "inherits": "Elegoo PLA @base",
+    "from": "system",
+    "setting_id": "EPLABASIC00020",
+    "instantiation": "true",
+    "nozzle_temperature": [
+        "220"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "nozzle_temperature_range_high": [
+        "230"
+    ],
+    "filament_max_volumetric_speed": [
+        "21"
+    ],
+    "pressure_advance": [
+        "0.024"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Elegoo Centauri 0.2 nozzle",
+        "Elegoo Centauri Carbon 0.2 nozzle",
+        "Elegoo Centauri Carbon 2 0.2 nozzle",
+        "Elegoo Neptune 4 0.2 nozzle",
+        "Elegoo Neptune 4 Pro 0.2 nozzle",
+        "Elegoo Neptune 4 Plus 0.2 nozzle",
+        "Elegoo Neptune 4 Max 0.2 nozzle",
+        "Elegoo Neptune 3 Pro 0.2 nozzle",
+        "Elegoo Neptune 3 Plus 0.2 nozzle",
+        "Elegoo Neptune 3 Max 0.2 nozzle"
+    ]
+}
--- a/resources/profiles/Elegoo/filament/fdm_filament_paht.json
+++ b/resources/profiles/Elegoo/filament/fdm_filament_paht.json
@@ -0,0 +1,91 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_paht",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_type": [
+        "PAHT"
+    ],
+    "filament_density": [
+        "1.24"
+    ],
+    "filament_cost": [
+        "0"
+    ],
+    "cool_plate_temp": [
+        "35"
+    ],
+    "eng_plate_temp": [
+        "0"
+    ],
+    "textured_plate_temp": [
+        "60"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "35"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "0"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "60"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "220"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "overhang_fan_threshold": [
+        "50%"
+    ],
+    "close_fan_the_first_x_layers": [
+        "1"
+    ],
+    "nozzle_temperature": [
+        "220"
+    ],
+    "temperature_vitrification": [
+        "45"
+    ],
+    "nozzle_temperature_range_low": [
+        "190"
+    ],
+    "nozzle_temperature_range_high": [
+        "240"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "additional_cooling_fan_speed": [
+        "0"
+    ],
+    "fan_cooling_layer_time": [
+        "80"
+    ],
+    "fan_min_speed": [
+        "50"
+    ],
+    "hot_plate_temp": [
+        "60"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "60"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "filament_start_gcode": [
+        "; Filament start gcode\n"
+    ],
+    "filament_end_gcode": [
+        "; filament end gcode \n"
+    ],
+    "filament_vendor": [
+        "Generic"
+    ]
+}
--- a/resources/profiles/Elegoo/machine/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/machine/ECC2/Elegoo
@@ -1,7 +1,7 @@
 {
  "type": "machine",
  "name": "Elegoo Centauri Carbon 2 0.4 nozzle",
-    "inherits": "fdm_machine_ecc",
+  "inherits": "fdm_elegoo_3dp_001_common",
  "from": "system",
  "setting_id": "ECC204",
  "instantiation": "true",
@@ -48,7 +48,6 @@
  "extruder_offset": [
    "0x1.5"
  ],
-  "default_bed_type": "4",
  "fan_speedup_time": "0.5",
  "machine_load_filament_time": "29",
  "machine_unload_filament_time": "28",
@@ -61,6 +60,7 @@
  "gcode_flavor": "klipper",
  "machine_pause_gcode": "M600",
  "support_multi_filament": "1",
+  "support_wan_network": "1",
  "bed_mesh_max": "243,245",
  "bed_mesh_min": "10,10",
  "bed_mesh_probe_distance": "22,22",
@@ -73,11 +73,11 @@
    "20",
    "9"
  ],
-  "change_filament_gcode": "\n;==========CC2==========\n;===== date: 2025-10-16-001 =====================\nM106 S0\nM106 P2 S0\nG1 Z{min(max_layer_z+3, printable_height+0.5)} F1200\nT[next_extruder]\nM6211 T[next_extruder] L[flush_length] M{old_filament_e_feedrate} N{new_filament_e_feedrate} Q[old_filament_temp] R[nozzle_temperature_range_high] S[new_filament_temp]\n",
+  "change_filament_gcode": "\n;==========CC2_CHANGE_FILAMENT_GCODE==========\n;===== date: 2025-10-16-001 =====================\nM106 S0\nM106 P2 S0\nG1 Z{min(max_layer_z+3, printable_height+0.5)} F1200\nM6211 T[next_extruder] L[flush_length] M{old_filament_e_feedrate} N{new_filament_e_feedrate} Q[old_filament_temp] R[nozzle_temperature_range_high] S[new_filament_temp]\nT[next_extruder]\n",
  "layer_change_gcode": "M73 L{layer_num+1}\n;LAYER:{layer_num+1}\n",
-  "machine_end_gcode": ";===== CC&CC2 - END Gcode ================\n;===== date: 2025-10-16-001 =====================\n\nM104 S0\nM140 S0 ;Turn-off bed\nM83\nG92 E0 ; zero the extruder\nG1 E-1.5 F1800\nG2 I0 J1 Z{max_layer_z+0.5} F3000 ; lower z a little\nM106 S0\nM106 P2 S0\nG90\n{if max_layer_z > 75}G1 Z{min(max_layer_z+5, printable_height+0.5)} F20000{else}G1 Z80 F20000 {endif}; Move print head up \nG180 S9\nM84\n",
-  "machine_start_gcode": ";===== CC2 - Start Gcode ================\n;===== date: 2025-10-29-001 =====================\n\nG90\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nM190 S[bed_temperature_initial_layer_single] A\nM106 S0\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 FROM_SLICER=1\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\nG28\nM109 S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\nM6211 A1 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\n\n{if first_layer_print_min[1] > 0.5}\nG180 S7\nG1 X{print_bed_max[0]*0.5-1} Y-1.2 F20000\nG1 Z0.5 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 E6 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nM106 S200\nG1 X{print_bed_max[0]*0.5-41} E20 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nG1 F6000\nG1 X{print_bed_max[0]*0.5-46} E0.8\n{else}\nG1 E30 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))}\n{endif}\nM106 S0\nG180 S8\nG1 F20000\nG92 E0 ;Reset Extruder\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
+  "machine_end_gcode": ";===== CC&CC2_END_GCODE ================\n;===== date: 2025-10-16-001 =====================\n\nM104 S0\nM140 S0 ;Turn-off bed\nM83\nG92 E0 ; zero the extruder\nG1 E-1.5 F1800\nG2 I0 J1 Z{max_layer_z+0.5} F3000 ; lower z a little\nM106 S0\nM106 P2 S0\nG90\n{if max_layer_z > 75}G1 Z{min(max_layer_z+5, printable_height+0.5)} F20000{else}G1 Z80 F20000 {endif}; Move print head up \nG180 S9\nM84\n",
+  "machine_start_gcode": ";===== CC2_START_GCODE ================\n;===== date: 2025-11-06-001 =====================\n\nG90\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nM190 S[bed_temperature_initial_layer_single] A\nM106 S0\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 FROM_SLICER=1\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\nG28\nM109 S[nozzle_temperature_initial_layer]\nM6211 A1 L200 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\n\n{if first_layer_print_min[1] > 0.5}\nG180 S7\nG1 X{print_bed_max[0]*0.5-1} Y-1.2 F20000\nG1 Z0.5 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 E6 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nM106 S200\nG1 X{print_bed_max[0]*0.5-41} E20 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nG1 F6000\nG1 X{print_bed_max[0]*0.5-46} E0.8\n{else}\nG1 E30 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))}\n{endif}\nM106 S0\nG180 S8\nG1 F20000\nG92 E0 ;Reset Extruder\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
  "retract_restart_extra_toolchange": [
    "0.5"
  ]
-}
+}
--- a/resources/profiles/Elegoo/machine/ECC2/Elegoo
+++ b/resources/profiles/Elegoo/machine/ECC2/Elegoo
@@ -8,5 +8,5 @@
  "bed_model": "elegoo_centuri_carbon_buildplate_model.stl",
  "bed_texture": "elegoo_centuri_carbon_buildplate_texture.png",
  "hotend_model": "",
-  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC2;Elegoo PETG @0.2 nozzle;Elegoo PETG @ECC2;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC2;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC2;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC2;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC2;Elegoo PLA-CF @ECC2;Elegoo PLA @ECC2;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC2;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC2;Elegoo RAPID PETG+ @0.2 nozzle;Elegoo RAPID PETG+ @ECC2;Elegoo RAPID PLA @0.2 nozzle;Elegoo RAPID PLA @ECC2;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC2;Elegoo TPU 95A @ECC2;Elegoo PLA Basic @0.2 nozzle;Elegoo PLA Basic @ECC2;Elegoo PLA Galaxy @ECC2;Elegoo PLA Marble @ECC2; Elegoo PLA Sparkle @ECC2;Elegoo PLA Wood @ECC2;Elegoo RAPID TPU 95A @ECC2;Elegoo ABS @0.2 nozzle;Elegoo ABS @ECC2;Elegoo PAHT-CF @ECC2;Elegoo PC @0.2 nozzle;Elegoo PC @ECC2;Elegoo PC-FR @0.2 nozzle;Elegoo PC-FR @ECC2;Elegoo PETG-CF @ECC2;Elegoo PETG-GF @ECC2;Elegoo PETG Translucent @0.2 nozzle;Elegoo PETG Translucent @ECC2"
+  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC2;Elegoo PETG @0.2 nozzle;Elegoo PETG @ECC2;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC2;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC2;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC2;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC2;Elegoo PLA-CF @ECC2;Elegoo PLA @ECC2;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC2;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC2;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC2;Elegoo TPU 95A @ECC2;Elegoo PLA Basic @0.2 nozzle;Elegoo PLA Basic @ECC2;Elegoo PLA Galaxy @ECC2;Elegoo PLA Marble @ECC2; Elegoo PLA Sparkle @ECC2;Elegoo PLA Wood @ECC2;Elegoo RAPID TPU 95A @ECC2;Elegoo ABS @0.2 nozzle;Elegoo ABS @ECC2;Elegoo PAHT-CF @ECC2;Elegoo PC @0.2 nozzle;Elegoo PC @ECC2;Elegoo PC-FR @0.2 nozzle;Elegoo PC-FR @ECC2;Elegoo PETG-CF @ECC2;Elegoo PETG-GF @ECC2;Elegoo PETG Translucent @0.2 nozzle;Elegoo PETG Translucent @ECC2"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.08mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.08mm
@@ -1,8 +1,7 @@
 {
-    "type": "process",
-    "name": "0.08mm Optimal @Elegoo CC2 0.2 nozzle",
-    "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle",
-    "instantiation": "true",
    "elefant_foot_compensation": "0.05",
-    "layer_height": "0.08"
+    "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle",
+    "layer_height": "0.08",
+    "name": "0.08mm Optimal @Elegoo CC2 0.2 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.10mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.10mm
@@ -1,15 +1,16 @@
 {
    "type": "process",
    "name": "0.10mm Standard @Elegoo CC2 0.2 nozzle",
-    "inherits": "fdm_process_ecc_02010",
+    "inherits": "fdm_process_elegoo_02010",
    "from": "system",
    "setting_id": "PECC202010",
    "instantiation": "true",
 	"sparse_infill_pattern": "zig-zag",
-    "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_type[0]}{layer_height}_{print_time}.gcode",
+    "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
 	"min_width_top_surface": "50%",
    "elefant_foot_compensation": "0.15",
    "enable_prime_tower": "1",
+    "reduce_infill_retraction": "0",
    "compatible_printers": [
        "Elegoo Centauri Carbon 2 0.2 nozzle"
    ]
--- a/resources/profiles/Elegoo/process/ECC2/0.12mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.12mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.12mm Draft @Elegoo CC2 0.2 nozzle",
    "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.12"
+    "layer_height": "0.12",
+    "name": "0.12mm Draft @Elegoo CC2 0.2 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.12mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.12mm
@@ -1,8 +1,7 @@
 {
-    "type": "process",
-    "name": "0.12mm Fine @Elegoo CC2 0.4 nozzle",
    "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-    "instantiation": "true",
    "layer_height": "0.12",
-    "wall_loops": "3"
+    "name": "0.12mm Fine @Elegoo CC2 0.4 nozzle",
+    "wall_loops": "3",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.14mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.14mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.14mm Extra Draft @Elegoo CC2 0.2 nozzle",
    "inherits": "0.10mm Standard @Elegoo CC2 0.2 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.14"
+    "layer_height": "0.14",
+    "name": "0.14mm Extra Draft @Elegoo CC2 0.2 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.16mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.16mm
@@ -1,8 +1,7 @@
 {
-    "type": "process",
-    "name": "0.16mm Extra Fine @Elegoo CC2 0.8 nozzle",
    "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle",
-    "instantiation": "true",
    "initial_layer_print_height": "0.3",
-    "layer_height": "0.16"
+    "layer_height": "0.16",
+    "name": "0.16mm Extra Fine @Elegoo CC2 0.8 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.16mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.16mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.16mm Optimal @Elegoo CC2 0.4 nozzle",
    "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.16"
+    "layer_height": "0.16",
+    "name": "0.16mm Optimal @Elegoo CC2 0.4 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.18mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.18mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.18mm Fine @Elegoo CC2 0.6 nozzle",
    "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.18"
+    "layer_height": "0.18",
+    "name": "0.18mm Fine @Elegoo CC2 0.6 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.20mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.20mm
@@ -2,13 +2,13 @@
 {
  "type": "process",
  "name": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-  "inherits": "fdm_process_ecc_04020",
+  "inherits": "fdm_process_elegoo_04020",
  "from": "system",
  "setting_id": "PECC204020",
  "instantiation": "true",
  "bottom_shell_layers": "3",
  "bottom_shell_thickness": "0.6",
-  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_type[0]}{layer_height}_{print_time}.gcode",
+  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
  "min_width_top_surface": "50%",
  "enable_prime_tower": "1",
  "compatible_printers": [
@@ -17,7 +17,6 @@
  "enable_arc_fitting": "0",
  "exclude_object": "0",
  "independent_support_layer_height": "0",
-  "infill_anchor": "1000",
  "initial_layer_acceleration": "2000",
  "outer_wall_speed": "200",
  "skirt_height": "4",
@@ -30,5 +29,6 @@
  "top_surface_acceleration": "5000",
  "tree_support_branch_distance_organic": "2",
  "tree_support_tip_diameter": "0.8",
-  "wall_sequence": "inner-outer-inner wall"
+  "wall_sequence": "inner wall/outer wall",
+  "reduce_infill_retraction": "0"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.20mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.20mm
@@ -1,8 +1,6 @@
 {
-    "type": "process",
-    "name": "0.20mm Strength @Elegoo CC2 0.4 nozzle",
    "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-    "instantiation": "true",
+    "name": "0.20mm Strength @Elegoo CC2 0.4 nozzle",
    "wall_sequence": "inner-outer-inner wall",
    "reduce_crossing_wall": "1",
    "bottom_shell_layers": "5",
@@ -10,5 +8,6 @@
    "print_flow_ratio": "0.95",
    "sparse_infill_density": "20%",
    "top_shell_layers": "6",
-    "wall_loops": "6"
+    "wall_loops": "6",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.24mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.24mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.24mm Draft @Elegoo CC2 0.4 nozzle",
    "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.24"
+    "layer_height": "0.24",
+    "name": "0.24mm Draft @Elegoo CC2 0.4 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.24mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.24mm
@@ -1,8 +1,7 @@
 {
-    "type": "process",
-    "name": "0.24mm Fine @Elegoo CC2 0.8 nozzle",
    "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle",
-    "instantiation": "true",
    "initial_layer_print_height": "0.3",
-    "layer_height": "0.24"
+    "layer_height": "0.24",
+    "name": "0.24mm Fine @Elegoo CC2 0.8 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.24mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.24mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.24mm Optimal @Elegoo CC2 0.6 nozzle",
    "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.24"
+    "layer_height": "0.24",
+    "name": "0.24mm Optimal @Elegoo CC2 0.6 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.28mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.28mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.28mm Extra Draft @Elegoo CC2 0.4 nozzle",
    "inherits": "0.20mm Standard @Elegoo CC2 0.4 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.28"
+    "layer_height": "0.28",
+    "name": "0.28mm Extra Draft @Elegoo CC2 0.4 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.30mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.30mm
@@ -2,15 +2,16 @@
 {
  "type": "process",
  "name": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-  "inherits": "fdm_process_ecc_06030",
+  "inherits": "fdm_process_elegoo_06030",
  "from": "system",
  "setting_id": "PECC206030",
  "instantiation": "true",
  "sparse_infill_pattern": "zig-zag",
-  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_type[0]}{layer_height}_{print_time}.gcode",
+  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
  "min_width_top_surface": "50%",
  "enable_prime_tower": "1",
  "compatible_printers": [
      "Elegoo Centauri Carbon 2 0.6 nozzle"
-  ]
+  ],
+  "reduce_infill_retraction": "0"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.30mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.30mm
@@ -1,13 +1,12 @@
 {
-    "type": "process",
-    "name": "0.30mm Strength @Elegoo CC2 0.6 nozzle",
    "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-    "instantiation": "true",
    "inner_wall_speed": "120",
+    "name": "0.30mm Strength @Elegoo CC2 0.6 nozzle",
    "wall_sequence": "inner-outer-inner wall",
    "reduce_crossing_wall": "1",
    "outer_wall_speed": "80",
    "sparse_infill_density": "15%",
    "top_surface_speed": "120",
-    "wall_loops": "4"
+    "wall_loops": "4",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.32mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.32mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.32mm Optimal @Elegoo CC2 0.8 nozzle",
    "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.32"
+    "layer_height": "0.32",
+    "name": "0.32mm Optimal @Elegoo CC2 0.8 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.36mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.36mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.36mm Draft @Elegoo CC2 0.6 nozzle",
    "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.36"
+    "layer_height": "0.36",
+    "name": "0.36mm Draft @Elegoo CC2 0.6 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.40mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.40mm
@@ -2,15 +2,16 @@
 {
  "type": "process",
  "name": "0.40mm Standard @Elegoo CC2 0.8 nozzle",
-  "inherits": "fdm_process_ecc_08040",
+  "inherits": "fdm_process_elegoo_08040",
  "from": "system",
  "setting_id": "PECC208040",
  "instantiation": "true",
  "sparse_infill_pattern": "zig-zag",
-  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_type[0]}{layer_height}_{print_time}.gcode",
+  "filename_format": "ECC2_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
  "min_width_top_surface": "50%",
  "enable_prime_tower": "1",
  "compatible_printers": [
      "Elegoo Centauri Carbon 2 0.8 nozzle"
-  ]
+  ],
+  "reduce_infill_retraction": "0"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.42mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.42mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.42mm Extra Draft @Elegoo CC2 0.6 nozzle",
    "inherits": "0.30mm Standard @Elegoo CC2 0.6 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.42"
+    "layer_height": "0.42",
+    "name": "0.42mm Extra Draft @Elegoo CC2 0.6 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/ECC2/0.48mm
+++ b/resources/profiles/Elegoo/process/ECC2/0.48mm
@@ -1,7 +1,6 @@
 {
-    "type": "process",
-    "name": "0.48mm Draft @Elegoo CC2 0.8 nozzle",
    "inherits": "0.40mm Standard @Elegoo CC2 0.8 nozzle",
-    "instantiation": "true",
-    "layer_height": "0.48"
+    "layer_height": "0.48",
+    "name": "0.48mm Draft @Elegoo CC2 0.8 nozzle",
+    "instantiation": "true"
 }
--- a/resources/profiles/Elegoo/process/fdm_process_elegoo_02010.json
+++ b/resources/profiles/Elegoo/process/fdm_process_elegoo_02010.json
@@ -0,0 +1,30 @@
+{
+  "type": "process",
+  "name": "fdm_process_elegoo_02010",
+  "inherits": "fdm_process_elegoo_common",
+  "from": "system",
+  "instantiation": "false",
+  "layer_height": "0.1",
+  "initial_layer_print_height": "0.15",
+  "elefant_foot_compensation": "0.05",
+  "wall_loops": "4",
+  "bottom_shell_layers": "5",
+  "top_shell_layers": "7",
+  "bridge_flow": "1",
+  "line_width": "0.22",
+  "outer_wall_line_width": "0.22",
+  "initial_layer_line_width": "0.3",
+  "sparse_infill_line_width": "0.25",
+  "inner_wall_line_width": "0.22",
+  "internal_solid_infill_line_width": "0.22",
+  "support_line_width": "0.22",
+  "top_surface_line_width": "0.22",
+  "initial_layer_speed": "35",
+  "initial_layer_infill_speed": "60",
+  "sparse_infill_speed": "100",
+  "inner_wall_speed": "100",
+  "internal_solid_infill_speed": "100",
+  "is_custom_defined": "0",
+  "outer_wall_speed": "60",
+  "top_surface_speed": "80"
+}
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -1,6 +1,6 @@
 {
    "name": "Qidi",
-    "version": "02.03.02.51",
+    "version": "02.03.02.52",
    "force_update": "0",
    "description": "Qidi configurations",
    "machine_model_list": [
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -4,7 +4,7 @@
    "inherits": "fdm_filament_q_common",
    "from": "system",
    "setting_id": "GFSA04",
-    "filament_id": "GFB99",
+    "filament_id": "QD_1_0_23",
    "instantiation": "false",
    "box_temperature_range_high": [
        "65"
--- a/resources/profiles/Qidi/filament/Q2/Generic
+++ b/resources/profiles/Qidi/filament/Q2/Generic
@@ -1,6 +1,6 @@
 {
    "type": "filament",
-    "filament_id": "GFB99",
+    "filament_id": "QD_2_0_23",
    "setting_id": "GFSA04",
    "name": "Generic PC@Q2C-Series",
    "from": "system",
--- a/resources/profiles/Qidi/filament/X4/Generic
+++ b/resources/profiles/Qidi/filament/X4/Generic
@@ -1,6 +1,6 @@
 {
    "type": "filament",
-    "filament_id": "GFB99",
+    "filament_id": "QD_3_0_23",
    "setting_id": "GFSA04",
    "name": "Generic PC@X-Max 4-Series",
    "from": "system",
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -35,7 +35,7 @@
    "machine_max_acceleration_y": ["30000"],
    "machine_max_speed_x": ["800"],
    "machine_max_speed_y": ["800"],
-    "machine_start_gcode": ";===== PRINT_PHASE_INIT =====\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nSET_PRINT_MAIN_STATUS MAIN_STATUS=print_start\nM220 S100\nM221 S100\nSET_INPUT_SHAPER SHAPER_TYPE_X=mzv\nSET_INPUT_SHAPER SHAPER_TYPE_Y=mzv\nDISABLE_ALL_SENSOR\nM1002 R1\nM107\nCLEAR_PAUSE\nM140 S[bed_temperature_initial_layer_single]\nM141 S[chamber_temperature]\nG29.0\nG28\n\n;===== BOX_PREPAR =====\nBOX_PRINT_START EXTRUDER=[initial_no_support_extruder] HOTENDTEMP={nozzle_temperature_range_high[initial_tool]}\nM400\nEXTRUSION_AND_FLUSH HOTEND=[nozzle_temperature_initial_layer]\n\n;===== CLEAR_NOZZLE =====\nG1 Z20 F480\nMOVE_TO_TRASH\nG1 Y403.5 F2000\n{if chamber_temperature[0] == 0}\nM106 P3 S[during_print_exhaust_fan_speed]\n{else}\nM106 P3 S0\n{endif}\nM1004\nM106 S0\nM109 S[nozzle_temperature_initial_layer]\nG92 E0\nM83\nG1 E5 F80\nG1 E250 F300\nM400\nM106 S255\nG1 E-3 F1000\nM104 S140\nM109.1 S{nozzle_temperature_initial_layer[0]-30}\nM204 S10000\nG1 Y403 F2000\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 Y395 F6000\nG1 X188\nG1 Z-0.2 F480\nM106 S255\nM109.1 S150\nG91\nG1 X15 F200\nG1 Y2\nG1 X-15\nG1 Y-2\nG1 X15\nG90\nG2 I0.5 J0.5 F480\nG2 I0.5 J0.5\nG2 I0.5 J0.5\nG1 Z10\nG1 Y383 F12000\nG1 X116\nG1 Y403\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 X195 Y195\nM106 S0\nM190 S[bed_temperature_initial_layer_single]\nM191 S[chamber_temperature]\nM400\nSET_OPERATING_CURRENT STEPPER=x VALUE=1500\nG4 P400\nSET_OPERATING_CURRENT STEPPER=y VALUE=1500\nG4 P400\nG1 Y0 F15000\nG1 X15\nG1 X3 F5000\nG4 P1000\nG1 X4 F1000\nG1 X3 F5000\nG4 P1000\nG1 E-4 F1800\nG1 X15 F3000\n\nM400\nSET_OPERATING_CURRENT STEPPER=x VALUE=1200\nG4 P400\nSET_OPERATING_CURRENT STEPPER=y VALUE=1200\nG4 P2000\nG1 X20 Y20 F15000\nZ_TILT_ADJUST\nG29\nM1002 A1\nG1 X380 Y5 F20000\nM109 S[nozzle_temperature_initial_layer]\nENABLE_ALL_SENSOR\n\n;===== PRINT_START =====\n; LAYER_HEIGHT: 0.2\nT[initial_tool]\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG0 X195 Y1 F20000\nG0 Z10 F480\nSET_KINEMATIC_POSITION Z={10 - ((nozzle_temperature_initial_layer[initial_tool] - 130) / 14 - 5.0) / 100}\nG4 P3000\nprobe samples=1\nG91\nG0 Z0.6 F480\nG90\nG1 X175 Y1 F20000\nG1 E5 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 X215 E20 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 Z1 F480\nSET_PRINT_MAIN_STATUS MAIN_STATUS=printing",
+    "machine_start_gcode": "INIT_MAPPING_VALUE\n;===== PRINT_PHASE_INIT =====\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nSET_PRINT_MAIN_STATUS MAIN_STATUS=print_start\nM220 S100\nM221 S100\nSET_INPUT_SHAPER SHAPER_TYPE_X=mzv\nSET_INPUT_SHAPER SHAPER_TYPE_Y=mzv\nDISABLE_ALL_SENSOR\nM1002 R1\nM107\nCLEAR_PAUSE\nM140 S[bed_temperature_initial_layer_single]\nM141 S[chamber_temperature]\nG29.0\nG28\n\n;===== BOX_PREPAR =====\nBOX_PRINT_START EXTRUDER=[initial_no_support_extruder] HOTENDTEMP={nozzle_temperature_range_high[initial_tool]}\nM400\nEXTRUSION_AND_FLUSH HOTEND=[nozzle_temperature_initial_layer]\n\n;===== CLEAR_NOZZLE =====\nG1 Z20 F480\nMOVE_TO_TRASH\nG1 Y403.5 F2000\n{if chamber_temperature[0] == 0}\nM106 P3 S[during_print_exhaust_fan_speed]\n{else}\nM106 P3 S0\n{endif}\nM1004\nM106 S0\nM109 S[nozzle_temperature_initial_layer]\nG92 E0\nM83\nG1 E5 F80\nG1 E250 F300\nM400\nM106 S255\nG1 E-3 F1000\nM104 S140\nM109.1 S{nozzle_temperature_initial_layer[0]-30}\nM204 S10000\nG1 Y403 F2000\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 Y395 F6000\nG1 X188\nG1 Z-0.2 F480\nM106 S255\nM109.1 S150\nG91\nG1 X15 F200\nG1 Y2\nG1 X-15\nG1 Y-2\nG1 X15\nG90\nG2 I0.5 J0.5 F480\nG2 I0.5 J0.5\nG2 I0.5 J0.5\nG1 Z10\nG1 Y383 F12000\nG1 X116\nG1 Y403\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 X195 Y195\nM106 S0\nM190 S[bed_temperature_initial_layer_single]\nM191 S[chamber_temperature]\nM400\nSET_OPERATING_CURRENT STEPPER=x VALUE=1500\nG4 P400\nSET_OPERATING_CURRENT STEPPER=y VALUE=1500\nG4 P400\nG1 Y0 F15000\nG1 X15\nG1 X3 F5000\nG4 P1000\nG1 X4 F1000\nG1 X3 F5000\nG4 P1000\nG1 E-4 F1800\nG1 X15 F3000\n\nM400\nSET_OPERATING_CURRENT STEPPER=x VALUE=1200\nG4 P400\nSET_OPERATING_CURRENT STEPPER=y VALUE=1200\nG4 P2000\nG1 X20 Y20 F15000\nZ_TILT_ADJUST\nG29\nM1002 A1\nG1 X195 Y195 Z10 F20000\nG92_ Z{10 - ((nozzle_temperature_initial_layer[initial_tool] - 130) / 14 - 5.0) / 100}\nG0 Y1\nM109 S[nozzle_temperature_initial_layer]\nENABLE_ALL_SENSOR\n\n;===== PRINT_START =====\n; LAYER_HEIGHT: 0.2\nT[initial_tool]\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nprobe samples=1\nG91\nG0 Z0.6 F480\nG90\nG1 X175 Y1 F20000\nG1 E5 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 X215 E20 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 Z1 F480\nSET_PRINT_MAIN_STATUS MAIN_STATUS=printing",
    "nozzle_diameter": ["0.4"],
    "nozzle_volume": ["150"],
    "printable_area": ["0x0","390x0","390x390","0x390"],
--- a/resources/profiles/Qidi/machine/fdm_machine_x_common.json
+++ b/resources/profiles/Qidi/machine/fdm_machine_x_common.json
@@ -64,6 +64,7 @@
    "scan_first_layer": "0",
    "silent_mode": "0",
    "single_extruder_multi_material": "1",
+    "wipe_tower_type": "type1",
    "support_air_filtration": ["1"],
    "support_box_temp_control": "1",
    "support_chamber_temp_control": "1",
--- a/resources/profiles/Qidi/machine/fdm_q_common.json
+++ b/resources/profiles/Qidi/machine/fdm_q_common.json
@@ -128,6 +128,7 @@
    "scan_first_layer": "0",
    "silent_mode": "0",
    "single_extruder_multi_material": "1",
+    "wipe_tower_type": "type1",
    "support_air_filtration": [
        "1"
    ],
--- a/resources/profiles/Qidi/machine/fdm_qidi_common.json
+++ b/resources/profiles/Qidi/machine/fdm_qidi_common.json
@@ -118,6 +118,7 @@
    ],
    "silent_mode": "0",
    "single_extruder_multi_material": "1",
+    "wipe_tower_type": "type1",
    "change_filament_gcode": "",
    "machine_pause_gcode": "M25 ;pause print",
    "wipe": [
--- a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json
+++ b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json
@@ -9,6 +9,7 @@
    "change_filament_gcode": "",
    "machine_pause_gcode": "M0",
    "support_chamber_temp_control": "1",
+    "wipe_tower_type": "type1",
    "filament_tower_interface_pre_extrusion_dist": ["10"],
    "filament_tower_interface_pre_extrusion_length": ["0"],
    "filament_tower_ironing_area": ["4"],
--- a/resources/profiles/Qidi/process/0.06mm
+++ b/resources/profiles/Qidi/process/0.06mm
@@ -5,7 +5,7 @@
    "from": "system",
    "setting_id": "GP024",
    "instantiation": "true",
-    "enable_arc_fitting": "1",
+    "enable_arc_fitting": "0",
    "compatible_printers": [
        "Qidi Q2 0.2 nozzle"
    ]
--- a/resources/profiles/Qidi/process/0.06mm
+++ b/resources/profiles/Qidi/process/0.06mm
@@ -5,7 +5,7 @@
    "from": "system",
    "setting_id": "GP024",
    "instantiation": "true",
-    "enable_arc_fitting": "1",
+    "enable_arc_fitting": "0",
    "compatible_printers": [
        "Qidi Q2C 0.2 nozzle"
    ]
--- a/Show More
+++ b/Show More