Merge branch 'SoftFever:main' into main

2026-05-14 09:02:06 +00:00 · 2025-03-22 13:26:19 +01:00
parent d649472412 c3542ce014
commit 30db093c73
933 changed files with 33686 additions and 27668 deletions
--- a/.cursorignore
+++ b/.cursorignore
@@ -0,0 +1,7 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+deps/
+build_*/
+build/
+localization/
+sandboxes/
+resources/
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -62,19 +62,26 @@ jobs:
    secrets: inherit
  flatpak:
    name: "Flatpak"
-    runs-on: ubuntu-latest
-    env:
-      date:
-      ver:
-      ver_pure:
    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-46
      options: --privileged
      volumes:
        - /usr/local/lib/android:/usr/local/lib/android
        - /usr/share/dotnet:/usr/share/dotnet
        - /opt/ghc:/opt/ghc1
        - /usr/local/share/boost:/usr/local/share/boost1
+    strategy:
+      matrix:
+        variant:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.variant.runner }}
+    env:
+      date:
+      ver:
+      ver_pure:
    steps:
    - name: "Remove unneeded stuff to free disk space"
      run:
@@ -92,19 +99,25 @@ jobs:
        echo "ver_pure=$ver_pure" >> $GITHUB_ENV
        echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
      shell: bash
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@master
+    - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
      with:
-        bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
+        bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
        manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
        cache: true
+        arch: ${{ matrix.variant.arch }}
        upload-artifact: false
+    - name: Upload artifacts Flatpak
+      uses: actions/upload-artifact@v4
+      with:
+        name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
+        path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
    - name: Deploy Flatpak to nightly release
      if: ${{github.ref == 'refs/heads/main'}}
      uses: WebFreak001/deploy-nightly@v3.2.0
      with:
        upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
        release_id: 137995723
-        asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
+        asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
+        asset_name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ 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/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@@ -298,6 +298,14 @@ jobs:
          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
          asset_content_type: application/octet-stream
          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+      - name: Deploy Ubuntu release
+        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
+        uses: rickstaa/action-create-tag@v1
+        with:
+          tag: "nightly-builds"
+          tag_exists_error: false
+          force_push_tag: true
+          message: "nightly-builds"

      - name: Deploy orca_custom_preset_tests
        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
--- a/.github/workflows/orca_bot.yml
+++ b/.github/workflows/orca_bot.yml
@@ -31,6 +31,8 @@ jobs:
          exempt-all-issue-milestones: true
          # Exempt all issues with assignees from stale
          exempt-all-issue-assignees: true
+          # Exempt feature requests
+          exempt-issue-labels: "enhancement"
          # Idle number of days before marking issues stale
          days-before-issue-stale: 90
          # Idle number of days before marking issues close
--- a/BuildLinux.sh
+++ b/BuildLinux.sh
@@ -78,10 +78,13 @@ then
    exit 0
 fi

-DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release)
-# treat ubuntu as debian
-if [ "${DISTRIBUTION}" == "ubuntu" ] || [ "${DISTRIBUTION}" == "linuxmint" ]
-then
+DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release | tr -d '"')
+DISTRIBUTION_LIKE=$(awk -F= '/^ID_LIKE=/ {print $2}' /etc/os-release | tr -d '"')
+# Check for direct distribution match to Ubuntu/Debian
+if [ "${DISTRIBUTION}" == "ubuntu" ] || [ "${DISTRIBUTION}" == "linuxmint" ]; then
+    DISTRIBUTION="debian"
+# Check if distribution is Debian/Ubuntu-like based on ID_LIKE
+elif [[ "${DISTRIBUTION_LIKE}" == *"debian"* ]] || [[ "${DISTRIBUTION_LIKE}" == *"ubuntu"* ]]; then
    DISTRIBUTION="debian"
 fi
 if [ ! -f ./linux.d/${DISTRIBUTION} ]
--- a/16
+++ b/16
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install  -y \
    libtool \
    libudev-dev \
    libwayland-dev \
-    libwebkit2gtk-4.0-dev \
+    libwebkit2gtk-4.1-dev \
    libxkbcommon-dev \
    locales \
    locales-all \
@@ -86,10 +86,16 @@ SHELL ["/bin/bash", "-l", "-c"]
 ARG USER=root
 ARG UID=0
 ARG GID=0
-RUN [[ "$UID" != "0" ]] \
-  && groupadd -f -g $GID $USER \
-  && useradd -u $UID -g $GID $USER
-
+RUN if [[ "$UID" != "0" ]]; then \
+      # Create group if it doesn't exist \
+      groupadd -f -g $GID $USER; \
+      # Check if user with this UID already exists \
+      if getent passwd $UID > /dev/null 2>&1; then \
+        echo "User with UID $UID already exists, skipping user creation"; \
+      else \
+        useradd -u $UID -g $GID $USER; \
+      fi \
+    fi
 # Using an entrypoint instead of CMD because the binary
 # accepts several command line arguments.
 ENTRYPOINT ["/OrcaSlicer/build/package/bin/orca-slicer"]
--- a/build_release_vs2022.bat
+++ b/build_release_vs2022.bat
@@ -1,4 +1,4 @@
-@REM OcarSlicer build script for Windows
+@REM OrcaSlicer build script for Windows
@echo off
 set WP=%CD%

--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -88,7 +88,7 @@ endif ()
 # option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)

 message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}")
-message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
+message(STATUS "OrcaSlicer download dir for source packages: ${DEP_DOWNLOAD_DIR}")
 message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")

 find_package(Git REQUIRED)
