Fix issue with auto orient a scaled object. (#3904)

Partly revert 73ab032e82

.github/workflows/build_deps.yml

@@ -70,7 +70,7 @@ jobs:
         if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-            brew install cmake git gettext automake
+            brew install cmake git gettext automake texinfo
             brew list
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
@@ -88,7 +88,7 @@ jobs:
             libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
             libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-4.0-dev \
             libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
-            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev
+            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev texinfo
             mkdir -p ${{ github.workspace }}/deps/build
             mkdir -p ${{ github.workspace }}/deps/build/destdir
             sudo ./BuildLinux.sh -ur

.gitignore

@@ -30,4 +30,5 @@ src/OrcaSlicer-doc/
 **/process_full/
 **/machine_full/
 **/filament_full/
-/deps/DL_CACHE/
+/deps/DL_CACHE/
+/deps/DL_CACHE

BuildLinux.sh

@@ -78,7 +78,7 @@ then
 fi
 
 # Addtional Dev packages for OrcaSlicer
-export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
+export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules texinfo"
 # libwebkit2gtk-4.1-dev ??
 export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
 if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then

CMakeLists.txt

@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.13)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
     endif ()
+    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
 endif ()
 
 project(OrcaSlicer)
@@ -60,7 +61,6 @@ if (APPLE)
     if (CMAKE_MACOSX_BUNDLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
 
     message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
@@ -315,7 +315,7 @@ if(WIN32)
     add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     if(MSVC)
         # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
-        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
+        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
         # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
         add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")

README.md

@@ -22,10 +22,15 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
 
 # How to install
 **Windows**: 
-1.  Install and run  
+1.  Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
+    - *For convenience there is also a portable build available.*
     - *If you have troubles to run the build, you might need to install following runtimes:*
-      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)  
+      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
-      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)  
+          - [Details of this runtime](https://aka.ms/webview2)
+          - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
+      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
+          -  [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
+          -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
 
 **Mac**:
 1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
@@ -51,16 +56,21 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
 **Linux(Ubuntu)**:
  1. If you run into trouble to execute it, try this command in terminal:  
     `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
+    
 # How to compile
 - Windows 64-bit  
   - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
+      - You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/).
+      - Strawberry Perl is [available on their github repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
   - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
 
 - Mac 64-bit  
-  - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf
+  - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf, texinfo
+      - You can install most of them by running `brew install cmake gettext libtool automake autoconf texinfo`
   - run `build_release_macos.sh`
 
-- Ubuntu  
+- Ubuntu 
+  - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo`
   - run 'sudo ./BuildLinux.sh -u'
   - run './BuildLinux.sh -dsir'
 

deps/Boost/Boost.cmake

@@ -1,203 +1,25 @@
-include(ExternalProject)
 
-# Use boost 1.78 for Windows, to support VS2022
+set(_context_abi_line "")
-if (WIN32)
+set(_context_arch_line "")
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-	set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
+    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
-    set(_bootstrap_cmd bootstrap.bat)
+        set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
-    set(_build_cmd  b2.exe)
+    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
-else()
+        set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
-	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
-	set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
-    set(_bootstrap_cmd ./bootstrap.sh)
-    set(_build_cmd ./b2)
-endif()
-
-set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
-    set(_boost_toolset gcc)
-    set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
-    if (MSVC_VERSION EQUAL 1800)
-    # 1800      = VS 12.0 (v120 toolset)
-        set(_boost_toolset "msvc-12.0")
-    elseif (MSVC_VERSION EQUAL 1900)
-    # 1900      = VS 14.0 (v140 toolset)
-        set(_boost_toolset "msvc-14.0")
-    elseif (MSVC_VERSION LESS 1920)
-    # 1910-1919 = VS 15.0 (v141 toolset)
-        set(_boost_toolset "msvc-14.1")
-    elseif (MSVC_VERSION LESS 1930)
-    # 1920-1929 = VS 16.0 (v142 toolset)
-        set(_boost_toolset "msvc-14.2")
-    elseif (MSVC_VERSION LESS 1940)
-    # 1930-1939 = VS 17.0 (v143 toolset)
-        set(_boost_toolset "msvc-14.3")
-    else ()
-        message(FATAL_ERROR "Unsupported MSVC version")
     endif ()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
-    if (WIN32)
-        set(_boost_toolset "clang-win")
-    else()
-        set(_boost_toolset "clang")
-    endif()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-    set(_boost_toolset "intel")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    set(_boost_toolset "clang")
-endif()
-
-message(STATUS "Deduced boost toolset: ${_boost_toolset} based on ${CMAKE_CXX_COMPILER_ID} compiler")
-
-set(_libs "")
-foreach(_comp ${DEP_Boost_COMPONENTS})
-    list(APPEND _libs "--with-${_comp}")
-endforeach()
-
-if (BUILD_SHARED_LIBS)
-    set(_link shared)
-else()
-    set(_link static)
-endif()
-
-set(_bits "")
-if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-    set(_bits 64)
-elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-    set(_bits 32)
 endif ()
 
-include(ProcessorCount)
+orcaslicer_add_cmake_project(Boost
-ProcessorCount(NPROC)
+    URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
-file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
+    URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
-
+    LIST_SEPARATOR |
-
+    CMAKE_ARGS
-set(_boost_variants "")
+        -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
-if(CMAKE_BUILD_TYPE)
+        -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
-    list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
+        -DBUILD_TESTING:BOOL=OFF
-    list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
+        "${_context_abi_line}"
-endif()
+        "${_context_arch_line}"
-list(FIND CMAKE_CONFIGURATION_TYPES "Release" _cfg_rel)
-list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" _cfg_relwdeb)
-list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" _cfg_minsizerel)
-list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _cfg_deb)
-
-if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1)
-    list(APPEND _boost_variants release)
-endif()
-
-if (MSVC AND ${DEP_DEBUG} )
-    list(APPEND _boost_variants debug)
-endif()
-
-if (NOT _boost_variants)
-    set(_boost_variants release)
-endif()
-
-if (IS_CROSS_COMPILE AND APPLE)
-    if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
-        message(STATUS "Compiling Boost for arm64.")
-        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
-        message(STATUS "Compiling Boost with libs ${_libs}.")
-        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
-        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
-        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
-        set(_arch_flags "-arch arm64")
-        set(_boost_linkflags "linkflags=${_arch_flags}")
-        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
-    elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
-        message(STATUS "Compiling Boost for x86_64.")
-        set(_arch_flags "-arch x86_64")
-    endif()
-    set(_boost_linkflags "linkflags=${_arch_flags}")
-endif ()
-
-set(_boost_flags "")
-if(APPLE)
-    set(_boost_flags 
-        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
-elseif (UNIX)
-    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
-endif()
-
-set(_build_cmd ${_build_cmd}
-               ${_boost_flags}
-               ${_boost_linkflags}
-               -j${NPROC}
-               ${_libs}
-               --layout=versioned
-               --debug-configuration
-               toolset=${_boost_toolset}
-               address-model=${_bits}
-               link=${_link}
-               threading=multi
-               boost.locale.icu=off
-               --disable-icu
-               ${_boost_variants}
-               stage)
-
-set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
-
-if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
-    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
-    message(STATUS "Standard boost build with patch command '${_patch_command}'")
-    message(STATUS "Standard boost build with build command '${_build_cmd}'")
-    message(STATUS "Standard boost build with install command '${_install_cmd}'")
-ExternalProject_Add(
-    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
-    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
-    CONFIGURE_COMMAND "${_bootstrap_cmd}"
-    PATCH_COMMAND ${_patch_command}
-    BUILD_COMMAND "${_build_cmd}"
-    BUILD_IN_SOURCE    ON
-    INSTALL_COMMAND "${_install_cmd}"
 )
 
-else()
+set(DEP_Boost_DEPENDS ZLIB)
-
-ExternalProject_Add(
-    dep_Boost
-	URL ${_boost_url}
-    URL_HASH SHA256=${_boost_hash}
-    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
-    CONFIGURE_COMMAND ./bootstrap.sh
-        --with-toolset=clang
-        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
-        "--prefix=${DESTDIR}/usr/local"
-#    PATCH_COMMAND ${_patch_command}
-    BUILD_COMMAND "${_build_cmd}"
-    BUILD_IN_SOURCE    ON
-    INSTALL_COMMAND "${_install_cmd}"
-)
-endif()
-
-if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-    message(STATUS "Patch the boost::polygon library with a custom one.")
-    # Patch the boost::polygon library with a custom one.
-    ExternalProject_Add(dep_boost_polygon
-        EXCLUDE_FROM_ALL ON
-        # GIT_REPOSITORY "https://github.com/prusa3d/polygon"
-        # GIT_TAG prusaslicer_gmp
-        URL https://github.com/prusa3d/polygon/archive/refs/heads/prusaslicer_gmp.zip
-        URL_HASH SHA256=abeb9710f0a7069fb9b22181ae5c56f6066002f125db210e7ffb27032aed6824
-        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/boost_polygon
-        DEPENDS dep_Boost
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        ${_cmake_args_osx_arch}
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
-            "${DESTDIR}/usr/local/include/boost/polygon"
-    )
-    # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
-    list(APPEND _dep_list "dep_boost_polygon")
-endif ()

deps/CMakeLists.txt

@@ -24,8 +24,10 @@ cmake_minimum_required(VERSION 3.2)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
     endif ()
+    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+
 endif ()
 
 project(OrcaSlicer-deps)
@@ -170,7 +172,6 @@ if (MSVC)
     endif ()
 elseif (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     if (CMAKE_OSX_DEPLOYMENT_TARGET)
         set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
         message("OS X Deployment Target: ${DEP_OSX_TARGET}")

deps/MPFR/MPFR.cmake

@@ -26,8 +26,8 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_MPFR
-        URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
+        URL https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2
-        URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
+        URL_HASH SHA256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
         CONFIGURE_COMMAND autoreconf -f -i && 

localization/i18n/de/OrcaSlicer_de.po

@@ -491,44 +491,44 @@ msgstr "Fehlerhafte Verbinder gefunden"
 #, c-format, boost-format
 msgid "%1$d connector is out of cut contour"
 msgid_plural "%1$d connectors are out of cut contour"
-msgstr[0] ""
+msgstr[0] "%1$d Verbinder ist außerhalb des Schnittkontur"
-msgstr[1] ""
+msgstr[1] "%1$d Verbinder sind außerhalb des Schnittkontur"
 
 #, c-format, boost-format
 msgid "%1$d connector is out of object"
 msgid_plural "%1$d connectors are out of object"
-msgstr[0] ""
+msgstr[0] "%1$d Verbinder ist außerhalb des Objekts"
-msgstr[1] ""
+msgstr[1] "%1$d Verbinder sind außerhalb des Objekts"
 
 msgid "Some connectors are overlapped"
 msgstr "Einige Verbinder überlappen sich"
 
 msgid "Select at least one object to keep after cutting."
-msgstr ""
+msgstr "Wählen Sie mindestens ein Objekt aus, das nach dem Schneiden erhalten bleiben soll."
 
 msgid "Cut plane is placed out of object"
-msgstr ""
+msgstr "Schnittfläche ist außerhalb des Objekts platziert"
 
 msgid "Cut plane with groove is invalid"
-msgstr ""
+msgstr "Schnittfläche mit Nut ist ungültig"
 
 msgid "Connector"
 msgstr "Verbinder"
 
 msgid "Cut by Plane"
-msgstr ""
+msgstr "Schnitt durch Ebene"
 
 msgid "non-manifold edges be caused by cut tool, do you want to fix it now?"
-msgstr ""
+msgstr "Nicht-manifold Kanten durch Schneidwerkzeug verursacht, möchten Sie es jetzt beheben?"
 
 msgid "Repairing model object"
 msgstr "Modellobjekt reparieren"
 
 msgid "Cut by line"
-msgstr ""
+msgstr "Schnitt durch Linie"
 
 msgid "Delete connector"
-msgstr ""
+msgstr "Verbinder löschen"
 
 msgid "Mesh name"
 msgstr "Netzname"
@@ -4058,7 +4058,7 @@ msgstr "Volumen:"
 msgid "Size:"
 msgstr "Größe:"
 
-#, c-format, boost-format
+#, boost-format
 msgid ""
 "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
 "separate the conflicted objects farther (%s <-> %s)."
@@ -4494,7 +4494,6 @@ msgstr "Durchflussrate"
 msgid "Pressure advance"
 msgstr "Pressure advance"
 
-#, fuzzy
 msgid "Retraction test"
 msgstr "Rückzugslängen Test"
 
@@ -6704,8 +6703,8 @@ msgstr ""
 msgid ""
 "Timelapse is not supported because Print sequence is set to \"By object\"."
 msgstr ""
-"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach Objekt"
+"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach "
-"\" eingestellt ist."
+"Objekt\" eingestellt ist."
 
 msgid "Errors"
 msgstr "Fehler"
@@ -7038,13 +7037,13 @@ msgstr "Ignorieren"
 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"
+"by right-click the empty position of build plate and choose \"Add "
-"\"->\"Timelapse Wipe Tower\"."
+"Primitive\"->\"Timelapse Wipe Tower\"."
 msgstr ""
 "Wenn Sie einen Zeitraffer ohne Werkzeugkopf aufnehmen, wird empfohlen, einen "
 "\"Timelapse Wischturm\" hinzuzufügen, indem Sie mit der rechten Maustaste "
-"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"->"
+"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"-"
-"\"Timelapse Wischturm\" wählen."
+">\"Timelapse Wischturm\" wählen."
 
 msgid "Line width"
 msgstr "Breite der Linie"
@@ -7301,11 +7300,9 @@ msgstr "Toolchange-Parameter bei Multi-Extruder-MM-Druckern"
 msgid "Printable space"
 msgstr "Druckbarer Raum"
 
-#, fuzzy
 msgid "Cooling Fan"
 msgstr "Kühlung"
 
-#, fuzzy
 msgid "Fan speed-up time"
 msgstr "Lüfter Beschleunigungszeit"
 
@@ -8714,7 +8711,6 @@ msgstr ""
 "Passwort in die URL in folgendem Format eingegeben werden: https://username:"
 "password@Ihre-octopi-Adresse/"
 
-#, fuzzy
 msgid "Device UI"
 msgstr "Gerät"
 
@@ -10218,7 +10214,6 @@ msgstr "Bewegung"
 msgid "Travel speed of initial layer"
 msgstr "Bewegungsgeschwindigkeit der ersten Schicht"
 
-#, fuzzy
 msgid "Number of slow layers"
 msgstr "Anzahl der lansamen Schichten"
 
@@ -10243,19 +10238,18 @@ msgstr "Volle Lüfterdrehzahl ab Schicht"
 
 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"
+"\"close_fan_the_first_x_layers\" to maximum at layer "
-"\". \"full_fan_speed_layer\" will be ignored if lower than "
+"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
-"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
+"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
-"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""
-"Die Lüftergeschwindigkeit wird linear von Null bei der Schicht"
+"Die Lüftergeschwindigkeit wird linear von Null bei der "
-"\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht "
+"Schicht\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht "
 "\"full_fan_speed_layer\" erhöht. \"full_fan_speed_layer\" wird ignoriert, "
 "wenn es niedriger ist als \"close_fan_the_first_x_layers\",in diesem Fall "
 "läuft der Lüfter bei Schicht \"close_fan_the_first_x_layers\"+ 1 mit maximal "
 "zulässiger Geschwindigkeit."
 
-#, fuzzy
 msgid "Support interface fan speed"
 msgstr "Stützstruktur-Schnittstelle"
 
@@ -10442,7 +10436,6 @@ msgstr ""
 "den Start-G-Code verschoben, wenn nur benutzerdefinierterStart-G-Code "
 "aktiviert ist. Verwende 0, um den Lüfter zu deaktivieren."
 
-#, fuzzy
 msgid "Only overhangs"
 msgstr "Nur an Überhängen"
 
@@ -10505,7 +10498,6 @@ msgstr "Mit welcher Art von G-Code ist der Drucker kompatibel"
 msgid "Klipper"
 msgstr "Klipper"
 
-#, fuzzy
 msgid "Label objects"
 msgstr "Objekte beschriften"
 
@@ -11407,7 +11399,6 @@ msgstr ""
 msgid "Role base wipe speed"
 msgstr "Rollenbasierte Wipe Geschwindigkeit"
 
-#, fuzzy
 msgid ""
 "The wipe speed is determined by the speed of the current extrusion role.e.g. "
 "if a wipe action is executed immediately following an outer wall extrusion, "
@@ -12945,7 +12936,7 @@ msgid ""
 "cause the result not exactly the same in each calibration. We are still "
 "investigating the root cause to do improvements with new updates."
 msgstr ""
-"Bitte finden Sie die Details der Flussdynamik-Kalibrierung in unserem Wiki.\n"
+"Sie finden die Details der Dynamischen-Kalibrierung in unserem Wiki.\n"
 "\n"
 "Normalerweise ist die Kalibrierung nicht erforderlich. Wenn Sie einen Einzel-"
 "Farb-/Materialdruck mit der Option \"Flussdynamik-Kalibrierung\" im "
@@ -13438,11 +13429,9 @@ msgstr ""
 "Schritt >= 0\n"
 "Ende > Start + Schritt)"
 
-#, fuzzy
 msgid "Start retraction length: "
 msgstr "Start Rückzugslänge"
 
-#, fuzzy
 msgid "End retraction length: "
 msgstr "Ende Rückzugslänge"
 
@@ -13468,7 +13457,6 @@ msgstr ""
 "Der Dateiname für den Upload endet nicht mit \"%s\". Möchten Sie den Vorgang "
 "fortsetzen?"
 
-#, fuzzy
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -13724,8 +13712,8 @@ msgstr ""
 "Möchten Sie es überschreiben?"
 
 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you selected"
+"We would rename the presets as \"Vendor Type Serial @printer you "
-"\". \n"
+"selected\". \n"
 "To add preset for more prinetrs, Please go to printer selection"
 msgstr ""
 "Wir würden die Voreinstellungen als \"Hersteller Typ Seriennummer @Drucker "
@@ -14124,7 +14112,7 @@ msgid "For more information, please check out Wiki"
 msgstr "Für weitere Informationen besuchen Sie bitte Wiki"
 
 msgid "Collapse"
-msgstr "Zusammenbruch"
+msgstr "Zuklappen"
 
 msgid "Daily Tips"
 msgstr "Tägliche Tipps"
@@ -14142,7 +14130,6 @@ msgstr ""
 "Kalibrierung nicht möglich: Möglicherweise, weil der eingestellte "
 "Kalibrierungswertebereich zu groß ist oder der Schritt zu klein ist"
 
-#, fuzzy
 msgid "Physical Printer"
 msgstr "Drucker"
 
@@ -14407,7 +14394,7 @@ msgid ""
 "Did you know that Orca Slicer offers a wide range of keyboard shortcuts and "
 "3D scene operations."
 msgstr ""
-"Wie werden Tastenkombinationen verwendet\n"
+"Tastenkombinationen verwenden\n"
 "Wussten Sie, dass Orca Slicer eine Vielzahl von Tastenkombinationen und 3D-"
 "Szenenoperationen bietet."
 
@@ -14427,9 +14414,9 @@ msgid ""
 "Did you know that you can cut a model at any angle and position with the "
 "cutting tool?"
 msgstr ""
-"Schnittwerkzeug\n"
+"Schneidwerkzeug\n"
-"Wussten Sie, dass Sie mit dem Schnittwerkzeug ein Modell in jedem beliebigen "
+"Wussten Sie, dass Sie ein Modell mit dem Schneidwerkzeug in jedem Winkel und "
-"Winkel und jeder beliebigen Position zerschneiden können?"
+"an jeder Position schneiden können?"
 
 #: resources/data/hints.ini: [hint:Fix Model]
 msgid ""
@@ -14447,7 +14434,8 @@ msgid ""
 "Did you know that you can generate a timelapse video during each print?"
 msgstr ""
 "Zeitraffer\n"
-"Wussten Sie, dass Sie bei jedem Druck ein Zeitraffervideo erstellen können?"
+"Wussten Sie, dass Sie während jedes Drucks ein Zeitraffervideo erstellen "
+"können?"
 
 #: resources/data/hints.ini: [hint:Auto-Arrange]
 msgid ""
@@ -14464,9 +14452,9 @@ msgid ""
 "Did you know that you can rotate objects to an optimal orientation for "
 "printing by a simple click?"
 msgstr ""
-"Automatische Ausrichtung\n"
+"Automatisch ausrichten\n"
-"Wussten Sie schon, dass Sie Objekte mit einem einfachen Klick in eine für "
+"Wussten Sie, dass Sie Objekte durch einen einfachen Klick in eine optimale "
-"den Druck optimale Ausrichtung drehen können?"
+"Druckausrichtung drehen können?"
 
 #: resources/data/hints.ini: [hint:Lay on Face]
 msgid ""
@@ -14602,9 +14590,9 @@ msgid ""
 "Did you know that you can print a model even faster, by using the Adaptive "
 "Layer Height option? Check it out!"
 msgstr ""
-"Beschleunigen Sie Ihren Druck mit adaptiven Schichthöhe\n"
+"Beschleunigen Sie Ihren Druck mit adaptiver Schichthöhe\n"
-"Wussten Sie, dass Sie ein Modell noch schneller drucken können, wenn Sie die "
+"Wussten Sie, dass Sie ein Modell noch schneller drucken können, indem Sie "
-"Option \"Adaptive Schichthöhe\" verwenden? Probiere es aus!"
+"die Option Adaptive Schichthöhe verwenden? Probiere es aus!"
 
 #: resources/data/hints.ini: [hint:Support painting]
 msgid ""
@@ -14637,10 +14625,10 @@ msgid ""
 "successfully? Higher temperature and lower speed are always recommended for "
 "the best results."
 msgstr ""
-"Drucken von Silkfilamenten\n"
+"Drucken von Seidenfilament\n"
-"Wussten Sie, dass Silkfilamente besondere Bedingungen erfordern, um "
+"Wussten Sie, dass Seidenfilament besondere Überlegungen erfordert, um es "
-"erfolgreich gedruckt zu werden? Eine höhere Temperatur und eine niedrigere "
+"erfolgreich zu drucken? Höhere Temperaturen und niedrigere Geschwindigkeiten "
-"Geschwindigkeit werden immer empfohlen, um die besten Ergebnisse zu erzielen."
+"werden immer für die besten Ergebnisse empfohlen."
 
 #: resources/data/hints.ini: [hint:Brim for better adhesion]
 msgid ""

localization/i18n/tr/OrcaSlicer_tr.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: OrcaSlicer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-12-29 22:55+0800\n"
-"PO-Revision-Date: 2023-12-29 22:35+0300\n"
+"PO-Revision-Date: 2024-01-01 00:01+0300\n"
 "Last-Translator: Olcay ÖREN\n"
 "Language-Team: Türkçe\n"
 "Language: tr_TR\n"
@@ -884,13 +884,13 @@ msgid "Unset italic"
 msgstr "Yatık ayarı kaldır"
 
 msgid "Set italic"
-msgstr "Yatık olarak ayarla"
+msgstr "Yatık"
 
 msgid "Unset bold"
 msgstr "Kalın ayarı kaldır"
 
 msgid "Set bold"
-msgstr "Kalın olarak ayarla"
+msgstr "Kalın"
 
 msgid "Revert text size."
 msgstr "Metin boyutunu geri döndür."
@@ -946,7 +946,7 @@ msgstr "Hizalamayı geri al."
 
 #. TRN EmbossGizmo: font units
 msgid "points"
-msgstr "noktalar"
+msgstr "punto"
 
 msgid "Revert gap between characters"
 msgstr "Karakterler arasındaki boşluğu geri döndür"
@@ -994,7 +994,7 @@ msgid "Select from True Type Collection."
 msgstr "True Type Koleksiyonundan seçim yapın."
 
 msgid "Set text to face camera"
-msgstr "Metni yüz kamerasına ayarla"
+msgstr "Metni bana çevir"
 
 msgid "Orient the text towards the camera."
 msgstr "Metni kameraya doğru yönlendirin."
@@ -1048,7 +1048,7 @@ msgstr "Satır boşluğu"
 
 #. TRN - Input label. Be short as possible
 msgid "Boldness"
-msgstr "Boldness"
+msgstr "Kalınlık"
 
 #. TRN - Input label. Be short as possible
 #. Like Font italic
@@ -1269,7 +1269,7 @@ msgid "Center of circle"
 msgstr "Çemberin merkezi"
 
 msgid "ShiftLeft mouse button"
-msgstr "Shift Sol fare düğmesi"
+msgstr "Shift + Sol fare düğmesi"
 
 msgid "Select feature"
 msgstr "Özellik seçin"
@@ -1278,10 +1278,10 @@ msgid "Select point"
 msgstr "Nokta seç"
 
 msgid "Delete"
-msgstr "Sil"
+msgstr "Delete"
 
 msgid "Restart selection"
-msgstr "Seçimi yeniden başlat"
+msgstr "Seçimi sıfırla"
 
 msgid "Esc"
 msgstr "Esc"
@@ -13831,7 +13831,7 @@ msgid "For more information, please check out Wiki"
 msgstr "Daha fazla bilgi için lütfen Wiki'ye göz atın"
 
 msgid "Collapse"
-msgstr "Çökme"
+msgstr "Daralt"
 
 msgid "Daily Tips"
 msgstr "Günlük İpuçları"

localization/i18n/uk/OrcaSlicer_uk.po

@@ -23,16 +23,16 @@ msgid "Supports Painting"
 msgstr "Малювання підтримки"
 
 msgid "Alt + Mouse wheel"
-msgstr "Alt + Коліщатко миші"
+msgstr "Alt + коліщатко миші"
 
 msgid "Section view"
 msgstr "Вигляд у розрізі"
 
 msgid "Reset direction"
-msgstr "Напрямок скидання"
+msgstr "Скинути напрямок"
 
 msgid "Ctrl + Mouse wheel"
-msgstr "Ctrl + Коліщатко миші"
+msgstr "Ctrl + коліщатко миші"
 
 msgid "Pen size"
 msgstr "Розмір пера"
@@ -53,7 +53,7 @@ msgid "Shift + Left mouse button"
 msgstr "Shift + Ліва кнопка миші"
 
 msgid "Erase"
-msgstr "Ластик"
+msgstr "Гумка"
 
 msgid "Erase all painting"
 msgstr "Стерти всі малюнки"
@@ -74,13 +74,13 @@ msgid "Tool type"
 msgstr "Тип інструменту"
 
 msgid "Smart fill angle"
-msgstr "Розумний кут заливки"
+msgstr "Розумний кут заповнення"
 
 msgid "On overhangs only"
-msgstr "Тільки на звисах"
+msgstr "Тільки на виступах"
 
 msgid "Auto support threshold angle: "
-msgstr "Кут порога автоматичної підтримки: "
+msgstr "Пороговий кут автоматичної підтримки: "
 
 msgid "Circle"
 msgstr "Коло"
@@ -118,8 +118,8 @@ msgid ""
 "Filament count exceeds the maximum number that painting tool supports. only "
 "the first %1% filaments will be available in painting tool."
 msgstr ""
-"Кількість філаменту перевищує максимальну кількість, яка підтримуєінструмент "
+"Кількість філаменту перевищує максимальну кількість, яку підтримує інструмент "
-"для фарбування. тільки перші %1% ниток будуть доступні у засобі забарвлення."
+"малювання. Лише перші %1% філаменту будуть доступні в інструменті малювання."
 
 msgid "Color Painting"
 msgstr "Кольорове малювання"
@@ -149,34 +149,34 @@ msgid "Brush"
 msgstr "Пензель"
 
 msgid "Smart fill"
-msgstr "Інтелектуальне заливання"
+msgstr "Інтелектуальне заповнення"
 
 msgid "Bucket fill"
-msgstr "Заливка відра"
+msgstr "Заповнення відром"
 
 msgid "Height range"
 msgstr "Діапазон висот"
 
 msgid "Alt + Shift + Enter"
-msgstr ""
+msgstr "Alt + Shift + Enter"
 
 msgid "Toggle Wireframe"
 msgstr "Переключення каркасу"
 
 msgid "Shortcut Key "
-msgstr "Поєднання клавіш "
+msgstr "Комбінація клавіш "
 
 msgid "Triangle"
 msgstr "Трикутник"
 
 msgid "Height Range"
-msgstr "Переключити каркас"
+msgstr "Діапазон висот"
 
 msgid "Vertical"
-msgstr ""
+msgstr "Вертикальний"
 
 msgid "Horizontal"
-msgstr ""
+msgstr "Горизонтальний"
 
 msgid "Remove painted color"
 msgstr "Видалити зафарбований колір"
@@ -201,7 +201,7 @@ msgid "Optimize orientation"
 msgstr "Оптимізувати орієнтацію"
 
 msgid "Apply"
-msgstr "Готово"
+msgstr "Застосувати"
 
 msgid "Scale"
 msgstr "Масштаб"
@@ -475,7 +475,7 @@ msgid "Keep"
 msgstr "Тримати"
 
 msgid "Flip"
-msgstr "Переверніть"
+msgstr "Перевернути"
 
 msgid "After cut"
 msgstr "Після вирізування"
@@ -790,7 +790,7 @@ msgid "OK"
 msgstr "ОК"
 
 msgid "Rename style"
-msgstr ""
+msgstr "Перейменувати стиль"
 
 msgid "Rename current style."
 msgstr ""
@@ -818,13 +818,13 @@ msgid "Only valid font can be added to style."
 msgstr ""
 
 msgid "Add style to my list."
-msgstr ""
+msgstr "Додати стиль до мого списку."
 
 msgid "Save as new style."
-msgstr ""
+msgstr "Зберегти як новий стиль."
 
 msgid "Remove style"
-msgstr ""
+msgstr "Видалити стиль"
 
 msgid "Can't remove the last existing style."
 msgstr ""
@@ -1241,7 +1241,7 @@ msgid "Edge"
 msgstr ""
 
 msgid "Plane"
-msgstr ""
+msgstr "Площина"
 
 msgid "Point on edge"
 msgstr ""
@@ -1809,13 +1809,13 @@ msgid "Mirror object"
 msgstr "Дзеркальний об'єкт"
 
 msgid "Edit text"
-msgstr ""
+msgstr "Редагувати текст"
 
 msgid "Ability to change text, font, size, ..."
 msgstr ""
 
 msgid "Edit SVG"
-msgstr ""
+msgstr "Редагувати SVG"
 
 msgid "Change SVG source file, projection, size, ..."
 msgstr ""
@@ -2995,7 +2995,7 @@ msgid ""
 "The AMS will automatically read the filament information when inserting a "
 "new Bambu Lab filament. This takes about 20 seconds."
 msgstr ""
-"AMS автоматично зчитує інформацію про філаментає при вставці новогоФіламент "
+"AMS автоматично зчитає інформацію про філамент при вставці нового філаменту "
 "Bambu Lab. Це займає близько 20 секунд."
 
 msgid ""
@@ -3003,17 +3003,17 @@ msgid ""
 "automatically read any information until printing is completed."
 msgstr ""
 "Примітка: якщо під час друку буде вставлено новий філамент, AMS не "
-"будеавтоматично читати будь-яку інформацію до завершення друку."
+"буде автоматично читати будь-яку інформацію до завершення друку."
 
 msgid ""
 "When inserting a new filament, the AMS will not automatically read its "
 "information, leaving it blank for you to enter manually."
 msgstr ""
-"При вставці нової нитки AMS не автоматично зчитуватиме її\n"
+"При вставці новогр філаменту, AMS не ьуде автоматично зчитувати \n"
-"інформацію, залишивши поле порожнім для введення вручну."
+"інформацію про нього, залишивши поле порожнім для введення вручну."
 
 msgid "Power on update"
-msgstr "Оновлення під час увімкнення"
+msgstr "Оновлення після ввімкнення"
 
 msgid ""
 "The AMS will automatically read the information of inserted filament on "
@@ -3028,9 +3028,9 @@ msgid ""
 "during startup and will continue to use the information recorded before the "
 "last shutdown."
 msgstr ""
-"AMS не буде автоматично зчитувати інформацію з вставленої нитки.\n"
+"AMS не буде автоматично зчитувати інформацію про вставлений філамент\n"
 "під час запуску і продовжуватиме використовувати інформацію, записану до\n"
-"останнє вимкнення."
+"останнтого вимкнення."
 
 msgid "Update remaining capacity"
 msgstr "Оновити ємність, що залишилася"
@@ -3683,7 +3683,7 @@ msgid "Total"
 msgstr "Загальний"
 
 msgid "Tower"
-msgstr ""
+msgstr "Вежа"
 
 msgid "Total Estimation"
 msgstr "Загальна оцінка"
@@ -3692,7 +3692,7 @@ msgid "Total time"
 msgstr "Загальний час"
 
 msgid "Total cost"
-msgstr ""
+msgstr "Загальна вартість"
 
 msgid "up to"
 msgstr "аж до"
@@ -4067,7 +4067,7 @@ msgid "Application is closing"
 msgstr "Додаток закривається"
 
 msgid "Closing Application while some presets are modified."
-msgstr "Закриття програми при зміні деяких пресетів."
+msgstr "Закриття програми під чвс зміни деяких налаштувань."
 
 msgid "Logging"
 msgstr "Ведення журналу"
@@ -4082,7 +4082,7 @@ msgid "Device"
 msgstr "Пристрій"
 
 msgid "Project"
-msgstr "Проект"
+msgstr "Проєкт"
 
 msgid "Yes"
 msgstr "Так"
@@ -4091,7 +4091,7 @@ msgid "No"
 msgstr "Ні"
 
 msgid "will be closed before creating a new model. Do you want to continue?"
-msgstr "буде закрито перед створенням нової моделі. Ви хочете продовжувати?"
+msgstr "буде закрито перед створенням нової моделі. Ви хочете продовжити?"
 
 msgid "Slice plate"
 msgstr "Нарізати моделі"
@@ -4929,7 +4929,7 @@ msgid "Rate the Print Profile"
 msgstr ""
 
 msgid "Comment"
-msgstr ""
+msgstr "Коментувати"
 
 msgid "Rate this print"
 msgstr ""
@@ -5213,10 +5213,10 @@ msgstr "Верх"
 
 msgctxt "Layers"
 msgid "Bottom"
-msgstr "Ніз"
+msgstr "Низ"
 
 msgid "Enable AI monitoring of printing"
-msgstr "Увімкнути ІІ-моніторинг друку"
+msgstr "Увімкнути ШІ-моніторинг друку"
 
 msgid "Sensitivity of pausing is"
 msgstr "Чутливість паузи"
@@ -5228,7 +5228,7 @@ msgid ""
 "The localization tag of build plate is detected, and printing is paused if "
 "the tag is not in predefined range."
 msgstr ""
-"Виявлено тег локалізації робочої пластини, і друк припиняється,якщо\n"
+"Виявлено тег локалізації робочої пластини, і друк припиняється, якщо\n"
 "тег не знаходиться в певному діапазоні."
 
 msgid "First Layer Inspection"
@@ -5771,21 +5771,21 @@ msgid ""
 msgstr ""
 
 msgid "Private protection"
-msgstr ""
+msgstr "Приватний захист"
 
 msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
 msgstr ""
 
 msgid "Upload and Print"
-msgstr ""
+msgstr "Завантажити і друкувати"
 
 msgid ""
 "Print By Object: \n"
 "Suggest to use auto-arrange to avoid collisions when printing."
 msgstr ""
-"Друк об'єктом: \n"
+"Друк за об'єктом: \n"
-"Запропонуйте використовувати автоматичне розташування, щоб уникнути "
+"Рекомендовано використовувати автоматичне розташування, щоб уникнути "
-"колізійпід час друку."
+"колізій під час друку."
 
 msgid "Send G-code"
 msgstr "Надіслати G-код"
@@ -6468,7 +6468,7 @@ msgid ""
 "printer firmware to support AMS slot assignment."
 msgstr ""
 "Філамент %s не відповідає філаменту в слоті AMS %s. Будь ласка, оновіть "
-"Прошивка принтера для підтримки призначення слотів AMS."
+"прошивку принтера для підтримки перепризначення слотів AMS."
 
 msgid ""
 "Filament does not match the filament in AMS slot. Please update the printer "
@@ -6481,13 +6481,13 @@ msgid ""
 "The printer firmware only supports sequential mapping of filament => AMS "
 "slot."
 msgstr ""
-"Прошивка принтера підтримує лише послідовне зіставленняфіламенту => AMS слот."
+"Прошивка принтера підтримує лише послідовне зіставлення філаменту => AMS слот."
 
 msgid "An SD card needs to be inserted before printing."
-msgstr "Перед печаткою необхідно вставити картку SD."
+msgstr "Перед початком друку необхідно вставити картку SD."
 
 msgid "The selected printer is incompatible with the chosen printer presets."
-msgstr ""
+msgstr "Вибраний принтер несумісний зі встановленими налаштуваннями."
 
 msgid "An SD card needs to be inserted to record timelapse."
 msgstr "SD-карта повинна бути вставлена для запису таймлапсу."
@@ -6644,7 +6644,7 @@ msgid "Would you like to log in this printer with current account?"
 msgstr "Ви хочете увійти до цього принтера з поточним обліковим записом?"
 
 msgid "Check the reason"
-msgstr ""
+msgstr "Перевірте причину"
 
 msgid "Read and accept"
 msgstr ""
@@ -6893,7 +6893,7 @@ msgid "Post-processing Scripts"
 msgstr "Сценарії постобробки"
 
 msgid "Notes"
-msgstr ""
+msgstr "Примітки"
 
 msgid "Frequent"
 msgstr "Частий"
@@ -7039,10 +7039,10 @@ msgid "Complete print"
 msgstr ""
 
 msgid "Filament start G-code"
-msgstr "G-код початку Філаменту"
+msgstr "G-код початку філаменту"
 
 msgid "Filament end G-code"
-msgstr "G-код кінця Філаменту"
+msgstr "G-код кінця філаменту"
 
 msgid "Multimaterial"
 msgstr ""
@@ -10571,7 +10571,7 @@ msgstr ""
 "конфігурації шляхом читання змінних середовища."
 
 msgid "Printer notes"
-msgstr ""
+msgstr "Нотатки для принтера"
 
 msgid "You can put your notes regarding the printer here."
 msgstr ""
@@ -14097,7 +14097,7 @@ msgstr ""
 #~ "Material becomes soft at this temperature. Thus the heatbed cannot be "
 #~ "hotter than this tempature"
 #~ msgstr ""
-#~ "При цій температурі матеріал стає м'яким. Таким чином, нагріваєтьсяшар не "
+#~ "При цій температурі матеріал стає м'яким. Таким чином, нагрівається шар не "
 #~ "може бути гарячішим, ніж ця температура"
 
 #~ msgid "Enable this option if machine has auxiliary part cooling fan"

resources/profiles/Anker.json

@@ -1,6 +1,6 @@
 {
     "name": "Anker",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Anker configurations",
     "machine_model_list": [

resources/profiles/Anycubic.json

@@ -1,6 +1,6 @@
 {
     "name": "Anycubic",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Anycubic configurations",
     "machine_model_list": [

resources/profiles/Artillery.json

@@ -1,6 +1,6 @@
 {
     "name": "Artillery",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Artillery configurations",
     "machine_model_list": [

resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json

@@ -8,7 +8,7 @@
     "compatible_printers": [
         "Bambu Lab X1 Carbon 0.8 nozzle",
         "Bambu Lab X1 0.8 nozzle",
-        "Bambu Lab P1S 0.6 nozzle",
+        "Bambu Lab P1S 0.8 nozzle",
         "Bambu Lab X1E 0.8 nozzle"
     ]
-}
+}

resources/profiles/BIQU.json

@@ -1,6 +1,6 @@
 {
     "name": "BIQU",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "BIQU configurations",
     "machine_model_list": [

resources/profiles/Comgrow.json

@@ -1,6 +1,6 @@
 {
 	"name": "Comgrow",
-	"version": "01.09.00.01",
+	"version": "01.09.00.02",
 	"force_update": "0",
 	"description": "Comgrow configurations",
 	"machine_model_list": [

resources/profiles/Creality.json

@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "01.09.00.01",
+	"version": "01.09.00.02",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [

resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json

@@ -106,16 +106,21 @@
 	"deretraction_speed": [
 		"40"
 	],
-    "z_hop": [
+	"z_hop": [
-        "0.1"
+		"0.1"
-    ],
+	],
 	"single_extruder_multi_material": "1",
+	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
-	"machine_pause_gcode": "M25",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Creality Generic PLA @Ender-3V3-all"
 	],
 	"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp  \nG28 ;Home \n \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp  \nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize  \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize  \nG1 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json

@@ -107,6 +107,7 @@
 		"30"
 	],
 	"single_extruder_multi_material": "1",
+	"manual_filament_change": "1",
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
@@ -114,5 +115,9 @@
 	],
 	"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \n \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0  ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y0 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json

@@ -36,13 +36,22 @@
 	"retract_before_wipe": ["70%"],
 	"retraction_length": ["0.5"],
 	"retract_length_toolchange": ["1"],
+	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json

@@ -38,12 +38,20 @@
 	"retract_length_toolchange": ["1"],
 	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json

@@ -36,13 +36,22 @@
 	"retract_before_wipe": ["70%"],
 	"retraction_length": ["0.5"],
 	"retract_length_toolchange": ["1"],
+	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json

@@ -37,13 +37,22 @@
 	"retract_before_wipe": ["70%"],
 	"retraction_length": ["0.5"],
 	"retract_length_toolchange": ["1"],
+	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json

@@ -37,13 +37,22 @@
 	"retract_before_wipe": ["70%"],
 	"retraction_length": ["0.5"],
 	"retract_length_toolchange": ["1"],
+	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json

@@ -37,13 +37,22 @@
 	"retract_before_wipe": ["70%"],
 	"retraction_length": ["0.5"],
 	"retract_length_toolchange": ["1"],
+	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
-	"z_hop": ["0.4"],
+	"extruder_clearance_height_to_lid": "101",
+	"extruder_clearance_height_to_rod": "45",
+	"extruder_clearance_radius": "45",
+	"z_hop": ["0.2"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"manual_filament_change": "1",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Creality Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
-	"scan_first_layer": "0"
+	"scan_first_layer": "0",
+	"thumbnails": [
+		"96x96",
+		"300x300"
+	]
 }

resources/profiles/Creality/machine/fdm_machine_common.json

@@ -113,6 +113,8 @@
         "1"
     ],
     "z_hop_types": "Normal Lift",
+    "support_air_filtration": "0",
+    "support_chamber_temp_control": "0",
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
     "default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle",
     "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",

resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3SE.json

@@ -14,7 +14,7 @@
 	"bottom_shell_thickness": "0",
 	"bridge_flow": "0.95",
 	"bridge_speed": "100",
-    "brim_type": "no_brim",
+	"brim_type": "no_brim",
 	"brim_width": "0",
 	"brim_object_gap": "0.1",
 	"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
 	"support_interface_spacing": "0.5",
 	"support_interface_speed": "100%",
 	"support_interface_pattern": "auto",
-	"support_base_pattern": "default",
+	"support_base_pattern": "rectilinear",
 	"support_base_pattern_spacing": "2.5",
 	"support_speed": "50",
 	"support_threshold_angle": "25",

resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3SE.json

@@ -14,7 +14,7 @@
 	"bottom_shell_thickness": "0",
 	"bridge_flow": "0.95",
 	"bridge_speed": "100",
-    "brim_type": "no_brim",
+	"brim_type": "no_brim",
 	"brim_width": "0",
 	"brim_object_gap": "0.1",
 	"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
 	"support_interface_spacing": "0.5",
 	"support_interface_speed": "100%",
 	"support_interface_pattern": "auto",
-	"support_base_pattern": "default",
+	"support_base_pattern": "rectilinear",
 	"support_base_pattern_spacing": "2.5",
 	"support_speed": "50",
 	"support_threshold_angle": "25",

resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3SE.json

@@ -14,7 +14,7 @@
 	"bottom_shell_thickness": "0",
 	"bridge_flow": "0.95",
 	"bridge_speed": "100",
-    "brim_type": "no_brim",
+	"brim_type": "no_brim",
 	"brim_width": "0",
 	"brim_object_gap": "0.1",
 	"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
 	"support_interface_spacing": "0.5",
 	"support_interface_speed": "100%",
 	"support_interface_pattern": "auto",
-	"support_base_pattern": "default",
+	"support_base_pattern": "rectilinear",
 	"support_base_pattern_spacing": "2.5",
 	"support_speed": "50",
 	"support_threshold_angle": "25",

resources/profiles/Custom.json

@@ -1,6 +1,6 @@
 {
     "name": "Custom Printer",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "My configurations",
     "machine_model_list": [

resources/profiles/Elegoo.json

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

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json

@@ -45,13 +45,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.2 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json

@@ -45,13 +45,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.4 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json

@@ -45,13 +45,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.6 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json

@@ -45,13 +45,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.8 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json

@@ -75,13 +75,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.2 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X10 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+10, printable_height-10)} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json

@@ -75,13 +75,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.4 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X10 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+10, printable_height-10)} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json

@@ -75,13 +75,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.6 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X10 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+10, printable_height-10)} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json

@@ -75,13 +75,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.8 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X10 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+10, printable_height-10)} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json

@@ -81,13 +81,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.2 nozzle"
 	],
-	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 s[first_layer_bed_temperature]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0 F6000\nG1 Z0 F300\nM109 s[first_layer_temperature]\nG92 E0 ;Reset Extruder\nG1 X115 Y0 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json

@@ -81,13 +81,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.4 nozzle"
 	],