--- a/deps/MPFR/MPFR.cmake
+++ b/deps/MPFR/MPFR.cmake
@@ -25,8 +25,8 @@ else ()
    endif ()

    ExternalProject_Add(dep_MPFR
-        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
-        URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
+        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.2.tar.bz2
+        URL_HASH SHA256=9ad62c7dc910303cd384ff8f1f4767a655124980bb6d8650fe62c815a231bb7b
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
        BUILD_IN_SOURCE ON
        CONFIGURE_COMMAND autoreconf -f -i && 
--- a/doc/Calibration.md
+++ b/doc/Calibration.md
@@ -73,11 +73,20 @@ The pattern method is adapted from [Andrew Ellis' pattern method generator](http

 [Instructions for using and reading the pattern method](https://ellis3dp.com/Print-Tuning-Guide/articles/pressure_linear_advance/pattern_method.html) are provided in [Ellis' Print Tuning Guide](https://ellis3dp.com/Print-Tuning-Guide/), with only a few Orca Slicer differences to note.

-First and foremost, when you initiate the test, you'll only see a small rectangular prism on the plate. This object serves a few purposes:
+Test configuration window allow user to generate one or more tests in a single projects. Multiple tests will be placed on each plate with extra plates added if needed.

-1. The test pattern itself is added in as custom G-Code at each layer, same as you could do by hand actually. The rectangular prism gives us the layers in which to insert that G-Code. This also means that **you'll see the full test pattern when you move to the Preview pane**
+1. Single test \
+![PA pattern single test](./images/pa/pa-pattern-single.png)
+2. Batch mode testing (multiple tests on a sinle plate) \
+![PA pattern batch mode](./images/pa/pa-pattern-batch.png)
+
+Once test generated, one or more small rectangular prisms could be found on the plate, one for each test case. This object serves a few purposes:
+
+1. The test pattern itself is added in as custom G-Code at each layer, same as you could do by hand actually. The rectangular prism gives us the layers in which to insert that G-Code. This also means that **you'll see the full test pattern when you move to the Preview pane**:
+![PA pattern batch mode plater](./images/pa/pa-pattern-batch-plater.png)
 2. The prism acts as a handle, enabling you to move the test pattern wherever you'd like on the plate by moving the prism
-3. The filament selected for the prism is also used for the test pattern
+3. Each test object is pre-configured with target parameters which are reflected in the objects name. However, test parameters may be adjusted for each prism individually by referring to the object list pane:
+![PA pattern batch mode object list](./images/pa/pa-pattern-batch-objects.png)

 Next, Ellis' generator provided the ability to adjust specific printer, filament, and print profile settings. You can make these same changes in Orca Slicer by adjusting the settings in the Prepare pane as you would with any other print. When you initiate the calibration test, Ellis' default settings are applied. A few things to note about these settings:

--- a/doc/adaptive-pressure-advance.md
+++ b/doc/adaptive-pressure-advance.md
@@ -110,13 +110,26 @@ We, therefore, need to run 12 PA tests as below:

 ### Identifying the flow rates from the print speed

+#### OrcaSlicer 2.2.0 and later
+
+Test parameters needed to build adaptive PA table are printed on the test sample:
+
+<img width="452" alt="pa batch mode" src="https://github.com/user-attachments/assets/219c53b5-d53f-4360-963e-0985d9257bd7">
+
+Test sample above was done with acceleration 12000 mm/s² and flow rate 27.13 mm³/s
+
+
+#### OrcaSlicer 2.1.0 and older.
+
 As mentioned earlier, **the print speed is used as a proxy to vary the extrusion flow rate**. Once your PA test is set up, change the gcode preview to “flow” and move the horizontal slider over one of the herringbone patterns and take note of the flow rate for different speeds.
 ![337939815-e358b960-cf96-41b5-8c7e-addde927933f](https://github.com/user-attachments/assets/21290435-6f2a-4a21-bcf0-28cd6ae1912a)


 ### Running the tests

-Setup your PA test as usual from the calibration menu in Orca slicer. It is recommended that the PA step is set to a small value, to allow you to make meaningful distinctions between the different tests – **therefore a PA step value of 0.001 is recommended.  **
+#### General tips
+
+It is recommended that the PA step is set to a small value, to allow you to make meaningful distinctions between the different tests – **therefore a PA step value of 0.001 is recommended.  **

 **Set the end PA to a value high enough to start showing perimeter separation for the lowest flow (print speed) and acceleration test.** For example, for a Voron 350 using Revo HF, the maximum value was set to 0.05 as that was sufficient to show perimeter separation even at the slowest flow rates and accelerations.  

@@ -124,7 +137,19 @@ Setup your PA test as usual from the calibration menu in Orca slicer. It is reco

 <img width="402" alt="PA calibration parameters" src="https://github.com/user-attachments/assets/b411dc30-5556-4e7c-8c40-5279d3074eae">

-Once setup, your PA test should look like the below:
+#### OrcaSlicer 2.3.0 and newer
+
+PA pattern calibration configuration window have been changed to simplify test setup. Now all is needed is to fill list of accelerations and speeds into relevant fields of the calibration window:
+
+![PA pattern batch mode](./images/pa/pa-pattern-batch.png)
+
+Test patterns generated for each acceleration-speed pair and all parameters are set accordingly. No additional actions needed from user side. Just slice and print all plates generated.
+
+Refer to [Calibration Guide](./Calibration) for more details on batch mode calibration.
+
+#### OrcaSlicer 2.2.0 and older
+
+Setup your PA test as usual from the calibration menu in Orca slicer. Once setup, your PA test should look like the below:

 <img width="437" alt="PA calibration test 1" src="https://github.com/user-attachments/assets/1e6159fe-c3c5-4480-95a1-4383f1fae422">
 <img width="437" alt="Pa calibration test 2" src="https://github.com/user-attachments/assets/c360bb18-a97a-4f37-b5a3-bb0c67cac2b6">
@@ -132,6 +157,9 @@ Once setup, your PA test should look like the below:
 Now input your identified print speeds and accelerations in the fields above and run the PA tests. 

 **IMPORTANT:** Make sure your acceleration values are all the same in all text boxes. Same for the print speed values and Jerk (XY) values. Make sure your Jerk value is set to the external perimeter jerk used in your print profiles.  
+
+#### Test results processing
+
 Now run the tests and note the optimal PA value, the flow, and the acceleration. You should produce a table like this:

 <img width="452" alt="calibration table" src="https://github.com/user-attachments/assets/9451e8e4-352f-4cfc-b835-dffa4420d580">
--- a/doc/images/pa/pa-pattern-batch-objects.png
+++ b/doc/images/pa/pa-pattern-batch-objects.png
--- a/doc/images/pa/pa-pattern-batch-plater.png
+++ b/doc/images/pa/pa-pattern-batch-plater.png
--- a/doc/images/pa/pa-pattern-batch.png
+++ b/doc/images/pa/pa-pattern-batch.png
--- a/doc/images/pa/pa-pattern-single.png
+++ b/doc/images/pa/pa-pattern-single.png
--- a/localization/i18n/OrcaSlicer.pot
+++ b/localization/i18n/OrcaSlicer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-20 21:21+0800\n"
+"POT-Creation-Date: 2025-03-16 22:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -985,6 +985,10 @@ msgstr ""
 msgid "Orient the text towards the camera."
 msgstr ""

+#, possible-boost-format
+msgid "Font \"%1%\" can't be used. Please select another."
+msgstr ""
+
 #, possible-boost-format
 msgid ""
 "Can't load exactly same font(\"%1%\"). Application selected a similar "
@@ -1236,6 +1240,9 @@ msgstr ""
 msgid "SVG file does NOT contain a single path to be embossed (%1%)."
 msgstr ""

+msgid "No feature"
+msgstr ""
+
 msgid "Vertex"
 msgstr ""

@@ -3048,7 +3055,11 @@ msgid ""
 "program"
 msgstr ""

-msgid "Please save project and restart the program. "
+#, possible-boost-format
+msgid "A fatal error occurred: \"%1%\""
+msgstr ""
+
+msgid "Please save project and restart the program."
 msgstr ""

 msgid "Processing G-Code from Previous file..."
@@ -3453,9 +3464,9 @@ msgstr ""

 #, possible-c-format, possible-boost-format
 msgid ""
-"Current chamber temperature is higher than the material's safe temperature,"
-"it may result in material softening and clogging.The maximum safe "
-"temperature for the material is %d"
+"Current chamber temperature is higher than the material's safe "
+"temperature,it may result in material softening and clogging.The maximum "
+"safe temperature for the material is %d"
 msgstr ""

 msgid ""
@@ -3493,7 +3504,7 @@ msgstr ""

 msgid ""
 "Alternate extra wall does't work well when ensure vertical shell thickness "
-"is set to All. "
+"is set to All."
 msgstr ""

 msgid ""
@@ -4174,7 +4185,7 @@ msgstr ""
 msgid "Size:"
 msgstr ""

-#, possible-c-format, possible-boost-format
+#, possible-boost-format
 msgid ""
 "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
 "separate the conflicted objects farther (%s <-> %s)."
@@ -4560,6 +4571,14 @@ msgstr ""
 msgid "Use Orthogonal View"
 msgstr ""

+msgid "Auto Perspective"
+msgstr ""
+
+msgid ""
+"Automatically switch between orthographic and perspective when changing from "
+"top/bottom/side views"
+msgstr ""
+
 msgid "Show &G-code Window"
 msgstr ""

@@ -4700,16 +4719,19 @@ msgid "&Help"
 msgstr ""

 #, possible-c-format, possible-boost-format
-msgid "A file exists with the same name: %s, do you want to override it."
+msgid "A file exists with the same name: %s, do you want to overwrite it?"
 msgstr ""

 #, possible-c-format, possible-boost-format
-msgid "A config exists with the same name: %s, do you want to override it."
+msgid "A config exists with the same name: %s, do you want to overwrite it?"
 msgstr ""

 msgid "Overwrite file"
 msgstr ""

+msgid "Overwrite config"
+msgstr ""
+
 msgid "Yes to All"
 msgstr ""

@@ -5969,6 +5991,22 @@ msgid ""
 "import it."
 msgstr ""

+msgid "INFO:"
+msgstr ""
+
+msgid ""
+"No accelerations provided for calibration. Use default acceleration value "
+msgstr ""
+
+msgid "mm/s²"
+msgstr ""
+
+msgid "No speeds provided for calibration. Use default optimal speed "
+msgstr ""
+
+msgid "mm/s"
+msgstr ""
+
 msgid "Import SLA archive"
 msgstr ""

@@ -6166,9 +6204,9 @@ msgstr ""

 #, possible-c-format, possible-boost-format
 msgid ""
-"Plate% d: %s is not suggested to be used to print filament %s(%s). If you "
+"Plate %d: %s is not suggested to be used to print filament %s(%s). If you "
 "still want to do this printing, please set this filament's bed temperature "
-"to non zero."
+"to non-zero."
 msgstr ""

 msgid "Switching the language requires application restart.\n"
@@ -7126,9 +7164,10 @@ msgid "Still print by object?"
 msgstr ""

 msgid ""
-"We have added an experimental style \"Tree Slim\" that features smaller "
-"support volume but weaker strength.\n"
-"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
+"When using support material for the support interface, We recommend the "
+"following settings:\n"
+"0 top z distance, 0 interface spacing, interlaced rectilinear pattern and "
+"disable independent support layer height"
 msgstr ""

 msgid ""
@@ -7137,19 +7176,6 @@ msgid ""
 "No  - Do not change these settings for me"
 msgstr ""

-msgid ""
-"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following "
-"settings: at least 2 interface layers, at least 0.1mm top z distance or "
-"using support materials on interface."
-msgstr ""
-
-msgid ""
-"When using support material for the support interface, We recommend the "
-"following settings:\n"
-"0 top z distance, 0 interface spacing, concentric pattern and disable "
-"independent support layer height"
-msgstr ""
-
 msgid ""
 "Enabling this option will modify the model's shape. If your print requires "
 "precise dimensions or is part of an assembly, it's important to double-check "
@@ -7195,8 +7221,8 @@ msgstr ""
 msgid ""
 "When recording timelapse without toolhead, it is recommended to add a "
 "\"Timelapse Wipe Tower\" \n"
-"by right-click the empty position of build plate and choose \"Add Primitive"
-"\"->\"Timelapse Wipe Tower\"."
+"by right-click the empty position of build plate and choose \"Add "
+"Primitive\"->\"Timelapse Wipe Tower\"."
 msgstr ""

 msgid ""
@@ -7766,7 +7792,7 @@ msgid ""
 msgstr ""

 #, possible-boost-format
-msgid "You have changed some settings of preset \"%1%\". "
+msgid "You have changed some settings of preset \"%1%\"."
 msgstr ""

 msgid ""
@@ -8852,6 +8878,11 @@ msgid ""
 "of raft layers"
 msgstr ""

+msgid ""
+"The prime tower is only supported for multiple objects if they are printed "
+"with the same support_top_z_distance"
+msgstr ""
+
 msgid ""
 "The prime tower requires that all objects are sliced with the same layer "
 "heights."
@@ -8862,12 +8893,23 @@ msgid ""
 "layer height"
 msgstr ""

+msgid ""
+"One or more object were assigned an extruder that the printer does not have."
+msgstr ""
+
 msgid "Too small line width"
 msgstr ""

 msgid "Too large line width"
 msgstr ""

+msgid ""
+"Printing with multiple extruders of differing nozzle diameters. If support "
+"is to be printed with the current filament (support_filament == 0 or "
+"support_interface_filament == 0), all nozzles have to be of the same "
+"diameter."
+msgstr ""
+
 msgid ""
 "The prime tower requires that support has the same layer height with object."
 msgstr ""
@@ -8962,6 +9004,9 @@ msgstr ""
 msgid "Failed processing of the filename_format template."
 msgstr ""

+msgid "Printer technology"
+msgstr ""
+
 msgid "Printable area"
 msgstr ""

@@ -9444,7 +9489,7 @@ msgstr ""

 msgid ""
 "Create additional perimeter paths over steep overhangs and areas where "
-"bridges cannot be anchored. "
+"bridges cannot be anchored."
 msgstr ""

 msgid "Reverse on even"
@@ -9563,9 +9608,6 @@ msgid ""
 "overhang."
 msgstr ""

-msgid "mm/s"
-msgstr ""
-
 msgid "Internal"
 msgstr ""

@@ -9686,9 +9728,6 @@ msgid ""
 "layer"
 msgstr ""

-msgid "mm/s²"
-msgstr ""
-
 msgid "Default filament profile"
 msgstr ""

@@ -10683,8 +10722,8 @@ msgid "mm/s² or %"
 msgstr ""

 msgid ""
-"Acceleration of sparse infill. If the value is expressed as a percentage (e."
-"g. 100%), it will be calculated based on the default acceleration."
+"Acceleration of sparse infill. If the value is expressed as a percentage "
+"(e.g. 100%), it will be calculated based on the default acceleration."
 msgstr ""

 msgid ""
@@ -10777,10 +10816,10 @@ msgstr ""

 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
-"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
-"\". \"full_fan_speed_layer\" will be ignored if lower than "
-"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
-"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"\"close_fan_the_first_x_layers\" to maximum at layer "
+"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
+"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
+"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""

 msgid "layer"
@@ -10908,7 +10947,7 @@ msgstr ""
 msgid ""
 "Don't print gap fill with a length is smaller than the threshold specified "
 "(in mm). This setting applies to top, bottom and solid infill and, if using "
-"the classic perimeter generator, to wall gap fill. "
+"the classic perimeter generator, to wall gap fill."
 msgstr ""

 msgid ""
@@ -11171,6 +11210,12 @@ msgstr ""
 msgid "Speed of internal sparse infill"
 msgstr ""

+msgid "Inherits profile"
+msgstr ""
+
+msgid "Name of parent profile"
+msgstr ""
+
 msgid "Interface shells"
 msgstr ""

@@ -12136,6 +12181,15 @@ msgstr ""
 msgid "How many layers of skirt. Usually only one layer"
 msgstr ""

+msgid "Single loop draft shield"
+msgstr ""
+
+msgid ""
+"Limits the draft shield loops to one wall after the first layer. This is "
+"useful, on occasion, to conserve filament but may cause the draft shield to "
+"warp / crack."
+msgstr ""
+
 msgid "Draft shield"
 msgstr ""

@@ -12190,7 +12244,7 @@ msgid ""
 "Using a non zero value is useful if the printer is set up to print without a "
 "prime line.\n"
 "Final number of loops is not taling into account whli arranging or "
-"validating objects distance. Increase loop number in such case. "
+"validating objects distance. Increase loop number in such case."
 msgstr ""

 msgid ""
@@ -12237,20 +12291,27 @@ msgstr ""
 msgid "Max XY Smoothing"
 msgstr ""

+#, no-c-format, no-boost-format
 msgid ""
-"Maximum distance to move points in XY to try to achieve a smooth spiralIf "
+"Maximum distance to move points in XY to try to achieve a smooth spiral. If "
 "expressed as a %, it will be computed over nozzle diameter"
 msgstr ""

-#, possible-c-format, possible-boost-format
+msgid "Spiral starting flow ratio"
+msgstr ""
+
+#, no-c-format, no-boost-format
 msgid ""
 "Sets the starting flow ratio while transitioning from the last bottom layer "
-"to the spiral. Normally the spiral transition scales the flow ratio from "
-"0% to 100% during the first loop which can in some cases lead to under "
+"to the spiral. Normally the spiral transition scales the flow ratio from 0% "
+"to 100% during the first loop which can in some cases lead to under "
 "extrusion at the start of the spiral."
 msgstr ""

-#, possible-c-format, possible-boost-format
+msgid "Spiral finishing flow ratio"
+msgstr ""
+
+#, no-c-format, no-boost-format
 msgid ""
 "Sets the finishing flow ratio while ending the spiral. Normally the spiral "
 "transition scales the flow ratio from 100% to 0% during the last loop which "
@@ -12418,6 +12479,12 @@ msgstr ""
 msgid "XY separation between an object and its support"
 msgstr ""

+msgid "Support/object first layer gap"
+msgstr ""
+
+msgid "XY separation between an object and its support at the first layer."
+msgstr ""
+
 msgid "Pattern angle"
 msgstr ""

@@ -12570,7 +12637,7 @@ msgid ""
 "overhangs."
 msgstr ""

-msgid "Default (Grid/Organic"
+msgid "Default (Grid/Organic)"
 msgstr ""

 msgid "Snug"
@@ -12699,20 +12766,12 @@ msgid ""
 "support."
 msgstr ""

-msgid "Branch Diameter with double walls"
-msgstr ""
-
-#. TRN PrintSettings: "Organic supports" > "Branch Diameter"
-msgid ""
-"Branches with area larger than the area of a circle of this diameter will be "
-"printed with double walls for stability. Set this value to zero for no "
-"double walls."
-msgstr ""
-
 msgid "Support wall loops"
 msgstr ""

-msgid "This setting specify the count of walls around support"
+msgid ""
+"This setting specifies the count of support walls in the range of [0,2]. 0 "
+"means auto."
 msgstr ""

 msgid "Tree support with infill"
@@ -12728,8 +12787,8 @@ msgstr ""

 msgid ""
 "Enable this option for automated chamber temperature control. This option "
-"activates the emitting of an M191 command before the \"machine_start_gcode"
-"\"\n"
+"activates the emitting of an M191 command before the "
+"\"machine_start_gcode\"\n"
 " which sets the chamber temperature and waits until it is reached. In "
 "addition, it emits an M141 command at the end of the print to turn off the "
 "chamber heater, if present. \n"
@@ -12961,9 +13020,9 @@ msgid "Idle temperature"
 msgstr ""

 msgid ""
-"Nozzle temperature when the tool is currently not used in multi-tool setups."
-"This is only used when 'Ooze prevention' is active in Print Settings. Set to "
-"0 to disable."
+"Nozzle temperature when the tool is currently not used in multi-tool "
+"setups.This is only used when 'Ooze prevention' is active in Print Settings. "
+"Set to 0 to disable."
 msgstr ""

 msgid "X-Y hole compensation"
@@ -13153,18 +13212,125 @@ msgstr ""
 msgid " not in range "
 msgstr ""

+msgid "Export 3MF"
+msgstr ""
+
+msgid "Export project as 3MF."
+msgstr ""
+
+msgid "Export slicing data"
+msgstr ""
+
+msgid "Export slicing data to a folder."
+msgstr ""
+
+msgid "Load slicing data"
+msgstr ""
+
+msgid "Load cached slicing data from directory"
+msgstr ""
+
+msgid "Export STL"
+msgstr ""
+
+msgid "Export the objects as single STL."
+msgstr ""
+
+msgid "Export multiple STLs"
+msgstr ""
+
+msgid "Export the objects as multiple STLs to directory"
+msgstr ""
+
+msgid "Slice"
+msgstr ""
+
+msgid "Slice the plates: 0-all plates, i-plate i, others-invalid"
+msgstr ""
+
+msgid "Show command help."
+msgstr ""
+
+msgid "UpToDate"
+msgstr ""
+
+msgid "Update the configs values of 3mf to latest."
+msgstr ""
+
+msgid "downward machines check"
+msgstr ""
+
+msgid ""
+"check whether current machine downward compatible with the machines in the "
+"list"
+msgstr ""
+
+msgid "Load default filaments"
+msgstr ""
+
+msgid "Load first filament as default for those not loaded"
+msgstr ""
+
 msgid "Minimum save"
 msgstr ""

 msgid "export 3mf with minimum size."
 msgstr ""

+msgid "mtcpp"
+msgstr ""
+
+msgid "max triangle count per plate for slicing."
+msgstr ""
+
+msgid "mstpp"
+msgstr ""
+
+msgid "max slicing time per plate in seconds."
+msgstr ""
+
 msgid "No check"
 msgstr ""

 msgid "Do not run any validity checks, such as gcode path conflicts check."
 msgstr ""

+msgid "Normative check"
+msgstr ""
+
+msgid "Check the normative items."
+msgstr ""
+
+msgid "Output Model Info"
+msgstr ""
+
+msgid "Output the model's information."
+msgstr ""
+
+msgid "Export Settings"
+msgstr ""
+
+msgid "Export settings to a file."
+msgstr ""
+
+msgid "Send progress to pipe"
+msgstr ""
+
+msgid "Send progress to pipe."
+msgstr ""
+
+msgid "Arrange Options"
+msgstr ""
+
+msgid "Arrange options: 0-disable, 1-enable, others-auto"
+msgstr ""
+
+msgid "Repetions count"
+msgstr ""
+
+msgid "Repetions count of the whole model"
+msgstr ""
+
 msgid "Ensure on bed"
 msgstr ""

@@ -13172,6 +13338,17 @@ msgid ""
 "Lift the object above the bed when it is partially below. Disabled by default"
 msgstr ""

+msgid ""
+"Arrange the supplied models in a plate and merge them in a single model in "
+"order to perform actions once."
+msgstr ""
+
+msgid "Convert Unit"
+msgstr ""
+
+msgid "Convert the units of model"
+msgstr ""
+
 msgid "Orient Options"
 msgstr ""

@@ -13187,6 +13364,65 @@ msgstr ""
 msgid "Rotation angle around the Y axis in degrees."
 msgstr ""

+msgid "Scale the model by a float factor"
+msgstr ""
+
+msgid "Load General Settings"
+msgstr ""
+
+msgid "Load process/machine settings from the specified file"
+msgstr ""
+
+msgid "Load Filament Settings"
+msgstr ""
+
+msgid "Load filament settings from the specified file list"
+msgstr ""
+
+msgid "Skip Objects"
+msgstr ""
+
+msgid "Skip some objects in this print"
+msgstr ""
+
+msgid "Clone Objects"
+msgstr ""
+
+msgid "Clone objects in the load list"
+msgstr ""
+
+msgid "load uptodate process/machine settings when using uptodate"
+msgstr ""
+
+msgid ""
+"load uptodate process/machine settings from the specified file when using "
+"uptodate"
+msgstr ""
+
+msgid "load uptodate filament settings when using uptodate"
+msgstr ""
+
+msgid ""
+"load uptodate filament settings from the specified file when using uptodate"
+msgstr ""
+
+msgid ""
+"if enabled, check whether current machine downward compatible with the "
+"machines in the list"
+msgstr ""
+
+msgid "downward machines settings"
+msgstr ""
+
+msgid "the machine settings list need to do downward checking"
+msgstr ""
+
+msgid "Load assemble list"
+msgstr ""
+
+msgid "Load assemble object list from config file"
+msgstr ""
+
 msgid "Data directory"
 msgstr ""

@@ -13196,12 +13432,91 @@ msgid ""
 "storage."
 msgstr ""

+msgid "Output directory"
+msgstr ""
+
+msgid "Output directory for the exported files."
+msgstr ""
+
+msgid "Debug level"
+msgstr ""
+
+msgid ""
+"Sets debug logging level. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, "
+"5:trace\n"
+msgstr ""
+
+msgid "Enable timelapse for print"
+msgstr ""
+
+msgid "If enabled, this slicing will be considered using timelapse"
+msgstr ""
+
 msgid "Load custom gcode"
 msgstr ""

 msgid "Load custom gcode from json"
 msgstr ""

+msgid "Load filament ids"
+msgstr ""
+
+msgid "Load filament ids for each object"
+msgstr ""
+
+msgid "Allow multiple color on one plate"
+msgstr ""
+
+msgid "If enabled, the arrange will allow multiple color on one plate"
+msgstr ""
+
+msgid "Allow rotatations when arrange"
+msgstr ""
+
+msgid "If enabled, the arrange will allow rotations when place object"
+msgstr ""
+
+msgid "Avoid extrusion calibrate region when doing arrange"
+msgstr ""
+
+msgid ""
+"If enabled, the arrange will avoid extrusion calibrate region when place "
+"object"
+msgstr ""
+
+msgid "Skip modified gcodes in 3mf"
+msgstr ""
+
+msgid "Skip the modified gcodes in 3mf from Printer or filament Presets"
+msgstr ""
+
+msgid "MakerLab name"
+msgstr ""
+
+msgid "MakerLab name to generate this 3mf"
+msgstr ""
+
+msgid "MakerLab version"
+msgstr ""
+
+msgid "MakerLab version to generate this 3mf"
+msgstr ""
+
+msgid "metadata name list"
+msgstr ""
+
+msgid "metadata name list added into 3mf"
+msgstr ""
+
+msgid "metadata value list"
+msgstr ""
+
+msgid "metadata value list added into 3mf"
+msgstr ""
+
+msgid "Allow 3mf with newer version to be sliced"
+msgstr ""
+
 msgid "Current z-hop"
 msgstr ""

@@ -13476,9 +13791,6 @@ msgstr ""
 msgid "Detect overhangs for auto-lift"
 msgstr ""

-msgid "Generating support"
-msgstr ""
-
 msgid "Checking support necessity"
 msgstr ""

@@ -13497,6 +13809,9 @@ msgid ""
 "generation."
 msgstr ""

+msgid "Generating support"
+msgstr ""
+
 msgid "Optimizing toolpath"
 msgstr ""

@@ -13514,37 +13829,9 @@ msgid ""
 "XY Size compensation can not be combined with color-painting."
 msgstr ""

-#, possible-c-format, possible-boost-format
-msgid "Support: generate toolpath at layer %d"
-msgstr ""
-
-msgid "Support: detect overhangs"
-msgstr ""
-
 msgid "Support: generate contact points"
 msgstr ""

-msgid "Support: propagate branches"
-msgstr ""
-
-msgid "Support: draw polygons"
-msgstr ""
-
-msgid "Support: generate toolpath"
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid "Support: generate polygons at layer %d"
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid "Support: fix holes at layer %d"
-msgstr ""
-
-#, possible-c-format, possible-boost-format
-msgid "Support: propagate branches at layer %d"
-msgstr ""
-
 msgid ""
 "Unknown file format. Input file must have .stl, .obj, .amf(.xml) extension."
 msgstr ""
@@ -14077,9 +14364,21 @@ msgstr ""
 msgid "PA step: "
 msgstr ""

+msgid "Accelerations: "
+msgstr ""
+
+msgid "Speeds: "
+msgstr ""
+
 msgid "Print numbers"
 msgstr ""

+msgid "Comma-separated list of printing accelerations"
+msgstr ""
+
+msgid "Comma-separated list of printing speeds"
+msgstr ""
+
 msgid ""
 "Please input valid values:\n"
 "Start PA: >= 0.0\n"
@@ -14420,8 +14719,8 @@ msgid ""
 msgstr ""

 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you selected"
-"\". \n"
+"We would rename the presets as \"Vendor Type Serial @printer you "
+"selected\". \n"
 "To add preset for more printers, Please go to printer selection"
 msgstr ""

@@ -15176,6 +15475,50 @@ msgstr ""
 msgid "User cancelled."
 msgstr ""

+msgid "Head diameter"
+msgstr ""
+
+msgid "Max angle"
+msgstr ""
+
+msgid "Detection radius"
+msgstr ""
+
+msgid "Remove selected points"
+msgstr ""
+
+msgid "Remove all"
+msgstr ""
+
+msgid "Auto-generate points"
+msgstr ""
+
+msgid "Add a brim ear"
+msgstr ""
+
+msgid "Delete a brim ear"
+msgstr ""
+
+msgid "Adjust section view"
+msgstr ""
+
+msgid ""
+"Warning: The brim type is not set to \"painted\",the brim ears will not take "
+"effect !"
+msgstr ""
+
+msgid "Set the brim type to \"painted\""
+msgstr ""
+
+msgid " invalid brim ears"
+msgstr ""
+
+msgid "Brim Ears"
+msgstr ""
+
+msgid "Please select single object."
+msgstr ""
+
 #: resources/data/hints.ini: [hint:Precise wall]
 msgid "Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency?"
 msgstr ""
--- a/localization/i18n/ca/OrcaSlicer_ca.po
+++ b/localization/i18n/ca/OrcaSlicer_ca.po
--- a/localization/i18n/cs/OrcaSlicer_cs.po
+++ b/localization/i18n/cs/OrcaSlicer_cs.po
--- a/localization/i18n/de/OrcaSlicer_de.po
+++ b/localization/i18n/de/OrcaSlicer_de.po
--- a/localization/i18n/en/OrcaSlicer_en.po
+++ b/localization/i18n/en/OrcaSlicer_en.po
--- a/localization/i18n/es/OrcaSlicer_es.po
+++ b/localization/i18n/es/OrcaSlicer_es.po
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
--- a/localization/i18n/hu/OrcaSlicer_hu.po
+++ b/localization/i18n/hu/OrcaSlicer_hu.po
--- a/localization/i18n/it/OrcaSlicer_it.po
+++ b/localization/i18n/it/OrcaSlicer_it.po
--- a/localization/i18n/ja/OrcaSlicer_ja.po
+++ b/localization/i18n/ja/OrcaSlicer_ja.po
--- a/localization/i18n/ko/OrcaSlicer_ko.po
+++ b/localization/i18n/ko/OrcaSlicer_ko.po
--- a/localization/i18n/list.txt
+++ b/localization/i18n/list.txt
@@ -171,4 +171,5 @@ src/slic3r/Utils/Obico.cpp
 src/slic3r/Utils/SimplyPrint.cpp
 src/slic3r/Utils/Flashforge.cpp
 src/slic3r/GUI/Jobs/OAuthJob.cpp
-src/slic3r/GUI/BackgroundSlicingProcess.cpp
+src/slic3r/GUI/BackgroundSlicingProcess.cpp
+src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
--- a/localization/i18n/nl/OrcaSlicer_nl.po
+++ b/localization/i18n/nl/OrcaSlicer_nl.po
--- a/localization/i18n/pl/OrcaSlicer_pl.po
+++ b/localization/i18n/pl/OrcaSlicer_pl.po
--- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
+++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
--- a/localization/i18n/ru/OrcaSlicer_ru.po
+++ b/localization/i18n/ru/OrcaSlicer_ru.po
--- a/localization/i18n/sv/OrcaSlicer_sv.po
+++ b/localization/i18n/sv/OrcaSlicer_sv.po
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
--- a/localization/i18n/uk/OrcaSlicer_uk.po
+++ b/localization/i18n/uk/OrcaSlicer_uk.po
--- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
+++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
--- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
+++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
--- a/resources/profiles/Anker.json
+++ b/resources/profiles/Anker.json
@@ -1,6 +1,6 @@
 {
    "name": "Anker",
-    "version": "02.03.00.00",
+    "version":  "02.03.00.03",
    "force_update": "0",
    "description": "Anker configurations",
    "machine_model_list": [
--- a/resources/profiles/Anycubic.json
+++ b/resources/profiles/Anycubic.json
@@ -1,6 +1,6 @@
 {
    "name": "Anycubic",
-    "version": "02.03.00.00",
+    "version":  "02.03.00.03",
    "force_update": "0",
    "description": "Anycubic configurations",
    "machine_model_list": [
--- a/resources/profiles/Anycubic/process/0.08mm
+++ b/resources/profiles/Anycubic/process/0.08mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "450",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.10mm
+++ b/resources/profiles/Anycubic/process/0.10mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.22",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "150",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.12mm
+++ b/resources/profiles/Anycubic/process/0.12mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "430",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.15mm
+++ b/resources/profiles/Anycubic/process/0.15mm
@@ -29,7 +29,7 @@
 	"line_width": "0.4",
 	"infill_direction": "45",
 	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_pattern": "crosshatch",
 	"initial_layer_acceleration": "1000",
 	"travel_acceleration": "0",
 	"inner_wall_acceleration": "0",
--- a/resources/profiles/Anycubic/process/0.16mm
+++ b/resources/profiles/Anycubic/process/0.16mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "300",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.16mm
+++ b/resources/profiles/Anycubic/process/0.16mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "300",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "150",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "300",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.20mm
+++ b/resources/profiles/Anycubic/process/0.20mm
@@ -29,7 +29,7 @@
 	"line_width": "0.4",
 	"infill_direction": "45",
 	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_pattern": "crosshatch",
 	"initial_layer_acceleration": "1000",
 	"travel_acceleration": "0",
 	"inner_wall_acceleration": "0",
--- a/resources/profiles/Anycubic/process/0.24mm
+++ b/resources/profiles/Anycubic/process/0.24mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.28mm
+++ b/resources/profiles/Anycubic/process/0.28mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "120",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.28mm
+++ b/resources/profiles/Anycubic/process/0.28mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.30mm
+++ b/resources/profiles/Anycubic/process/0.30mm
@@ -29,7 +29,7 @@
 	"line_width": "0.4",
 	"infill_direction": "45",
 	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_pattern": "crosshatch",
 	"initial_layer_acceleration": "1000",
 	"travel_acceleration": "0",
 	"inner_wall_acceleration": "0",
--- a/resources/profiles/Anycubic/process/0.30mm
+++ b/resources/profiles/Anycubic/process/0.30mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.62",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "100",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Anycubic/process/0.40mm
+++ b/resources/profiles/Anycubic/process/0.40mm
@@ -192,7 +192,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.82",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "100",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Artillery.json
+++ b/resources/profiles/Artillery.json
@@ -1,6 +1,6 @@
 {
    "name": "Artillery",
-    "version": "02.03.00.00",
+    "version":  "02.03.00.03",
    "force_update": "0",
    "description": "Artillery configurations",
    "machine_model_list": [
--- a/resources/profiles/Artillery/machine/Artillery
+++ b/resources/profiles/Artillery/machine/Artillery
@@ -15,12 +15,12 @@
    ],
    "printable_area": [
      "0x0",
-      "230x0",
-      "230x230",
-      "0x230"
+      "220x0",
+      "220x220",
+      "0x220"
    ],
    "printable_height": "250",
-	"nozzle_type": "hardened_steel",
+	"nozzle_type": "brass",
 	"auxiliary_fan": "0",
 	"machine_max_acceleration_extruding": [
 		"1000",
@@ -86,16 +86,19 @@
 	],
 	"printer_settings_id": "Artillery",
 	"retraction_minimum_travel": [
-		"2"
+		"1"
 	],
 	"retract_before_wipe": [
 		"0%"
 	],
 	"retraction_length": [
-		"2.2"
+		"1"
 	],
 	"retract_length_toolchange": [
-		"10"
+		"4"
+	],
+	"retraction_speed": [
+		"35"
 	],
 	"deretraction_speed": [
 		"0"
@@ -110,5 +113,4 @@
    "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z",
    "layer_change_gcode": "",
    "scan_first_layer": "0"
-  }
-  
+}
--- a/resources/profiles/Artillery/machine/Artillery
+++ b/resources/profiles/Artillery/machine/Artillery
@@ -1,114 +1,117 @@
-{
-    "type": "machine",
-    "setting_id": "GM003",
-    "name": "Artillery Genius Pro 0.4 nozzle",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_machine_common",
-    "printer_model": "Artillery Genius Pro",
-    "default_print_profile": "0.20mm Standard @Artillery Genius Pro",
-    "nozzle_diameter": [
-        "0.4"
-    ],
-    "bed_exclude_area": [
-      "0x0"
-    ],
-    "printable_area": [
-      "0x0",
-      "230x0",
-      "230x230",
-      "0x230"
-    ],
-    "printable_height": "250",
-	"nozzle_type": "hardened_steel",
-	"auxiliary_fan": "0",
-	"machine_max_acceleration_extruding": [
-		"1000",
-		"1250"
-	],
-	"machine_max_acceleration_retracting": [
-		"1000",
-		"1250"
-	],
-	"machine_max_acceleration_travel": [
-		"1000",
-		"1250"
-	],
-	"machine_max_acceleration_x": [
-		"2000",
-		"1000"
-	],
-	"machine_max_acceleration_y": [
-		"2000",
-		"1000"
-	],
-	"machine_max_acceleration_z": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_e": [
-		"120",
-		"120"
-	],
-	"machine_max_speed_x": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_y": [
-		"500",
-		"200"
-	],
-	"machine_max_speed_z": [
-		"12",
-		"12"
-	],
-	"machine_max_jerk_e": [
-		"3",
-		"2.5"
-	],
-	"machine_max_jerk_x": [
-		"7",
-		"10"
-	],
-	"machine_max_jerk_y": [
-		"7",
-		"10"
-	],
-	"machine_max_jerk_z": [
-		"0.2",
-		"0.4"
-	],
-	"max_layer_height": [
-		"0.32"
-	],
-	"min_layer_height": [
-		"0.08"
-	],
-	"printer_settings_id": "Artillery",
-	"retraction_minimum_travel": [
-		"2"
-	],
-	"retract_before_wipe": [
-		"0%"
-	],
-	"retraction_length": [
-		"2.2"
-	],
-	"retract_length_toolchange": [
-		"10"
-	],
-	"deretraction_speed": [
-		"0"
-	],
-	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
-	"machine_pause_gcode": "M0",
-	"default_filament_profile": [
-		"Artillery Generic PLA"
-	],
-    "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nG29 S12000; bed mesh leveling\nM104 S[nozzle_temperature_initial_layer]; set hotend temperature\nM140 S[bed_temperature_initial_layer_single]; set heatbed temperature\nG90; Absolute Positioning\nG1 Y0 F5000; Move to front\nG1 X0 F5000; Move to origin\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3  Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface",
-    "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z",
-    "layer_change_gcode": "",
-    "scan_first_layer": "0"
-  }
-  
+{
+    "type": "machine",
+    "setting_id": "GM003",
+    "name": "Artillery Genius Pro 0.4 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_machine_common",
+    "printer_model": "Artillery Genius Pro",
+    "default_print_profile": "0.20mm Standard @Artillery Genius Pro",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "bed_exclude_area": [
+      "0x0"
+    ],
+    "printable_area": [
+      "0x0",
+      "220x0",
+      "220x220",
+      "0x220"
+    ],
+    "printable_height": "250",
+	"nozzle_type": "brass",
+	"auxiliary_fan": "0",
+	"machine_max_acceleration_extruding": [
+		"1000",
+		"1250"
+	],
+	"machine_max_acceleration_retracting": [
+		"1000",
+		"1250"
+	],
+	"machine_max_acceleration_travel": [
+		"1000",
+		"1250"
+	],
+	"machine_max_acceleration_x": [
+		"2000",
+		"1000"
+	],
+	"machine_max_acceleration_y": [
+		"2000",
+		"1000"
+	],
+	"machine_max_acceleration_z": [
+		"500",
+		"200"
+	],
+	"machine_max_speed_e": [
+		"120",
+		"120"
+	],
+	"machine_max_speed_x": [
+		"500",
+		"200"
+	],
+	"machine_max_speed_y": [
+		"500",
+		"200"
+	],
+	"machine_max_speed_z": [
+		"12",
+		"12"
+	],
+	"machine_max_jerk_e": [
+		"3",
+		"2.5"
+	],
+	"machine_max_jerk_x": [
+		"7",
+		"10"
+	],
+	"machine_max_jerk_y": [
+		"7",
+		"10"
+	],
+	"machine_max_jerk_z": [
+		"0.2",
+		"0.4"
+	],
+	"max_layer_height": [
+		"0.32"
+	],
+	"min_layer_height": [
+		"0.08"
+	],
+	"printer_settings_id": "Artillery",
+	"retraction_minimum_travel": [
+		"1"
+	],
+	"retract_before_wipe": [
+		"0%"
+	],
+	"retraction_length": [
+		"1"
+	],
+	"retract_length_toolchange": [
+		"4"
+	],
+	"retraction_speed": [
+		"35"
+	],
+	"deretraction_speed": [
+		"0"
+	],
+	"single_extruder_multi_material": "1",
+	"change_filament_gcode": "",
+	"machine_pause_gcode": "M0",
+	"default_filament_profile": [
+		"Artillery Generic PLA"
+	],
+    "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nG29 S12000; bed mesh leveling\nM104 S[nozzle_temperature_initial_layer]; set hotend temperature\nM140 S[bed_temperature_initial_layer_single]; set heatbed temperature\nG90; Absolute Positioning\nG1 Y0 F5000; Move to front\nG1 X0 F5000; Move to origin\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3  Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface",
+    "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z",
+    "layer_change_gcode": "",
+    "scan_first_layer": "0"
+}
+  
--- a/resources/profiles/Artillery/machine/Artillery
+++ b/resources/profiles/Artillery/machine/Artillery
@@ -20,7 +20,7 @@
      "0x300"
    ],
    "printable_height": "400",
-	"nozzle_type": "hardened_steel",
+	"nozzle_type": "brass",
 	"auxiliary_fan": "0",
 	"machine_max_acceleration_extruding": [
 		"1250",
@@ -79,10 +79,10 @@
 		"0.4"
 	],
 	"max_layer_height": [
-		"0.25"
+		"0.32"
 	],
 	"min_layer_height": [
-		"0.07"
+		"0.08"
 	],
 	"printer_settings_id": "Artillery",
 	"retraction_minimum_travel": [
@@ -92,7 +92,7 @@
 		"0%"
 	],
 	"retraction_length": [
-		"0.8"
+		"1"
 	],
 	"retract_length_toolchange": [
 		"4"
@@ -114,5 +114,4 @@
    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n",
 	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
    "scan_first_layer": "0"
-  }
-  
+}
--- a/resources/profiles/Artillery/machine/Artillery
+++ b/resources/profiles/Artillery/machine/Artillery
@@ -20,7 +20,7 @@
      "0x300"
    ],
    "printable_height": "400",
-	"nozzle_type": "hardened_steel",
+	"nozzle_type": "brass",
 	"auxiliary_fan": "0",
 	"machine_max_acceleration_extruding": [
 		"1250",
@@ -79,10 +79,10 @@
 		"0.4"
 	],
 	"max_layer_height": [
-		"0.25"
+		"0.32"
 	],
 	"min_layer_height": [
-		"0.07"
+		"0.08"
 	],
 	"printer_settings_id": "Artillery",
 	"retraction_minimum_travel": [
@@ -92,7 +92,7 @@
 		"0%"
 	],
 	"retraction_length": [
-		"0.8"
+		"1"
 	],
 	"retract_length_toolchange": [
 		"4"
@@ -114,5 +114,4 @@
    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n",
 	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
    "scan_first_layer": "0"
-  }
-  
+}
--- a/resources/profiles/Artillery/process/0.20mm
+++ b/resources/profiles/Artillery/process/0.20mm
@@ -186,7 +186,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "150",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Artillery/process/0.20mm
+++ b/resources/profiles/Artillery/process/0.20mm
@@ -186,7 +186,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "150",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Artillery/process/0.20mm
+++ b/resources/profiles/Artillery/process/0.20mm
@@ -186,7 +186,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/Artillery/process/0.20mm
+++ b/resources/profiles/Artillery/process/0.20mm
@@ -186,7 +186,7 @@
    "sparse_infill_density": "15%",
    "sparse_infill_filament": "1",
    "sparse_infill_line_width": "0.45",
-    "sparse_infill_pattern": "grid",
+    "sparse_infill_pattern": "crosshatch",
    "sparse_infill_speed": "200",
    "spiral_mode": "0",
    "spiral_mode_max_xy_smoothing": "200%",
--- a/resources/profiles/BBL.json
+++ b/resources/profiles/BBL.json
@@ -1,7 +1,7 @@
 {
    "name": "Bambulab",
    "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-    "version": "01.10.00.34",
+    "version": "01.10.00.35",
    "force_update": "0",
    "description": "the initial version of BBL configurations",
    "machine_model_list": [
@@ -995,7 +995,7 @@
        },
        {
            "name": "eSUN PLA+ @base",
-            "sub_path": "filament/eSUN PLA+ @base.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @base.json"
        },
        {
            "name": "Generic PP @base",
@@ -2763,19 +2763,19 @@
        },
        {
            "name": "eSUN PLA+ @BBL A1",
-            "sub_path": "filament/eSUN PLA+ @BBL A1.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1.json"
        },
        {
            "name": "eSUN PLA+ @BBL A1 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL A1 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1 0.2 nozzle.json"
        },
        {
            "name": "eSUN PLA+ @BBL A1M",
-            "sub_path": "filament/eSUN PLA+ @BBL A1M.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1M.json"
        },
        {
            "name": "eSUN PLA+ @BBL A1M 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL A1M 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL A1M 0.2 nozzle.json"
        },
        {
            "name": "eSUN PLA+ @BBL P1P",
@@ -2787,15 +2787,15 @@
        },
        {
            "name": "eSUN PLA+ @BBL X1",
-            "sub_path": "filament/eSUN PLA+ @BBL X1.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1.json"
        },
        {
            "name": "eSUN PLA+ @BBL X1C",
-            "sub_path": "filament/eSUN PLA+ @BBL X1C.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1C.json"
        },
        {
            "name": "eSUN PLA+ @BBL X1C 0.2 nozzle",
-            "sub_path": "filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json"
+            "sub_path": "filament/eSUN/eSUN PLA+ @BBL X1C 0.2 nozzle.json"
        },
        {
            "name": "Generic PP @BBL A1",
@@ -3404,4 +3404,4 @@
            "sub_path": "machine/Bambu Lab A1 0.8 nozzle.json"
        }
    ]
-}
+}
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @BBL A1",
    "inherits": "SUNLU PLA Marble @base",
    "from": "system",