-	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 s[first_layer_bed_temperature]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0 F6000\nG1 Z0 F300\nM109 s[first_layer_temperature]\nG92 E0 ;Reset Extruder\nG1 X115 Y0 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json

@@ -81,13 +81,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.6 nozzle"
 	],
-	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 s[first_layer_bed_temperature]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0 F6000\nG1 Z0 F300\nM109 s[first_layer_temperature]\nG92 E0 ;Reset Extruder\nG1 X115 Y0 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json

@@ -81,13 +81,13 @@
     "wipe_distance": ["1"],
     "z_hop": ["0.4"],
     "z_hop_types": ["Normal Lift"],
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.8 nozzle"
 	],
-	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 s[first_layer_bed_temperature]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0 F6000\nG1 Z0 F300\nM109 s[first_layer_temperature]\nG92 E0 ;Reset Extruder\nG1 X115 Y0 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
+	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json

@@ -48,13 +48,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.2 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json

@@ -48,13 +48,13 @@
 		"45"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
 		"Elegoo Generic PLA @0.4 nozzle"
 	],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json

@@ -25,11 +25,11 @@
 	"retract_length_toolchange": ["2"],
 	"deretraction_speed": ["45"],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "M600",
-	"machine_pause_gcode": "M0",
+	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"],
-	"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
 	"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"

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json