-    "setting_id": "SNLS06_02",
+    "setting_id": "GFSNLS06_02",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @BBL A1M",
    "inherits": "SUNLU PLA Marble @base",
    "from": "system",
-    "setting_id": "SNLS06_03",
+    "setting_id": "GFSNLS06_03",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @BBL P1P",
    "inherits": "SUNLU PLA Marble @base",
    "from": "system",
-    "setting_id": "SNLS06_01",
+    "setting_id": "GFSNLS06_01",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @BBL X1",
    "inherits": "SUNLU PLA Marble @base",
    "from": "system",
-    "setting_id": "SNLS06_00",
+    "setting_id": "GFSNLS06_00",
    "instantiation": "true",
    "filament_long_retractions_when_cut": [
        "1"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @BBL X1C",
    "inherits": "SUNLU PLA Marble @base",
    "from": "system",
-    "setting_id": "SNLS06",
+    "setting_id": "GFSNLS06",
    "instantiation": "true",
    "filament_long_retractions_when_cut": [
        "1"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Marble @base",
    "inherits": "fdm_filament_pla",
    "from": "system",
-    "filament_id": "SNL06",
+    "filament_id": "GFSNL06",
    "instantiation": "false",
    "filament_cost": [
        "31.99"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1 0.2 nozzle",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08_03",
+    "setting_id": "GFSNLS08_03",
    "instantiation": "true",
    "filament_flow_ratio": [
        "0.94"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1 0.8 nozzle",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08_04",
+    "setting_id": "GFSNLS08_04",
    "instantiation": "true",
    "fan_max_speed": [
        "60"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08_02",
+    "setting_id": "GFSNLS08_02",
    "instantiation": "true",
    "filament_flow_ratio": [
        "0.94"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1M 0.2 nozzle",
    "inherits": "SUNLU PETG @BBL X1C 0.2 nozzle",
    "from": "system",
-    "setting_id": "SNLS08_06",
+    "setting_id": "GFSNLS08_06",
    "instantiation": "true",
    "filament_flow_ratio": [
        "0.94"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1M 0.8 nozzle",
    "inherits": "SUNLU PETG @BBL X1C 0.8 nozzle",
    "from": "system",
-    "setting_id": "SNLS08_07",
+    "setting_id": "GFSNLS08_07",
    "instantiation": "true",
    "filament_flow_ratio": [
        "0.94"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL A1M 0.4 nozzle",
    "inherits": "SUNLU PETG @BBL X1C",
    "from": "system",
-    "setting_id": "SNLS08_05",
+    "setting_id": "GFSNLS08_05",
    "instantiation": "true",
    "filament_flow_ratio": [
        "0.94"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL X1C 0.2 nozzle",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08_00",
+    "setting_id": "GFSNLS08_00",
    "instantiation": "true",
    "filament_max_volumetric_speed": [
        "1"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL X1C 0.8 nozzle",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08_01",
+    "setting_id": "GFSNLS08_01",
    "instantiation": "true",
    "fan_max_speed": [
        "60"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @BBL X1C",
    "inherits": "SUNLU PETG @base",
    "from": "system",
-    "setting_id": "SNLS08",
+    "setting_id": "GFSNLS08",
    "instantiation": "true",
    "filament_max_volumetric_speed": [
        "14"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PETG @base",
    "inherits": "fdm_filament_pet",
    "from": "system",
-    "filament_id": "SNL08",
+    "filament_id": "GFSNL08",
    "instantiation": "false",
    "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.",
    "cool_plate_temp": [
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL A1 0.2 nozzle",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_06",
+    "setting_id": "GFSNLS02_06",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL A1",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_05",
+    "setting_id": "GFSNLS02_05",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL A1M 0.2 nozzle",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_08",
+    "setting_id": "GFSNLS02_08",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL A1M",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_07",
+    "setting_id": "GFSNLS02_07",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL P1P 0.2 nozzle",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_04",
+    "setting_id": "GFSNLS02_04",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL P1P",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_03",
+    "setting_id": "GFSNLS02_03",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL X1",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_01",
+    "setting_id": "GFSNLS02_01",
    "instantiation": "true",
    "slow_down_layer_time": [
        "8"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL X1C 0.2 nozzle",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02_00",
+    "setting_id": "GFSNLS02_00",
    "instantiation": "true",
    "filament_max_volumetric_speed": [
        "2"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @BBL X1C",
    "inherits": "SUNLU PLA Matte @base",
    "from": "system",
-    "setting_id": "SNLS02",
+    "setting_id": "GFSNLS02",
    "instantiation": "true",
    "compatible_printers": [
        "Bambu Lab X1 Carbon 0.4 nozzle",
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA Matte @base",
    "inherits": "fdm_filament_pla",
    "from": "system",
-    "filament_id": "SNL02",
+    "filament_id": "GFSNL02",
    "instantiation": "false",
    "filament_cost": [
        "25.99"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL A1 0.2 nozzle",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_05",
+    "setting_id": "GFSNLS04_05",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL A1",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_04",
+    "setting_id": "GFSNLS04_04",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL A1M 0.2 nozzle",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_06",
+    "setting_id": "GFSNLS04_06",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL A1M",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_07",
+    "setting_id": "GFSNLS04_07",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL P1P 0.2 nozzle",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_03",
+    "setting_id": "GFSNLS04_03",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL P1P",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_02",
+    "setting_id": "GFSNLS04_02",
    "instantiation": "true",
    "fan_cooling_layer_time": [
        "80"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL X1",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_00",
+    "setting_id": "GFSNLS04_00",
    "instantiation": "true",
    "slow_down_layer_time": [
        "10"
--- a/resources/profiles/BBL/filament/SUNLU/SUNLU
+++ b/resources/profiles/BBL/filament/SUNLU/SUNLU
@@ -3,7 +3,7 @@
    "name": "SUNLU PLA+ 2.0 @BBL X1C 0.2 nozzle",
    "inherits": "SUNLU PLA+ 2.0 @base",
    "from": "system",
-    "setting_id": "SNLS04_01",
+    "setting_id": "GFSNLS04_01",
    "instantiation": "true",
    "filament_max_volumetric_speed": [
        "1.8"
--- a/Show More
+++ b/Show More