@@ -39,11 +39,11 @@
   "retract_length_toolchange": ["2"],
   "deretraction_speed": ["45"],
   "single_extruder_multi_material": "1",
-  "change_filament_gcode": "",
+  "change_filament_gcode": "M600",
-  "machine_pause_gcode": "M0",
+  "machine_pause_gcode": "PAUSE",
   "default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"],
-  "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
-  "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
+	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish 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",
   "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"

resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json

@@ -101,7 +101,7 @@
 		"40"
 	],
 	"single_extruder_multi_material": "1",
-	"change_filament_gcode": "",
+	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
 		"Elegoo Generic PLA"

resources/profiles/FLSun.json

@@ -1,6 +1,6 @@
 {
     "name": "FLSun",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "FLSun configurations",
     "machine_model_list": [

resources/profiles/Flashforge.json

@@ -1,7 +1,7 @@
 {
   "name": "Flashforge",
   "url": "",
-  "version": "01.09.00.01",
+  "version": "01.09.00.02",
   "force_update": "0",
   "description": "Flashforge configurations",
   "machine_model_list": [

resources/profiles/FlyingBear.json

@@ -1,6 +1,6 @@
 {
     "name": "FlyingBear",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "1",
     "description": "FlyingBear configurations",
     "machine_model_list": [

resources/profiles/Folgertech.json

@@ -1,6 +1,6 @@
 {
     "name": "Folgertech",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Folgertech configurations",
     "machine_model_list": [

resources/profiles/InfiMech.json

@@ -1,6 +1,6 @@
 {
     "name": "InfiMech",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "1",
     "description": "InfiMech configurations",
     "machine_model_list": [

resources/profiles/Kingroon.json

@@ -1,7 +1,7 @@
 {
   "name": "Kingroon",
   "url": "https://kingroon.com/",
-  "version": "01.09.00.01",
+  "version": "01.09.00.02",
   "force_update": "0",
   "description": "Kingroon configuration files",
   "machine_model_list": [

resources/profiles/OrcaArena.json

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

resources/profiles/Prusa.json

@@ -1,6 +1,6 @@
 {
     "name": "Prusa",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Prusa configurations",
     "machine_model_list": [

resources/profiles/Prusa/process/process_common_mk3.json

@@ -40,7 +40,7 @@
   "ironing_flow": "15%",
   "ironing_spacing": "0.1",
   "ironing_speed": "15",
-  "ironing_type": "top",
+  "ironing_type": "no ironing",
   "is_custom_defined": "1",
   "max_travel_detour_distance": "0",
   "min_bead_width": "85%",

resources/profiles/Qidi.json

@@ -1,6 +1,6 @@
 {
     "name": "Qidi",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Qidi configurations",
     "machine_model_list": [

resources/profiles/Raise3D.json

@@ -1,7 +1,7 @@
 {
     "name": "Raise3D",
     "url": "",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Raise3D configurations",
     "machine_model_list": [

resources/profiles/Ratrig.json

@@ -1,6 +1,6 @@
 {
     "name": "RatRig",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "RatRig configurations",
     "machine_model_list": [

resources/profiles/SecKit.json

@@ -1,6 +1,6 @@
 {
     "name": "SecKit",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "SecKit configurations",
     "machine_model_list": [

resources/profiles/Snapmaker.json

@@ -1,6 +1,6 @@
 {
   "name": "Snapmaker",
-  "version": "01.09.00.01",
+  "version": "01.09.00.02",
   "force_update": "0",
   "description": "Snapmaker configurations",
   "machine_model_list": [

resources/profiles/Sovol.json

@@ -1,7 +1,7 @@
 {
     "name": "Sovol",
     "url": "",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Sovol configurations",
     "machine_model_list": [

resources/profiles/Sovol/process/0.18mm Optimal @Sovol SV07.json

@@ -44,7 +44,7 @@
 	"ironing_flow": "15%",
 	"ironing_spacing": "0.25",
 	"ironing_speed": "15",
-	"ironing_type": "top",
+	"ironing_type": "no ironing",
 	"reduce_infill_retraction": "1",
 	"filename_format": "[input_filename_base].gcode",
 	"detect_overhang_wall": "1",

resources/profiles/Sovol/process/0.18mm Optimal @Sovol SV07Plus.json

@@ -44,7 +44,7 @@
 	"ironing_flow": "15%",
 	"ironing_spacing": "0.25",
 	"ironing_speed": "15",
-	"ironing_type": "top",
+	"ironing_type": "no ironing",
 	"reduce_infill_retraction": "1",
 	"filename_format": "[input_filename_base].gcode",
 	"detect_overhang_wall": "1",

resources/profiles/Sovol/process/0.20mm Standard @Sovol SV07.json

@@ -44,7 +44,7 @@
 	"ironing_flow": "15%",
 	"ironing_spacing": "0.25",
 	"ironing_speed": "15",
-	"ironing_type": "top",
+	"ironing_type": "no ironing",
 	"reduce_infill_retraction": "1",
 	"filename_format": "[input_filename_base].gcode",
 	"detect_overhang_wall": "1",

resources/profiles/Sovol/process/0.20mm Standard @Sovol SV07Plus.json

@@ -44,7 +44,7 @@
 	"ironing_flow": "15%",
 	"ironing_spacing": "0.25",
 	"ironing_speed": "15",
-	"ironing_type": "top",
+	"ironing_type": "no ironing",
 	"reduce_infill_retraction": "1",
 	"filename_format": "[input_filename_base].gcode",
 	"detect_overhang_wall": "1",

resources/profiles/Tronxy.json

@@ -1,6 +1,6 @@
 {
     "name": "Tronxy",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Tronxy configurations",
     "machine_model_list": [

resources/profiles/TwoTrees.json

@@ -1,6 +1,6 @@
 {
     "name": "TwoTrees",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "1",
     "description": "TwoTrees configurations",
     "machine_model_list": [

resources/profiles/UltiMaker.json

@@ -1,7 +1,7 @@
 {
     "name": "UltiMaker",
     "url": "",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "UltiMaker configurations",
     "machine_model_list": [

resources/profiles/Vivedino.json

@@ -1,6 +1,6 @@
 {
     "name": "Vivedino",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Vivedino configurations",
     "machine_model_list": [

resources/profiles/Voron.json

@@ -1,6 +1,6 @@
 {
     "name": "Voron",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Voron configurations",
     "machine_model_list": [

resources/profiles/Voxelab.json

@@ -1,7 +1,7 @@
 {
     "name": "Voxelab",
     "url": "",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Voxelab configurations",
     "machine_model_list": [

resources/profiles/Vzbot.json

@@ -1,6 +1,6 @@
 {
     "name": "Vzbot",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Vzbot configurations",
     "machine_model_list": [

resources/profiles/Wanhao.json

@@ -1,6 +1,6 @@
 {
     "name": "Wanhao",
-    "version": "01.09.00.01",
+    "version": "01.09.00.02",
     "force_update": "0",
     "description": "Wanhao configurations",
     "machine_model_list": [

resources/web/data/text.js

@@ -439,6 +439,9 @@ var LangText = {
     t92: "Cabane de Noël Bambu",
     t93: "Connexion à l'imprimante",
     t94: "Veuillez configurer la connexion de votre imprimante pour afficher l'interface.",
+    t109: "Filaments du système",
+    t110: "Filaments personnalisés",
+    t111: "Créer un nouveau filament",
     wk1: "Démarrage rapide",
     wk2: "Cet article présente l'utilisation la plus basique de Orca Slicer. Il guide les utilisateurs pour configurer le logiciel, créer des projets et effectuer la première tâche d'impression étape par étape.",
     wk3: "Workflow basé sur des projets",
@@ -454,7 +457,7 @@ var LangText = {
     wk13: "Format STEP",
     wk14: "Par rapport au format STL, le format STEP apporte des informations plus efficaces. Grâce à la grande précision de ce format, de nombreuses trajectoires d'extrusion peuvent être générées sous forme d'arcs. Il inclut également la relation d'assemblage de chaque pièce d'un modèle, qui peut être utilisée pour restaurer la vue d'assemblage après la coupe d'un modèle.",
     wk15: "Texte 3D",
-    wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité.",
+    wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité."  
   },
   zh_CN: {
     t1: "欢迎使用Orca Slicer",

src/OrcaSlicer.cpp

@@ -3066,7 +3066,7 @@ int CLI::run(int argc, char **argv)
         } else if (opt_key == "align_xy") {
             const Vec2d &p = m_config.option<ConfigOptionPoint>("align_xy")->value;
             for (auto &model : m_models) {
-                BoundingBoxf3 bb = model.bounding_box();
+                BoundingBoxf3 bb = model.bounding_box_exact();
                 // this affects volumes:
                 model.translate(-(bb.min.x() - p.x()), -(bb.min.y() - p.y()), -bb.min.z());
             }

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -44,6 +44,8 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
     if (junctions.size() <= min_path_size)
         return;
 
+    // TODO: allow for the first point to be removed in case of simplifying closed Extrusionlines.
+
     /* ExtrusionLines are treated as (open) polylines, so in case an ExtrusionLine is actually a closed polygon, its
      * starting and ending points will be equal (or almost equal). Therefore, the simplification of the ExtrusionLine
      * should not touch the first and last points. As a result, start simplifying from point at index 1.
@@ -52,16 +54,12 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
     // Starting junction should always exist in the simplified path
     new_junctions.emplace_back(junctions.front());
 
-    ExtrusionJunction previous = junctions.front();
+    /* Initially, previous_previous is always the same as previous because, for open ExtrusionLines the last junction
-    /* For open ExtrusionLines the last junction cannot be taken into consideration when checking the points at index 1.
+     * cannot be taken into consideration when checking the points at index 1. For closed ExtrusionLines, the first and
-     * For closed ExtrusionLines, the first and last junctions are the same, so use the prior to last juction.
+     * last junctions are anyway the same.
      * */
-    ExtrusionJunction previous_previous = this->is_closed ? junctions[junctions.size() - 2] : junctions.front();
+    ExtrusionJunction previous_previous = junctions.front();
-
+    ExtrusionJunction previous = junctions.front();
-    /* TODO: When deleting, combining, or modifying junctions, it would
-     * probably be good to set the new junction's width to a weighted average
-     * of the junctions it is derived from.
-     */
 
     /* When removing a vertex, we check the height of the triangle of the area
      being removed from the original polygon by the simplification. However,
@@ -78,20 +76,16 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
      From this area we compute the height of the representative triangle using
      the standard formula for a triangle area: A = .5*b*h
      */
-    const ExtrusionJunction& initial = junctions[1];
+    const ExtrusionJunction& initial = junctions.at(1);
     int64_t accumulated_area_removed = int64_t(previous.p.x()) * int64_t(initial.p.y()) - int64_t(previous.p.y()) * int64_t(initial.p.x()); // Twice the Shoelace formula for area of polygon per line segment.
 
-    // For a closed polygon we process the last point, which is the same as the first point.
+    for (size_t point_idx = 1; point_idx < junctions.size() - 1; point_idx++)
-    for (size_t point_idx = 1; point_idx < junctions.size() - (this->is_closed ? 0 : 1); point_idx++)
     {
-        // For the last point of a closed polygon, use the first point of the new polygon in case we modified it.
+        const ExtrusionJunction& current = junctions[point_idx];
-        const bool is_last = point_idx + 1 == junctions.size();
-        const ExtrusionJunction& current = is_last ? new_junctions[0] : junctions[point_idx];
 
         // Spill over in case of overflow, unless the [next] vertex will then be equal to [previous].
-        const bool spill_over = this->is_closed && point_idx + 2 >= junctions.size() &&
+        const bool spill_over = point_idx + 1 == junctions.size() && new_junctions.size() > 1;
-            point_idx + 2 - junctions.size() < new_junctions.size();
+        ExtrusionJunction& next = spill_over ? new_junctions[0] : junctions[point_idx + 1];
-        ExtrusionJunction& next = spill_over ? new_junctions[point_idx + 2 - junctions.size()] : junctions[point_idx + 1];
 
         const int64_t removed_area_next = int64_t(current.p.x()) * int64_t(next.p.y()) - int64_t(current.p.y()) * int64_t(next.p.x()); // Twice the Shoelace formula for area of polygon per line segment.
         const int64_t negative_area_closing = int64_t(next.p.x()) * int64_t(previous.p.y()) - int64_t(next.p.y()) * int64_t(previous.p.x()); // Area between the origin and the short-cutting segment
@@ -139,18 +133,12 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
                 // We should instead move this point to a location where both edges are kept and then remove the previous point that we wanted to keep.
                 // By taking the intersection of these two lines, we get a point that preserves the direction (so it makes the corner a bit more pointy).
                 // We just need to be sure that the intersection point does not introduce an artifact itself.
-                //                o < prev_prev
-                //                |
-                //                o < prev
-                //                  \  < short segment
-                // intersection > +   o-------------------o < next
-                //                    ^ current
                 Point intersection_point;
                 bool has_intersection = Line(previous_previous.p, previous.p).intersection_infinite(Line(current.p, next.p), &intersection_point);
                 if (!has_intersection
                     || Line::distance_to_infinite_squared(intersection_point, previous.p, current.p) > double(allowed_error_distance_squared)
                     || (intersection_point - previous.p).cast<int64_t>().squaredNorm() > smallest_line_segment_squared  // The intersection point is way too far from the 'previous'
-                    || (intersection_point - current.p).cast<int64_t>().squaredNorm() > smallest_line_segment_squared)  // and 'current' points, so it shouldn't replace 'current'
+                    || (intersection_point - next.p).cast<int64_t>().squaredNorm() > smallest_line_segment_squared)     // and 'next' points, so it shouldn't replace 'current'
                 {
                     // We can't find a better spot for it, but the size of the line is more than 5 micron.
                     // So the only thing we can do here is leave it in...
@@ -186,14 +174,15 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
         new_junctions.push_back(current);
     }
 
-    if (this->is_closed) {
+    // Ending junction (vertex) should always exist in the simplified path
-        /* The first and last points should be the same for a closed polygon.
+    new_junctions.emplace_back(junctions.back());
-         * We processed the last point above, so copy it into the first point.
+
-         */
+    /* In case this is a closed polygon (instead of a poly-line-segments), the invariant that the first and last points are the same should be enforced.
-        new_junctions.front().p = new_junctions.back().p;
+     * Since one of them didn't move, and the other can't have been moved further than the constraints, if originally equal, they can simply be equated.
-    } else {
+     */
-        // Ending junction (vertex) should always exist in the simplified path
+    if ((junctions.front().p - junctions.back().p).cast<int64_t>().squaredNorm() == 0)
-        new_junctions.emplace_back(junctions.back());
+    {
+        new_junctions.back().p = junctions.front().p;
     }
 
     junctions = new_junctions;

src/libslic3r/CMakeLists.txt

@@ -81,8 +81,6 @@ set(lisbslic3r_sources
     ExtrusionEntity.hpp
     ExtrusionEntityCollection.cpp
     ExtrusionEntityCollection.hpp
-    ExtrusionRole.cpp
-    ExtrusionRole.hpp
     ExtrusionSimulator.cpp
     ExtrusionSimulator.hpp
     FileParserError.hpp

src/libslic3r/CutSurface.cpp

@@ -28,7 +28,7 @@
 
 using namespace Slic3r;
 #include "ExPolygonsIndex.hpp"
-
+#include <boost/next_prior.hpp>
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
 #include <CGAL/Exact_integer.h>
 #include <CGAL/Surface_mesh.h>

src/libslic3r/ExtrusionRole.cpp

@@ -1,94 +0,0 @@
-///|/ Copyright (c) Prusa Research 2023 Pavel Mikuš @Godrak, Oleksandra Iushchenko @YuSanka, Vojtěch Bubník @bubnikv
-///|/
-///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-///|/
-#include "ExtrusionRole.hpp"
-#include "I18N.hpp"
-
-#include <string>
-#include <string_view>
-#include <cassert>
-
-
-namespace Slic3r {
-
-// Convert a rich bitmask based ExtrusionRole to a less expressive ordinal GCodeExtrusionRole.
-// GCodeExtrusionRole is to be serialized into G-code and deserialized by G-code viewer,
-GCodeExtrusionRole extrusion_role_to_gcode_extrusion_role(ExtrusionRole role)
-{
-    if (role == erNone)                return GCodeExtrusionRole::None;
-   	if (role == erOverhangPerimeter)                return GCodeExtrusionRole::OverhangPerimeter;
-	if (role == erExternalPerimeter)                return GCodeExtrusionRole::ExternalPerimeter;
-    if (role == erPerimeter)                		  return GCodeExtrusionRole::Perimeter;
-    if (role == erInternalInfill)      return GCodeExtrusionRole::InternalInfill;
-    if (role == erSolidInfill)         return GCodeExtrusionRole::SolidInfill;
-    if (role == erTopSolidInfill)      return GCodeExtrusionRole::TopSolidInfill;
-    if (role == erIroning)             return GCodeExtrusionRole::Ironing;
-    if (role == erBridgeInfill)        return GCodeExtrusionRole::BridgeInfill;
-    if (role == erGapFill)             return GCodeExtrusionRole::GapFill;
-    if (role == erSkirt)               return GCodeExtrusionRole::Skirt;
-    if (role == erSupportMaterial)     return GCodeExtrusionRole::SupportMaterial;
-    if (role == erSupportMaterialInterface) return GCodeExtrusionRole::SupportMaterialInterface;
-    if (role == erWipeTower)           return GCodeExtrusionRole::WipeTower;
-    assert(false);
-    return GCodeExtrusionRole::None;
-}
-
-std::string gcode_extrusion_role_to_string(GCodeExtrusionRole role)
-{
-    switch (role) {
-        case GCodeExtrusionRole::None                         : return L("Unknown");
-        case GCodeExtrusionRole::Perimeter                    : return L("Perimeter");
-        case GCodeExtrusionRole::ExternalPerimeter            : return L("External perimeter");
-        case GCodeExtrusionRole::OverhangPerimeter            : return L("Overhang perimeter");
-        case GCodeExtrusionRole::InternalInfill               : return L("Internal infill");
-        case GCodeExtrusionRole::SolidInfill                  : return L("Solid infill");
-        case GCodeExtrusionRole::TopSolidInfill               : return L("Top solid infill");
-        case GCodeExtrusionRole::Ironing                      : return L("Ironing");
-        case GCodeExtrusionRole::BridgeInfill                 : return L("Bridge infill");
-        case GCodeExtrusionRole::GapFill                      : return L("Gap fill");
-        case GCodeExtrusionRole::Skirt                        : return L("Skirt/Brim");
-        case GCodeExtrusionRole::SupportMaterial              : return L("Support material");
-        case GCodeExtrusionRole::SupportMaterialInterface     : return L("Support material interface");
-        case GCodeExtrusionRole::WipeTower                    : return L("Wipe tower");
-        case GCodeExtrusionRole::Custom                       : return L("Custom");
-        default                             : assert(false);
-    }
-    return {};
-}
-
-GCodeExtrusionRole string_to_gcode_extrusion_role(const std::string_view role)
-{
-    if (role == L("Perimeter"))
-        return GCodeExtrusionRole::Perimeter;
-    else if (role == L("External perimeter"))
-        return GCodeExtrusionRole::ExternalPerimeter;
-    else if (role == L("Overhang perimeter"))
-        return GCodeExtrusionRole::OverhangPerimeter;
-    else if (role == L("Internal infill"))
-        return GCodeExtrusionRole::InternalInfill;
-    else if (role == L("Solid infill"))
-        return GCodeExtrusionRole::SolidInfill;
-    else if (role == L("Top solid infill"))
-        return GCodeExtrusionRole::TopSolidInfill;
-    else if (role == L("Ironing"))
-        return GCodeExtrusionRole::Ironing;
-    else if (role == L("Bridge infill"))
-        return GCodeExtrusionRole::BridgeInfill;
-    else if (role == L("Gap fill"))
-        return GCodeExtrusionRole::GapFill;
-    else if (role == L("Skirt") || role == L("Skirt/Brim")) // "Skirt" is for backward compatibility with 2.3.1 and earlier
-        return GCodeExtrusionRole::Skirt;
-    else if (role == L("Support material"))
-        return GCodeExtrusionRole::SupportMaterial;
-    else if (role == L("Support material interface"))
-        return GCodeExtrusionRole::SupportMaterialInterface;
-    else if (role == L("Wipe tower"))
-        return GCodeExtrusionRole::WipeTower;
-    else if (role == L("Custom"))
-        return GCodeExtrusionRole::Custom;
-    else
-        return GCodeExtrusionRole::None;
-}
-
-}