Merge branch 'main' into elegoo_n4_update

.github/ISSUE_TEMPLATE/SlicingCrash.yaml

@@ -5,6 +5,13 @@ body:
 - type: markdown
   attributes:
     value: |
+       ### 💥 Slicing Crash Analysis Tool 💥
+       We are taking steps to analyze an increase in reported crashes more systematically. We'll need some help with that. 😇
+       Before filling out the report below, we want you to try a special Cura 5.7 Alpha.
+       This version of Cura has an updated slicing engine that will automatically send a report to the Cura Team for analysis. 
+       #### [You can find the downloads here](https://github.com/Ultimaker/Cura/discussions/18080) #### 
+       If you still encounter a crash you are still welcome to report the issue so we can use your model as a test case, you can find instructions on how to do that below.      
+       
        ### Project File
        **⚠️ Before you continue, we need your project file to troubleshoot a slicing crash.**
        It contains the printer and settings we need for troubleshooting. 
@@ -68,4 +75,3 @@ body:
     description: You can add the zip file and additional information that is relevant to the issue in the comments below.
   validations:
     required: true
-

.github/workflows/conan-package.yml

@@ -20,12 +20,8 @@ on:
       - 'main'
       - 'CURA-*'
       - 'PP-*'
-      - '[0-9].[0-9]'
-      - '[0-9].[0-9][0-9]'
-    tags:
-      - '[0-9].[0-9].[0-9]*'
-      - '[0-9].[0-9].[0-9]'
-      - '[0-9].[0-9][0-9].[0-9]*'
+      - '[0-9].[0-9]*'
+      - '[0-9].[0-9][0-9]*'
 
 env:
   CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -44,3 +40,11 @@ jobs:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
     secrets: inherit
+
+  conan-package-create:
+    needs: [ conan-recipe-version, conan-package-export ]
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main
+    with:
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+      conan_extra_args: "-o cura:enable_i18n=True"
+    secrets: inherit

.github/workflows/installers.yml

@@ -58,7 +58,7 @@ jobs:
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: X64
-      operating_system: windows-2022
+      operating_system: self-hosted-Windows-X64
     secrets: inherit
 
   linux-installer:

.github/workflows/linux.yml

@@ -39,19 +39,14 @@ on:
         options:
           - ubuntu-22.04
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
-  installer:
+  linux-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit

.github/workflows/macos.yml

@@ -43,19 +43,14 @@ on:
           - macos-11
           - macos-12
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
-  installer:
+  macos-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit

.github/workflows/unit-test-post.yml

@@ -11,3 +11,4 @@ jobs:
     with:
       event: ${{ github.event.workflow_run.event }}
       conclusion: ${{ github.event.workflow_run.conclusion }}
+    secrets: inherit

.github/workflows/unit-test.yml

@@ -58,4 +58,5 @@ jobs:
       conan_extra_args: '-g VirtualPythonEnv -o cura:devtools=True -c tools.build:skip_test=False'
       unit_test_cmd: 'pytest --junitxml=junit_cura.xml'
       unit_test_dir: 'tests'
-      conan_generator_dir: './venv/bin'
+      conan_generator_dir: './venv/bin'
+    secrets: inherit

.github/workflows/windows.yml

@@ -34,24 +34,20 @@ on:
       operating_system:
         description: 'OS'
         required: true
-        default: 'windows-2022'
+        default: 'self-hosted-Windows-X64'
         type: choice
         options:
+          - self-hosted-Windows-X64
           - windows-2022
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
-  installer:
+  windows-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit

conandata.yml

@@ -1,4 +1,4 @@
-version: "5.7.0-alpha.0"
+version: "5.7.0-alpha.1"
 requirements:
   - "uranium/(latest)@ultimaker/testing"
   - "curaengine/(latest)@ultimaker/testing"
@@ -6,7 +6,6 @@ requirements:
   - "fdm_materials/(latest)@ultimaker/testing"
   - "curaengine_plugin_gradual_flow/(latest)@ultimaker/stable"
   - "dulcificum/latest@ultimaker/testing"
-  - "pyarcus/5.3.0"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"
   - "curaengine_grpc_definitions/(latest)@ultimaker/testing"

conanfile.py

@@ -242,7 +242,7 @@ class CuraConan(ConanFile):
                 self.output.warning(f"Source path for binary {binary['binary']} does not exist")
                 continue
 
-            for bin in Path(src_path).glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.|.pdb]*"):
+            for bin in Path(src_path).glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.]*"):
                 binaries.append((str(bin), binary["dst"]))
             for bin in Path(src_path).glob(binary["binary"]):
                 binaries.append((str(bin), binary["dst"]))
@@ -320,6 +320,8 @@ class CuraConan(ConanFile):
             self.options["openssl"].shared = True
         if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "":
             self.options["curaengine"].enable_sentry = True
+            self.options["arcus"].enable_sentry = True
+            self.options["clipper"].enable_sentry = True
 
     def validate(self):
         version = self.conf.get("user.cura:version", default = self.version, check_type = str)
@@ -335,6 +337,7 @@ class CuraConan(ConanFile):
             for req in self.conan_data["requirements_internal"]:
                 self.requires(req)
         self.requires("cpython/3.10.4@ultimaker/stable")
+        self.requires("clipper/6.4.2@ultimaker/stable")
         self.requires("openssl/3.2.0")
         self.requires("boost/1.82.0")
         self.requires("spdlog/1.12.0")
@@ -417,7 +420,6 @@ class CuraConan(ConanFile):
             )
 
         if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]:
-            # Update the po and pot files
             vb = VirtualBuildEnv(self)
             vb.generate()
 
@@ -518,7 +520,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
         del self.info.options.cloud_api_version
         del self.info.options.display_name
         del self.info.options.cura_debug_mode
-        self.options.rm_safe("enable_i18n")
+        if self.options.get_safe("enable_i18n", False):
+            del self.info.options.enable_i18n
 
         # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different
         #  Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't

cura/CuraActions.py

@@ -3,10 +3,11 @@
 
 from typing import List, cast
 
-from PyQt6.QtCore import QObject, QUrl, QMimeData
+from PyQt6.QtCore import QObject, QUrl, pyqtSignal, pyqtProperty
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QApplication
 
+from UM.Application import Application
 from UM.Event import CallFunctionEvent
 from UM.FlameProfiler import pyqtSlot
 from UM.Math.Vector import Vector
@@ -37,6 +38,10 @@ class CuraActions(QObject):
     def __init__(self, parent: QObject = None) -> None:
         super().__init__(parent)
 
+        self._operation_stack = Application.getInstance().getOperationStack()
+        self._operation_stack.changed.connect(self._onUndoStackChanged)
+
+    undoStackChanged = pyqtSignal()
     @pyqtSlot()
     def openDocumentation(self) -> None:
         # Starting a web browser from a signal handler connected to a menu will crash on windows.
@@ -45,6 +50,25 @@ class CuraActions(QObject):
         event = CallFunctionEvent(self._openUrl, [QUrl("https://ultimaker.com/en/resources/manuals/software?utm_source=cura&utm_medium=software&utm_campaign=dropdown-documentation")], {})
         cura.CuraApplication.CuraApplication.getInstance().functionEvent(event)
 
+    @pyqtProperty(bool, notify=undoStackChanged)
+    def canUndo(self):
+        return self._operation_stack.canUndo()
+
+    @pyqtProperty(bool, notify=undoStackChanged)
+    def canRedo(self):
+        return self._operation_stack.canRedo()
+
+    @pyqtSlot()
+    def undo(self):
+        self._operation_stack.undo()
+
+    @pyqtSlot()
+    def redo(self):
+        self._operation_stack.redo()
+
+    def _onUndoStackChanged(self):
+        self.undoStackChanged.emit()
+
     @pyqtSlot()
     def openBugReportPage(self) -> None:
         event = CallFunctionEvent(self._openUrl, [QUrl("https://github.com/Ultimaker/Cura/issues/new/choose")], {})

cura/CuraApplication.py

@@ -15,13 +15,13 @@ import numpy
 from PyQt6.QtCore import QObject, QTimer, QUrl, QUrlQuery, pyqtSignal, pyqtProperty, QEvent, pyqtEnum, QCoreApplication, \
     QByteArray
 from PyQt6.QtGui import QColor, QIcon
-from PyQt6.QtQml import qmlRegisterUncreatableType, qmlRegisterUncreatableMetaObject, qmlRegisterSingletonType, qmlRegisterType
+from PyQt6.QtQml import qmlRegisterUncreatableMetaObject, qmlRegisterSingletonType, qmlRegisterType
 from PyQt6.QtWidgets import QMessageBox
 
 import UM.Util
 import cura.Settings.cura_empty_instance_containers
 from UM.Application import Application
-from UM.Decorators import override
+from UM.Decorators import override, deprecated
 from UM.FlameProfiler import pyqtSlot
 from UM.Logger import Logger
 from UM.Math.AxisAlignedBox import AxisAlignedBox
@@ -191,7 +191,7 @@ class CuraApplication(QtApplication):
         self.empty_container = None  # type: EmptyInstanceContainer
         self.empty_definition_changes_container = None  # type: EmptyInstanceContainer
         self.empty_variant_container = None  # type: EmptyInstanceContainer
-        self.empty_intent_container = None  # type: EmptyInstanceContainer 
+        self.empty_intent_container = None  # type: EmptyInstanceContainer
         self.empty_material_container = None  # type: EmptyInstanceContainer
         self.empty_quality_container = None  # type: EmptyInstanceContainer
         self.empty_quality_changes_container = None  # type: EmptyInstanceContainer
@@ -1138,6 +1138,10 @@ class CuraApplication(QtApplication):
 
         return cast(MachineActionManager.MachineActionManager, self._machine_action_manager)
 
+    @pyqtSlot(result = QObject)
+    def getMachineActionManagerQml(self)-> MachineActionManager.MachineActionManager:
+        return cast(QObject, self._machine_action_manager)
+
     @pyqtSlot(result = QObject)
     def getMaterialManagementModel(self) -> MaterialManagementModel:
         if not self._material_management_model:
@@ -1150,7 +1154,8 @@ class CuraApplication(QtApplication):
             self._quality_management_model = QualityManagementModel(parent = self)
         return self._quality_management_model
 
-    def getSimpleModeSettingsManager(self, *args):
+    @pyqtSlot(result=QObject)
+    def getSimpleModeSettingsManager(self)-> SimpleModeSettingsManager:
         if self._simple_mode_settings_manager is None:
             self._simple_mode_settings_manager = SimpleModeSettingsManager()
         return self._simple_mode_settings_manager
@@ -1193,16 +1198,43 @@ class CuraApplication(QtApplication):
 
         return self._print_information
 
-    def getQualityProfilesDropDownMenuModel(self, *args, **kwargs):
+    @pyqtSlot(result=QObject)
+    def getQualityProfilesDropDownMenuModel(self, *args, **kwargs)-> QualityProfilesDropDownMenuModel:
         if self._quality_profile_drop_down_menu_model is None:
             self._quality_profile_drop_down_menu_model = QualityProfilesDropDownMenuModel(self)
         return self._quality_profile_drop_down_menu_model
 
-    def getCustomQualityProfilesDropDownMenuModel(self, *args, **kwargs):
+    @pyqtSlot(result=QObject)
+    def getCustomQualityProfilesDropDownMenuModel(self, *args, **kwargs)->CustomQualityProfilesDropDownMenuModel:
         if self._custom_quality_profile_drop_down_menu_model is None:
             self._custom_quality_profile_drop_down_menu_model = CustomQualityProfilesDropDownMenuModel(self)
         return self._custom_quality_profile_drop_down_menu_model
 
+    @deprecated("SimpleModeSettingsManager is deprecated and will be removed in major SDK release, Use getSimpleModeSettingsManager() instead", since = "5.7.0")
+    def getSimpleModeSettingsManagerWrapper(self, *args, **kwargs):
+        return self.getSimpleModeSettingsManager()
+
+    @deprecated("MachineActionManager is deprecated and will be removed in major SDK release, Use getMachineActionManager() instead", since="5.7.0")
+    def getMachineActionManagerWrapper(self, *args, **kwargs):
+        return self.getMachineActionManager()
+
+    @deprecated("QualityManagementModel is deprecated and will be removed in major SDK release, Use getQualityManagementModel() instead", since="5.7.0")
+    def getQualityManagementModelWrapper(self, *args, **kwargs):
+        return self.getQualityManagementModel()
+
+    @deprecated("MaterialManagementModel is deprecated and will be removed in major SDK release, Use getMaterialManagementModel() instead", since = "5.7.0")
+    def getMaterialManagementModelWrapper(self, *args, **kwargs):
+        return self.getMaterialManagementModel()
+
+    @deprecated("QualityProfilesDropDownMenuModel is deprecated and will be removed in major SDK release, Use getQualityProfilesDropDownMenuModel() instead", since = "5.7.0")
+    def getQualityProfilesDropDownMenuModelWrapper(self, *args, **kwargs):
+        return self.getQualityProfilesDropDownMenuModel()
+
+    @deprecated("CustomQualityProfilesDropDownMenuModel is deprecated and will be removed in major SDK release, Use getCustomQualityProfilesDropDownMenuModel() instead", since = "5.7.0")
+    def getCustomQualityProfilesDropDownMenuModelWrapper(self,  *args, **kwargs):
+        return self.getCustomQualityProfilesDropDownMenuModel()
+
+
     def getCuraAPI(self, *args, **kwargs) -> "CuraAPI":
         return self._cura_API
 
@@ -1231,8 +1263,8 @@ class CuraApplication(QtApplication):
         qmlRegisterSingletonType(MachineManager, "Cura", 1, 0, self.getMachineManager, "MachineManager")
         qmlRegisterSingletonType(IntentManager, "Cura", 1, 6, self.getIntentManager, "IntentManager")
         qmlRegisterSingletonType(SettingInheritanceManager, "Cura", 1, 0, self.getSettingInheritanceManager, "SettingInheritanceManager")
-        qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, self.getSimpleModeSettingsManager, "SimpleModeSettingsManager")
-        qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, self.getMachineActionManager, "MachineActionManager")
+        qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, self.getSimpleModeSettingsManagerWrapper, "SimpleModeSettingsManager")
+        qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, self.getMachineActionManagerWrapper, "MachineActionManager")
 
         self.processEvents()
         qmlRegisterType(NetworkingUtil, "Cura", 1, 5, "NetworkingUtil")
@@ -1257,16 +1289,14 @@ class CuraApplication(QtApplication):
         qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel")
         qmlRegisterType(GenericMaterialsModel, "Cura", 1, 0, "GenericMaterialsModel")
         qmlRegisterType(MaterialBrandsModel, "Cura", 1, 0, "MaterialBrandsModel")
-        qmlRegisterSingletonType(QualityManagementModel, "Cura", 1, 0, self.getQualityManagementModel, "QualityManagementModel")
-        qmlRegisterSingletonType(MaterialManagementModel, "Cura", 1, 5, self.getMaterialManagementModel, "MaterialManagementModel")
+        qmlRegisterSingletonType(QualityManagementModel, "Cura", 1, 0, self.getQualityManagementModelWrapper,"QualityManagementModel")
+        qmlRegisterSingletonType(MaterialManagementModel, "Cura", 1, 5, self.getMaterialManagementModelWrapper,"MaterialManagementModel")
 
         self.processEvents()
         qmlRegisterType(DiscoveredPrintersModel, "Cura", 1, 0, "DiscoveredPrintersModel")
         qmlRegisterType(DiscoveredCloudPrintersModel, "Cura", 1, 7, "DiscoveredCloudPrintersModel")
-        qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0,
-                                 self.getQualityProfilesDropDownMenuModel, "QualityProfilesDropDownMenuModel")
-        qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0,
-                                 self.getCustomQualityProfilesDropDownMenuModel, "CustomQualityProfilesDropDownMenuModel")
+        qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0, self.getQualityProfilesDropDownMenuModelWrapper, "QualityProfilesDropDownMenuModel")
+        qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0, self.getCustomQualityProfilesDropDownMenuModelWrapper, "CustomQualityProfilesDropDownMenuModel")
         qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel")
         qmlRegisterType(IntentModel, "Cura", 1, 6, "IntentModel")
         qmlRegisterType(IntentCategoryModel, "Cura", 1, 6, "IntentCategoryModel")

cura/Machines/Models/ExtrudersModel.py

@@ -227,7 +227,7 @@ class ExtrudersModel(ListModel):
                     "material_brand": "",
                     "color_name": "",
                     "material_type": "",
-                    "material_label": ""
+                    "material_name": ""
                 }
                 items.append(item)
             if self._items != items:

cura/OAuth2/AuthorizationHelpers.py

@@ -40,6 +40,7 @@ class AuthorizationHelpers:
         """
         data = {
             "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
+            "client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
             "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
             "grant_type": "authorization_code",
             "code": authorization_code,
@@ -64,6 +65,7 @@ class AuthorizationHelpers:
         Logger.log("d", "Refreshing the access token for [%s]", self._settings.OAUTH_SERVER_URL)
         data = {
             "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
+            "client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
             "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
             "grant_type": "refresh_token",
             "refresh_token": refresh_token,

cura/OAuth2/AuthorizationService.py

@@ -31,20 +31,24 @@ class AuthorizationService:
     account information.
     """
 
-    # Emit signal when authentication is completed.
-    onAuthStateChanged = Signal()
+    def __init__(self,
+                 settings: "OAuth2Settings",
+                 preferences: Optional["Preferences"] = None,
+                 get_user_profile: bool = True) -> None:
+        # Emit signal when authentication is completed.
+        self.onAuthStateChanged = Signal()
 
-    # Emit signal when authentication failed.
-    onAuthenticationError = Signal()
+        # Emit signal when authentication failed.
+        self.onAuthenticationError = Signal()
 
-    accessTokenChanged = Signal()
+        self.accessTokenChanged = Signal()
 
-    def __init__(self, settings: "OAuth2Settings", preferences: Optional["Preferences"] = None) -> None:
         self._settings = settings
         self._auth_helpers = AuthorizationHelpers(settings)
         self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL)
         self._auth_data: Optional[AuthenticationResponse] = None
         self._user_profile: Optional["UserProfile"] = None
+        self._get_user_profile: bool = get_user_profile
         self._preferences = preferences
         self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True)
         self._currently_refreshing_token = False  # Whether we are currently in the process of refreshing auth. Don't make new requests while busy.
@@ -294,7 +298,8 @@ class AuthorizationService:
         self._auth_data = auth_data
         self._currently_refreshing_token = False
         if auth_data:
-            self.getUserProfile()
+            if self._get_user_profile:
+                self.getUserProfile()
             self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump()))
         else:
             Logger.log("d", "Clearing the user profile")

cura/OAuth2/Models.py

@@ -16,6 +16,7 @@ class OAuth2Settings(BaseModel):
     CALLBACK_PORT = None  # type: Optional[int]
     OAUTH_SERVER_URL = None  # type: Optional[str]
     CLIENT_ID = None  # type: Optional[str]
+    CLIENT_SECRET = None  # type: Optional[str]
     CLIENT_SCOPES = None  # type: Optional[str]
     CALLBACK_URL = None  # type: Optional[str]
     AUTH_DATA_PREFERENCE_KEY = ""  # type: str

cura_app.py

@@ -15,6 +15,10 @@ if "" in sys.path:
 import argparse
 import faulthandler
 import os
+
+# set the environment variable QT_QUICK_FLICKABLE_WHEEL_DECELERATION to 5000 as mentioned in qt6.6 update log to overcome scroll related issues
+os.environ["QT_QUICK_FLICKABLE_WHEEL_DECELERATION"] = str(int(os.environ.get("QT_QUICK_FLICKABLE_WHEEL_DECELERATION", "5000")))
+
 if sys.platform != "linux":  # Turns out the Linux build _does_ use this, but we're not making an Enterprise release for that system anyway.
     os.environ["QT_PLUGIN_PATH"] = ""  # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
     os.environ["QML2_IMPORT_PATH"] = ""  # Security workaround: Don't need it, and introduces an attack vector, so set to nul.

plugins/CuraEngineBackend/Cura.proto

@@ -35,6 +35,8 @@ message Slice
     repeated EnginePlugin engine_plugins = 5;
     string sentry_id = 6; // The anonymized Sentry user id that requested the slice
     string cura_version = 7; // The version of Cura that requested the slice
+    optional string project_name = 8; // The name of the project that requested the slice
+    optional string user_name = 9; // The Digital Factory account name of the user that requested the slice
 }
 
 message Extruder

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -164,6 +164,7 @@ class CuraEngineBackend(QObject, Backend):
 
         application.getPreferences().addPreference("general/auto_slice", False)
         application.getPreferences().addPreference("info/send_engine_crash", True)
+        application.getPreferences().addPreference("info/anonymous_engine_crash_report", True)
 
         self._use_timer: bool = False
 
@@ -1094,14 +1095,14 @@ class CuraEngineBackend(QObject, Backend):
             self._change_timer.timeout.disconnect(self.slice)
 
     def _onPreferencesChanged(self, preference: str) -> None:
-        if preference != "general/auto_slice" and preference != "info/send_engine_crash":
+        if preference != "general/auto_slice" and preference != "info/send_engine_crash" and preference != "info/anonymous_engine_crash_report":
             return
         if preference == "general/auto_slice":
             auto_slice = self.determineAutoSlicing()
             if auto_slice:
                 self._change_timer.start()
         elif preference == "info/send_engine_crash":
-            os.environ["use_sentry"] = "1" if CuraApplication.getInstance().getPreferences().getValue("info/send_engine_crash") else "0"
+            os.environ["USE_SENTRY"] = "1" if CuraApplication.getInstance().getPreferences().getValue("info/send_engine_crash") else "0"
 
     def tickle(self) -> None:
         """Tickle the backend so in case of auto slicing, it starts the timer."""

plugins/CuraEngineBackend/StartSliceJob.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2023 UltiMaker
+#  Copyright (c) 2024 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 import uuid
 
@@ -63,13 +63,12 @@ class GcodeStartEndFormatter(Formatter):
     # will be used. Alternatively, if the expression is formatted as "{[expression], [extruder_nr]}",
     # then the expression will be evaluated with the extruder stack of the specified extruder_nr.
 
-    _extruder_regex = re.compile(r"^\s*(?P<expression>.*)\s*,\s*(?P<extruder_nr>\d+)\s*$")
+    _extruder_regex = re.compile(r"^\s*(?P<expression>.*)\s*,\s*(?P<extruder_nr_expr>.*)\s*$")
 
-    def __init__(self, default_extruder_nr: int = -1, *,
-                 additional_per_extruder_settings: Optional[Dict[str, Dict[str, any]]] = None) -> None:
+    def __init__(self, all_extruder_settings: Dict[str, Any], default_extruder_nr: int = -1) -> None:
         super().__init__()
+        self._all_extruder_settings: Dict[str, Any] = all_extruder_settings
         self._default_extruder_nr: int = default_extruder_nr
-        self._additional_per_extruder_settings: Optional[Dict[str, Dict[str, any]]] = additional_per_extruder_settings
 
     def get_field(self, field_name, args: [str], kwargs: dict) -> Tuple[str, str]:
         # get_field method parses all fields in the format-string and parses them individually to the get_value method.
@@ -88,22 +87,32 @@ class GcodeStartEndFormatter(Formatter):
         if expression in post_slice_data_variables:
             return f"{{{expression}}}"
 
-        extruder_nr = self._default_extruder_nr
+        extruder_nr = str(self._default_extruder_nr)
 
         # The settings may specify a specific extruder to use. This is done by
-        # formatting the expression as "{expression}, {extruder_nr}". If the
+        # formatting the expression as "{expression}, {extruder_nr_expr}". If the
         # expression is formatted like this, we extract the extruder_nr and use
         # it to get the value from the correct extruder stack.
         match = self._extruder_regex.match(expression)
         if match:
             expression = match.group("expression")
-            extruder_nr = int(match.group("extruder_nr"))
+            extruder_nr_expr = match.group("extruder_nr_expr")
 
-        if self._additional_per_extruder_settings is not None and str(
-                extruder_nr) in self._additional_per_extruder_settings:
-            additional_variables = self._additional_per_extruder_settings[str(extruder_nr)]
+            if extruder_nr_expr.isdigit():
+                extruder_nr = extruder_nr_expr
+            else:
+                # We get the value of the extruder_nr_expr from `_all_extruder_settings` dictionary
+                # rather than the global container stack. The `_all_extruder_settings["-1"]` is a
+                # dict-representation of the global container stack, with additional properties such
+                # as `initial_extruder_nr`. As users may enter such expressions we can't use the
+                # global container stack.
+                extruder_nr = str(self._all_extruder_settings["-1"].get(extruder_nr_expr, "-1"))
+
+        if extruder_nr in self._all_extruder_settings:
+            additional_variables = self._all_extruder_settings[extruder_nr].copy()
         else:
-            additional_variables = dict()
+            Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
+            additional_variables = self._all_extruder_settings["-1"].copy()
 
         # Add the arguments and keyword arguments to the additional settings. These
         # are currently _not_ used, but they are added for consistency with the
@@ -113,15 +122,17 @@ class GcodeStartEndFormatter(Formatter):
         for key, value in kwargs.items():
             additional_variables[key] = value
 
-        if extruder_nr == -1:
+        if extruder_nr == "-1":
             container_stack = CuraApplication.getInstance().getGlobalContainerStack()
         else:
             container_stack = ExtruderManager.getInstance().getExtruderStack(extruder_nr)
+            if not container_stack:
+                Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
+                container_stack = CuraApplication.getInstance().getGlobalContainerStack()
 
         setting_function = SettingFunction(expression)
         value = setting_function(container_stack, additional_variables=additional_variables)
 
-
         return value
 
 
@@ -131,12 +142,13 @@ class StartSliceJob(Job):
     def __init__(self, slice_message: Arcus.PythonMessage) -> None:
         super().__init__()
 
-        self._scene = CuraApplication.getInstance().getController().getScene() #type: Scene
+        self._scene: Scene = CuraApplication.getInstance().getController().getScene()
         self._slice_message: Arcus.PythonMessage = slice_message
-        self._is_cancelled = False #type: bool
-        self._build_plate_number = None #type: Optional[int]
+        self._is_cancelled: bool = False
+        self._build_plate_number: Optional[int] = None
 
-        self._all_extruders_settings = None #type: Optional[Dict[str, Any]] # cache for all setting values from all stacks (global & extruder) for the current machine
+        # cache for all setting values from all stacks (global & extruder) for the current machine
+        self._all_extruders_settings: Optional[Dict[str, Any]] = None
 
     def getSliceMessage(self) -> Arcus.PythonMessage:
         return self._slice_message
@@ -337,9 +349,15 @@ class StartSliceJob(Job):
 
         user_id = uuid.getnode()  # On all of Cura's supported platforms, this returns the MAC address which is pseudonymical information (!= anonymous).
         user_id %= 2 ** 16  # So to make it anonymous, apply a bitmask selecting only the last 16 bits. This prevents it from being traceable to a specific user but still gives somewhat of an idea of whether it's just the same user hitting the same crash over and over again, or if it's widespread.
-        self._slice_message.sentry_id = "{user_id}"
+        self._slice_message.sentry_id = f"{user_id}"
         self._slice_message.cura_version = CuraVersion
 
+        # Add the project name to the message if the user allows for non-anonymous crash data collection.
+        account = CuraApplication.getInstance().getCuraAPI().account
+        if account and account.isLoggedIn and not CuraApplication.getInstance().getPreferences().getValue("info/anonymous_engine_crash_report"):
+            self._slice_message.project_name = CuraApplication.getInstance().getPrintInformation().baseName
+            self._slice_message.user_name = account.userName
+
         # Build messages for extruder stacks
         for extruder_stack in global_stack.extruderList:
             self._buildExtruderMessage(extruder_stack)
@@ -471,10 +489,7 @@ class StartSliceJob(Job):
             # Get "replacement-keys" for the extruders. In the formatter the settings stack is used to get the
             # replacement values for the setting-keys. However, the values for `material_id`, `material_type`,
             # etc are not in the settings stack.
-            additional_per_extruder_settings = self._all_extruders_settings.copy()
-            additional_per_extruder_settings["default_extruder_nr"] = default_extruder_nr
-            fmt = GcodeStartEndFormatter(default_extruder_nr=default_extruder_nr,
-                                         additional_per_extruder_settings=additional_per_extruder_settings)
+            fmt = GcodeStartEndFormatter(self._all_extruders_settings, default_extruder_nr=default_extruder_nr)
             return str(fmt.format(value))
         except:
             Logger.logException("w", "Unable to do token replacement on start/end g-code")

plugins/PerObjectSettingsTool/PerObjectItem.qml

@@ -25,7 +25,7 @@ UM.TooltipArea
         onClicked:
         {
             addedSettingsModel.setVisible(model.key, checked);
-            UM.ActiveTool.forceUpdate();
+            UM.Controller.forceUpdate();
         }
     }
 

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -23,7 +23,7 @@ Item
     readonly property string infillMeshType: "infill_mesh"
     readonly property string antiOverhangMeshType: "anti_overhang_mesh"
 
-    property var currentMeshType: UM.ActiveTool.properties.getValue("MeshType")
+    property var currentMeshType: UM.Controller.properties.getValue("MeshType")
 
     // Update the view every time the currentMeshType changes
     onCurrentMeshTypeChanged:
@@ -56,7 +56,7 @@ Item
 
     function setMeshType(type)
     {
-        UM.ActiveTool.setProperty("MeshType", type)
+        UM.Controller.setProperty("MeshType", type)
         updateMeshTypeCheckedState(type)
     }
 
@@ -224,7 +224,7 @@ Item
                     visibilityHandler: Cura.PerObjectSettingVisibilityHandler
                     {
                         id: visibility_handler
-                        selectedObjectId: UM.ActiveTool.properties.getValue("SelectedObjectId")
+                        selectedObjectId: UM.Controller.properties.getValue("SelectedObjectId")
                     }
 
                     // For some reason the model object is updated after removing him from the memory and
@@ -320,7 +320,7 @@ Item
                     {
                         id: provider
 
-                        containerStackId: UM.ActiveTool.properties.getValue("ContainerID")
+                        containerStackId: UM.Controller.properties.getValue("ContainerID")
                         key: model.key
                         watchedProperties: [ "value", "enabled", "validationState" ]
                         storeIndex: 0
@@ -330,7 +330,7 @@ Item
                     UM.SettingPropertyProvider
                     {
                         id: inheritStackProvider
-                        containerStackId: UM.ActiveTool.properties.getValue("ContainerID")
+                        containerStackId: UM.Controller.properties.getValue("ContainerID")
                         key: model.key
                         watchedProperties: [ "limit_to_extruder" ]
                     }
@@ -381,22 +381,22 @@ Item
 
                     Connections
                     {
-                        target: UM.ActiveTool
+                        target: UM.Controller
                         function onPropertiesChanged()
                         {
-                            // the values cannot be bound with UM.ActiveTool.properties.getValue() calls,
+                            // the values cannot be bound with UM.Controller.properties.getValue() calls,
                             // so here we connect to the signal and update the those values.
-                            if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined")
+                            if (typeof UM.Controller.properties.getValue("SelectedObjectId") !== "undefined")
                             {
-                                const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId")
+                                const selectedObjectId = UM.Controller.properties.getValue("SelectedObjectId")
                                 if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId)
                                 {
                                     addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId
                                 }
                             }
-                            if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
+                            if (typeof UM.Controller.properties.getValue("ContainerID") !== "undefined")
                             {
-                                const containerId = UM.ActiveTool.properties.getValue("ContainerID")
+                                const containerId = UM.Controller.properties.getValue("ContainerID")
                                 if (provider.containerStackId !== containerId)
                                 {
                                     provider.containerStackId = containerId

plugins/PostProcessingPlugin/scripts/AddCoolingProfile.py

@@ -0,0 +1,837 @@
+# Designed in January 2023 by GregValiant (Greg Foresi)
+##   My design intent was to make this as full featured and "industrial strength" as I could.  People printing exotic materials on large custom printers may want to turn the fans off for certain layers, and then back on again later in the print.  This script allows that.
+#    Functions:
+##    Remove all fan speed lines from the file (optional).  This should be enabled for the first instance of the script.  It is disabled by default in any following instances.
+##    "By Layer" allows the user to adjust the fan speed up, or down, or off, within the print.  "By Feature" allows different fan speeds for different features (;TYPE:WALL-OUTER, etc.).
+##    If 'By Feature' then a Start Layer and/or an End Layer can be defined.
+##    Fan speeds are scaled PWM (0 - 255) or RepRap (0.0 - 1.0) depending on {machine_scale_fan_speed_zero_to_one}.
+##    A minimum fan speed of 12% is enforced.  It is the slowest speed that my cooling fan will turn on so that's what I used.  'M106 S14' (as Cura might insert) was pretty useless.
+##    If multiple extruders have separate fan circuits the speeds are set at tool changes and conform to the layer or feature setting.  There is support for up to 4 layer cooling fan circuits.
+##    My thanks to @5axes(@CUQ), @fieldOfView(@AHoeben), @Ghostkeeper, and @Torgeir.  A special thanks to @RBurema for his patience in reviewing my 'non-pythonic' script.
+##    9/14/23  (Greg Foresi) Added support for One-at-a-Time print sequence.
+##    12/15/23  (Greg Foresi) Split off 'Single Fan By Layer', 'Multi-fan By Layer', 'Single Fan By Feature', and 'Multi-fan By Feature' from the main 'execute' script.
+##    1/5/24  (Greg Foresi) Revised the regex replacements.
+
+from ..Script import Script
+from UM.Application import Application
+import re
+
+class AddCoolingProfile(Script):
+
+    def getSettingDataString(self):
+        return """{
+            "name": "Advanced Cooling Fan Control",
+            "key": "AddCoolingProfile",
+            "metadata": {},
+            "version": 2,
+            "settings":
+            {
+                "fan_layer_or_feature":
+                {
+                    "label": "Cooling Control by:",
+                    "description": "A fan percentage of ''0'' turns the fan off.  Minimum Fan is 12% (when on).  All layer entries are the Cura Preview number.  ''By Layer'': Enter as ''Layer#/Fan%'' (foreslash is the delimiter). Your final layer speed will continue to the end of the Gcode.  ''By Feature'': If you enable an 'End Layer' then the ''Final %'' is available and is the speed that will finish the file.  'By Feature' is better for large slow prints than it is for short fast prints.",
+                    "type": "enum",
+                    "options": {
+                        "by_layer": "Layer Numbers",
+                        "by_feature": "Feature Types"},
+                    "default_value": "by_layer"
+                },
+                "delete_existing_m106":
+                {
+                    "label": "Remove M106 lines prior to inserting new.",
+                    "description": "If you have 2 or more instances of 'Advanced Cooling Fan Control' running (to cool a portion of a print differently), then you must uncheck this box or the followup instances will remove all the lines inserted by the first instance.  Pay attention to the Start and Stop layers.  Regardless of this setting:  The script always removes M106 lines starting with the lowest layer number (when 'By Layer') or the starting layer number (when 'By Feature').  If you want to keep the M106 lines that Cura inserted up to the point where this post-processor will start making insertions, then un-check the box.",
+                    "type": "bool",
+                    "enabled": true,
+                    "value": true,
+                    "default_value": true
+                },
+                "feature_fan_start_layer":
+                {
+                    "label": "Starting Layer",
+                    "description": "Layer to start the insertion at. Use the Cura preview numbers.  Changes will begin at the start of that layer.",
+                    "type": "int",
+                    "default_value": 5,
+                    "minimum_value": 1,
+                    "unit": "Lay#   ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_end_layer":
+                {
+                    "label": "Ending Layer",
+                    "description": "Layer to complete the insertion at.  Enter '-1' for the entire file or enter a layer number.  Insertions will stop at the END of this layer.  If you set an End Layer then you should set the Final % that will finish the file",
+                    "type": "int",
+                    "default_value": -1,
+                    "minimum_value": -1,
+                    "unit": "Lay#   ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "layer_fan_1":
+                {
+                    "label": "Layer/Percent #1",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.  There are up to 8 changes.  If you need more then add a second instance of this script and remember to turn off 'Remove M106 lines' in the second instance.  The layer numbers in the second instance must start with a layer number higher than the last layer number in a previous script.  You can't end the first script with a setting for layer 80 and then start the second script with a setting for layer 40 because 'Remove M106 lines' always starts with the lowest layer number when 'By Layer' is selected.",
+                    "type": "str",
+                    "default_value": "5/30",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_2":
+                {
+                    "label": "Layer/Percent #2",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_3":
+                {
+                    "label": "Layer/Percent #3",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_4":
+                {
+                    "label": "Layer/Percent #4",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_5":
+                {
+                    "label": "Layer/Percent #5",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_6":
+                {
+                    "label": "Layer/Percent #6",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_7":
+                {
+                    "label": "Layer/Percent #7",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "layer_fan_8":
+                {
+                    "label": "Layer/Percent #8",
+                    "description": "Enter as: 'LAYER / Percent' Ex: 55/100 with the layer first, then a '/' to delimit, and then the fan percentage.",
+                    "type": "str",
+                    "default_value": "",
+                    "unit": "L#/%    ",
+                    "enabled": "fan_layer_or_feature == 'by_layer'"
+                },
+                "feature_fan_skirt":
+                {
+                    "label": "Skirt/Brim/Ooze Shield %",
+                    "description": "Enter the fan percentage for skirt/brim.  If you are starting at a layer above 1 then this setting only affects Ooze Shields and from the Start Layer up.",
+                    "type": "int",
+                    "default_value": 0,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_wall_inner":
+                {
+                    "label": "Inner Walls %",
+                    "description": "Enter the fan percentage for the Wall-Inner.",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_wall_outer":
+                {
+                    "label": "Outer Walls %",
+                    "description": "Enter the fan percentage for the Wall-Outer.",
+                    "type": "int",
+                    "default_value": 75,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_fill":
+                {
+                    "label": "Infill %",
+                    "description": "Enter the fan percentage for the Infill.",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_skin":
+                {
+                    "label": "Top/Bottom (Skin) %",
+                    "description": "Enter the fan percentage for the Skins.",
+                    "type": "int",
+                    "default_value": 100,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_support":
+                {
+                    "label": "Support %",
+                    "description": "Enter the fan percentage for the Supports.",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_support_interface":
+                {
+                    "label": "Support Interface %",
+                    "description": "Enter the fan percentage for the Support Interface.",
+                    "type": "int",
+                    "default_value": 100,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_prime_tower":
+                {
+                    "label": "Prime Tower %",
+                    "description": "Enter the fan percentage for the Prime Tower (whether it's used or not).",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_bridge":
+                {
+                    "label": "Bridge %",
+                    "description": "Enter the fan percentage for any Bridging (whether it's used on not).",
+                    "type": "int",
+                    "default_value": 100,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_layer_or_feature == 'by_feature'"
+                },
+                "feature_fan_combing":
+                {
+                    "label": "Fan 'OFF' during Combing:",
+                    "description": "When checked will set the fan to 0% for combing moves over 5 lines long in the gcode. When un-checked the fan speed during combing is whatever the previous speed is set to.",
+                    "type": "bool",
+                    "enabled": "fan_layer_or_feature == 'by_feature'",
+                    "default_value": true
+                },
+                "feature_fan_feature_final":
+                {
+                    "label": "Final %",
+                    "description": "If you choose an 'End Layer' then this is the fan speed that will carry through to the end of the gcode file.  It will go into effect at the 'END' of your End layer.",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "(int(feature_fan_end_layer) != -1) and (fan_layer_or_feature == 'by_feature')"
+                },
+                "fan_enable_raft":
+                {
+                    "label": "Enable Raft Cooling",
+                    "description": "Enable the fan for the raft layers.  When enabled the Raft Fan Speed will continue until another Layer or Feature setting over-rides it.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": true
+                },
+                "fan_raft_percent":
+                {
+                    "label": "Raft Fan %:",
+                    "description": "Enter the percentage for the Raft.",
+                    "type": "int",
+                    "default_value": 35,
+                    "minimum_value": 0,
+                    "maximum_value": 100,
+                    "unit": "%    ",
+                    "enabled": "fan_enable_raft"
+                }
+            }
+        }"""
+
+    def initialize(self) -> None:
+        super().initialize()
+        scripts = Application.getInstance().getGlobalContainerStack().getMetaDataEntry("post_processing_scripts")
+        if scripts != None:
+            script_count = scripts.count("AddCoolingProfile")
+            if script_count > 0:
+                ## Set 'Remove M106 lines' to "false" if there is already an instance of this script running.
+                self._instance.setProperty("delete_existing_m106", "value", False)
+
+    def execute(self, data):
+        #Initialize variables that are buried in if statements.
+        mycura = Application.getInstance().getGlobalContainerStack()
+        t0_fan = " P0"; t1_fan = " P0"; t2_fan = " P0"; t3_fan = " P0"; is_multi_extr_print = True
+
+        #Get some information from Cura-----------------------------------
+        extruder = mycura.extruderList
+
+        #This will be true when fan scale is 0-255pwm and false when it's RepRap 0-1 (Cura 5.x)
+        fan_mode = True
+        ##For 4.x versions that don't have the 0-1 option
+        try:
+            fan_mode = not bool(extruder[0].getProperty("machine_scale_fan_speed_zero_to_one", "value"))
+        except:
+            pass
+        bed_adhesion = (extruder[0].getProperty("adhesion_type", "value"))
+        extruder_count = mycura.getProperty("machine_extruder_count", "value")
+        print_sequence = str(mycura.getProperty("print_sequence", "value"))
+
+        #Assign the fan numbers to the tools------------------------------
+        if extruder_count == 1:
+            is_multi_fan = False
+            is_multi_extr_print = False
+            if int((extruder[0].getProperty("machine_extruder_cooling_fan_number", "value"))) > 0:
+                t0_fan = " P" + str((extruder[0].getProperty("machine_extruder_cooling_fan_number", "value")))
+            else:
+        #No P parameter if there is a single fan circuit------------------
+                t0_fan = ""
+
+        #Get the cooling fan numbers for each extruder if the printer has multiple extruders
+        elif extruder_count > 1:
+            is_multi_fan = True
+            t0_fan = " P" + str((extruder[0].getProperty("machine_extruder_cooling_fan_number", "value")))
+        if is_multi_fan:
+            if extruder_count > 1: t1_fan = " P" + str((extruder[1].getProperty("machine_extruder_cooling_fan_number", "value")))
+            if extruder_count > 2: t2_fan = " P" + str((extruder[2].getProperty("machine_extruder_cooling_fan_number", "value")))
+            if extruder_count > 3: t3_fan = " P" + str((extruder[3].getProperty("machine_extruder_cooling_fan_number", "value")))
+
+        #Initialize the fan_list with defaults----------------------------
+        fan_list = ["z"] * 16
+        for num in range(0,15,2):
+            fan_list[num] = len(data)
+            fan_list[num + 1] = "M106 S0"
+
+        #Assign the variable values if "By Layer"-------------------------
+        by_layer_or_feature = self.getSettingValueByKey("fan_layer_or_feature")
+        if  by_layer_or_feature == "by_layer":
+            ## By layer doesn't do any feature search so there is no need to look for combing moves
+            feature_fan_combing = False
+            fan_list[0] = self.getSettingValueByKey("layer_fan_1")
+            fan_list[2] = self.getSettingValueByKey("layer_fan_2")
+            fan_list[4] = self.getSettingValueByKey("layer_fan_3")
+            fan_list[6] = self.getSettingValueByKey("layer_fan_4")
+            fan_list[8] = self.getSettingValueByKey("layer_fan_5")
+            fan_list[10] = self.getSettingValueByKey("layer_fan_6")
+            fan_list[12] = self.getSettingValueByKey("layer_fan_7")
+            fan_list[14] = self.getSettingValueByKey("layer_fan_8")
+            ## If there is no '/' delimiter then ignore the line else put the settings in a list
+            for num in range(0,15,2):
+                if "/" in fan_list[num]:
+                    fan_list[num + 1] = self._layer_checker(fan_list[num], "p", fan_mode)
+                    fan_list[num] = self._layer_checker(fan_list[num], "l", fan_mode)
+
+        ## Assign the variable values if "By Feature"
+        elif by_layer_or_feature == "by_feature":
+            the_start_layer = self.getSettingValueByKey("feature_fan_start_layer") - 1
+            the_end_layer = self.getSettingValueByKey("feature_fan_end_layer")
+            try:
+                if int(the_end_layer) != -1:
+                    ## Catch a possible input error.
+                    if the_end_layer < the_start_layer:
+                        the_end_layer = the_start_layer
+            except:
+                the_end_layer = -1    ## If there is an input error default to the entire gcode file.
+
+            ## Get the speed for each feature
+            feature_name_list = []
+            feature_speed_list = []
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_skirt"), fan_mode)); feature_name_list.append(";TYPE:SKIRT")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_wall_inner"), fan_mode)); feature_name_list.append(";TYPE:WALL-INNER")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_wall_outer"), fan_mode)); feature_name_list.append(";TYPE:WALL-OUTER")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_fill"), fan_mode)); feature_name_list.append(";TYPE:FILL")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_skin"), fan_mode)); feature_name_list.append(";TYPE:SKIN")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_support"), fan_mode)); feature_name_list.append(";TYPE:SUPPORT")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_support_interface"), fan_mode)); feature_name_list.append(";TYPE:SUPPORT-INTERFACE")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_prime_tower"), fan_mode)); feature_name_list.append(";TYPE:PRIME-TOWER")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_bridge"), fan_mode)); feature_name_list.append(";BRIDGE")
+            feature_speed_list.append(self._feature_checker(self.getSettingValueByKey("feature_fan_feature_final"), fan_mode)); feature_name_list.append("FINAL_FAN")
+            feature_fan_combing = self.getSettingValueByKey("feature_fan_combing")
+            if the_end_layer > -1 and by_layer_or_feature == "by_feature":
+                ## Required so the final speed input can be determined
+                the_end_is_enabled = True
+            else:
+                ## There is no ending layer so do the whole file
+                the_end_is_enabled = False
+            if the_end_layer == -1 or the_end_is_enabled == False:
+                the_end_layer = len(data) + 2
+
+        ## Find the Layer0Index and the RaftIndex
+        raft_start_index = 0
+        number_of_raft_layers = 0
+        layer_0_index = 0
+        ## Catch the number of raft layers.
+        for l_num in range(1,10,1):
+            layer = data[l_num]
+            if ";LAYER:-" in layer:
+                number_of_raft_layers += 1
+                if raft_start_index == 0:
+                    raft_start_index = l_num
+            if ";LAYER:0" in layer:
+                layer_0_index = l_num
+                break
+
+        ## Is this a single extruder print on a multi-extruder printer? - get the correct fan number for the extruder being used.
+        if is_multi_fan:
+            T0_used = False
+            T1_used = False
+            T2_used = False
+            T3_used = False
+            ## Bypass the file header and ending gcode.
+            for num in range(1,len(data)-1,1):
+                lines = data[num]
+                if "T0" in lines:
+                    T0_used = True
+                if "T1" in lines:
+                    T1_used = True
+                if "T2" in lines:
+                    T2_used = True
+                if "T3" in lines:
+                    T3_used = True
+            is_multi_extr_print = True if sum([T0_used, T1_used, T2_used, T3_used]) > 1 else False
+
+            ## On a multi-extruder printer and single extruder print find out which extruder starts the file.
+            init_fan = t0_fan
+            if not is_multi_extr_print:
+                startup = data[1]
+                lines = startup.split("\n")
+                for line in lines:
+                    if line == "T1":
+                        t0_fan = t1_fan
+                    elif line == "T2":
+                        t0_fan = t2_fan
+                    elif line == "T3":
+                        t0_fan = t3_fan
+            elif is_multi_extr_print:
+            ## On a multi-extruder printer and multi extruder print find out which extruder starts the file.
+                startup = data[1]
+                lines = startup.split("\n")
+                for line in lines:
+                    if line == "T0":
+                        init_fan = t0_fan
+                    elif line == "T1":
+                        init_fan = t1_fan
+                    elif line == "T2":
+                        init_fan = t2_fan
+                    elif line == "T3":
+                        init_fan = t3_fan
+        else:
+            init_fan = ""
+        ## Assign the variable values if "Raft Enabled"
+        raft_enabled = self.getSettingValueByKey("fan_enable_raft")
+        if raft_enabled and bed_adhesion == "raft":
+            fan_sp_raft = self._feature_checker(self.getSettingValueByKey("fan_raft_percent"), fan_mode)
+        else:
+            fan_sp_raft = "M106 S0"
+
+        # Start to alter the data-----------------------------------------
+        ## Strip the existing M106 lines from the file up to the end of the last layer.  If a user wants to use more than one instance of this plugin then they won't want to erase the M106 lines that the preceding plugins inserted so 'delete_existing_m106' is an option.
+        delete_existing_m106 = self.getSettingValueByKey("delete_existing_m106")
+        if delete_existing_m106:
+        ## Start deleting from the beginning
+            start_from = int(raft_start_index)
+        else:
+            if by_layer_or_feature == "by_layer":
+                altered_start_layer = str(len(data))
+                ## The fan list layers don't need to be in ascending order.  Get the lowest.
+                for num in range(0,15,2):
+                    try:
+                        if int(fan_list[num]) < int(altered_start_layer):
+                            altered_start_layer = int(fan_list[num])
+                    except:
+                        pass
+            elif by_layer_or_feature == "by_feature":
+                altered_start_layer = int(the_start_layer) - 1
+            start_from = int(layer_0_index) + int(altered_start_layer)
+        ## Strip the M106 and M107 lines from the file
+        for l_index in range(int(start_from), len(data) - 1, 1):
+            data[l_index] = re.sub(re.compile("M106(.*)\n"), "", data[l_index])
+            data[l_index] = re.sub(re.compile("M107(.*)\n"), "", data[l_index])
+
+        ## Deal with a raft and with One-At-A-Time print sequence
+        if raft_enabled and bed_adhesion == "raft":
+            if print_sequence == "one_at_a_time":
+                for r_index in range(2,len(data)-2,1):
+                    lines = data[r_index].split("\n")
+                    if not raft_enabled or bed_adhesion != "raft":
+                        if ";LAYER:0" in data[r_index] or ";LAYER:-" in data[r_index]:
+                            lines.insert(1, "M106 S0" + str(t0_fan))
+                    if raft_enabled and bed_adhesion == "raft":
+                        if ";LAYER:-" in data[r_index]:
+                        ## Turn the raft fan on
+                            lines.insert(1, fan_sp_raft + str(t0_fan))
+                        ## Shut the raft fan off at layer 0
+                        if ";LAYER:0" in data[r_index]:
+                            lines.insert(1,"M106 S0" + str(t0_fan))
+                    data[r_index] = "\n".join(lines)
+            elif print_sequence == "all_at_once":
+                layer = data[raft_start_index]
+                lines = layer.split("\n")
+                if ";LAYER:-" in layer:
+                    ## Turn the raft fan on
+                    lines.insert(1, fan_sp_raft + str(init_fan))
+                layer = "\n".join(lines)
+                data[raft_start_index] = layer
+                layer = data[layer_0_index]
+                lines = layer.split("\n")
+                ## Shut the raft fan off
+                lines.insert(1, "M106 S0" + str(init_fan))
+                data[layer_0_index] = "\n".join(lines)
+        else:
+            for r_index in range(2,len(data)-2,1):
+                lines = data[r_index].split("\n")
+                if ";LAYER:0" in data[r_index] or ";LAYER:-" in data[r_index]:
+                    if not "0" in fan_list:
+                        lines.insert(1, "M106 S0" + str(t0_fan))
+                data[r_index] = "\n".join(lines)
+
+        ## Turn off all fans at the end of data[1].  If more than one instance of this script is running then this will result in multiple M106 lines.
+        temp_startup = data[1].split("\n")
+        temp_startup.insert(len(temp_startup)-2,"M106 S0" + str(t0_fan))
+        ## If there are multiple cooling fans shut them all off
+        if is_multi_fan:
+            if extruder_count > 1 and t1_fan != t0_fan: temp_startup.insert(len(temp_startup)-2,"M106 S0" + str(t1_fan))
+            if extruder_count > 2 and t2_fan != t1_fan and t2_fan != t0_fan: temp_startup.insert(len(temp_startup)-2,"M106 S0" + str(t2_fan))
+            if extruder_count > 3 and t3_fan != t2_fan and t3_fan != t1_fan and t3_fan != t0_fan: temp_startup.insert(len(temp_startup)-2,"M106 S0" + str(t3_fan))
+        data[1] = "\n".join(temp_startup)
+
+        ## If 'feature_fan_combing' is True then add additional 'MESH:NONMESH' lines for travel moves over 5 lines long
+        ## For compatibility with 5.3.0 change any MESH:NOMESH to MESH:NONMESH.
+        if feature_fan_combing:
+            for layer_num in range(2,len(data)):
+                layer = data[layer_num]
+                data[layer_num] = re.sub(";MESH:NOMESH", ";MESH:NONMESH", layer)
+            data = self._add_travel_comment(data, layer_0_index)
+
+        # Single Fan "By Layer"--------------------------------------------
+        if by_layer_or_feature == "by_layer" and not is_multi_fan:
+            return self._single_fan_by_layer(data, layer_0_index, fan_list, t0_fan)
+
+        # Multi-Fan "By Layer"---------------------------------------------
+        if by_layer_or_feature == "by_layer" and is_multi_fan:
+            return self._multi_fan_by_layer(data, layer_0_index, fan_list, t0_fan, t1_fan, t2_fan, t3_fan)
+
+        #Single Fan "By Feature"------------------------------------------
+        if by_layer_or_feature == "by_feature" and (not is_multi_fan or not is_multi_extr_print):
+            return self._single_fan_by_feature(data, layer_0_index, the_start_layer, the_end_layer, the_end_is_enabled, fan_list, t0_fan, feature_speed_list, feature_name_list, feature_fan_combing)
+
+        #Multi Fan "By Feature"-------------------------------------------
+        if by_layer_or_feature == "by_feature" and is_multi_fan:
+            return self._multi_fan_by_feature(data, layer_0_index, the_start_layer, the_end_layer, the_end_is_enabled, fan_list, t0_fan, t1_fan, t2_fan, t3_fan, feature_speed_list, feature_name_list, feature_fan_combing)
+
+    # The Single Fan "By Layer"----------------------------------------
+    def _single_fan_by_layer(self, data: str, layer_0_index: int, fan_list: str, t0_fan: str)->str:
+        layer_number = "0"
+        single_fan_data = data
+        for l_index in range(layer_0_index,len(single_fan_data)-1,1):
+            layer = single_fan_data[l_index]
+            fan_lines = layer.split("\n")
+            for fan_line in fan_lines:
+                if ";LAYER:" in fan_line:
+                    layer_number = str(fan_line.split(":")[1])
+                    ## If there is a match for the current layer number make the insertion
+                    for num in range(0,15,2):
+                        if layer_number == str(fan_list[num]):
+                            layer = layer.replace(fan_lines[0],fan_lines[0] + "\n" + fan_list[num + 1] + str(t0_fan))
+                            single_fan_data[l_index] = layer
+        return single_fan_data
+
+    # Multi-Fan "By Layer"-----------------------------------------
+    def _multi_fan_by_layer(self, data: str, layer_0_index: int, fan_list: str, t0_fan: str, t1_fan: str, t2_fan: str, t3_fan: str)->str:
+        multi_fan_data = data
+        layer_number = "0"
+        current_fan_speed = "0"
+        prev_fan = str(t0_fan)
+        this_fan = str(t0_fan)
+        start_index = str(len(multi_fan_data))
+        for num in range(0,15,2):
+        ## The fan_list may not be in ascending order.  Get the lowest layer number
+            try:
+                if int(fan_list[num]) < int(start_index):
+                    start_index = str(fan_list[num])
+            except:
+                pass
+        ## Move the start point if delete_existing_m106 is false
+        start_index = int(start_index) + int(layer_0_index)
+        ## Track the tool number
+        for num in range(1,int(start_index),1):
+            layer = multi_fan_data[num]
+            lines = layer.split("\n")
+            for line in lines:
+                if line == "T0":
+                    prev_fan = this_fan
+                    this_fan = t0_fan
+                elif line == "T1":
+                    prev_fan = this_fan
+                    this_fan = t1_fan
+                elif line == "T2":
+                    prev_fan = this_fan
+                    this_fan = t2_fan
+                elif line == "T3":
+                    prev_fan = this_fan
+                    this_fan = t3_fan
+        for l_index in range(int(start_index),len(multi_fan_data)-1,1):
+            modified_data = ""
+            layer = multi_fan_data[l_index]
+            fan_lines = layer.split("\n")
+            for fan_line in fan_lines:
+                ## Prepare to shut down the previous fan and start the next one.
+                if fan_line.startswith("T"):
+                    if fan_line == "T0": this_fan = str(t0_fan)
+                    if fan_line == "T1": this_fan = str(t1_fan)
+                    if fan_line == "T2": this_fan = str(t2_fan)
+                    if fan_line == "T3": this_fan = str(t3_fan)
+                    modified_data += "M106 S0" + prev_fan + "\n"
+                    modified_data += fan_line + "\n"
+                    modified_data += "M106 S" + str(current_fan_speed) + this_fan + "\n"
+                    prev_fan = this_fan
+                elif ";LAYER:" in fan_line:
+                    modified_data += fan_line + "\n"
+                    layer_number = str(fan_line.split(":")[1])
+                    for num in range(0,15,2):
+                        if layer_number == str(fan_list[num]):
+                            modified_data += fan_list[num + 1] + this_fan + "\n"
+                            current_fan_speed = str(fan_list[num + 1].split("S")[1])
+                            current_fan_speed = str(current_fan_speed.split(" ")[0]) ## Just in case
+                else:
+                    modified_data += fan_line + "\n"
+            if modified_data.endswith("\n"): modified_data = modified_data[0:-1]
+            multi_fan_data[l_index] = modified_data
+        return multi_fan_data
+
+    # Single fan by feature-----------------------------------------------
+    def _single_fan_by_feature(self, data: str, layer_0_index: int, the_start_layer: str, the_end_layer: str, the_end_is_enabled: str, fan_list: str, t0_fan: str, feature_speed_list: str, feature_name_list: str, feature_fan_combing: bool)->str:
+        single_fan_data = data
+        layer_number = "0"
+        index = 1
+        ## Start with layer:0
+        for l_index in range(layer_0_index,len(single_fan_data)-1,1):
+            modified_data = ""
+            layer = single_fan_data[l_index]
+            lines = layer.split("\n")
+            for line in lines:
+                if ";LAYER:" in line:
+                    layer_number = str(line.split(":")[1])
+                if int(layer_number) >= int(the_start_layer) and int(layer_number) < int(the_end_layer)-1:
+                    temp = line.split(" ")[0]
+                    try:
+                        name_index = feature_name_list.index(temp)
+                    except:
+                        name_index = -1
+                    if name_index != -1:
+                        modified_data += feature_speed_list[name_index] + t0_fan + "\n"
+                    elif ";MESH:NONMESH" in line:
+                        if feature_fan_combing == True:
+                            modified_data += "M106 S0" + t0_fan + "\n"
+                modified_data += line + "\n"
+                ## If an End Layer is defined and is less than the last layer then insert the Final Speed
+                if line == ";LAYER:" + str(the_end_layer) and the_end_is_enabled == True:
+                    modified_data += feature_speed_list[len(feature_speed_list) - 1] + t0_fan + "\n"
+            if modified_data.endswith("\n"): modified_data = modified_data[0: - 1]
+            single_fan_data[l_index] = modified_data
+        return single_fan_data
+
+    # Multi-fan by feature------------------------------------------------
+    def _multi_fan_by_feature(self, data: str, layer_0_index: int, the_start_layer: str, the_end_layer: str, the_end_is_enabled: str, fan_list: str, t0_fan: str, t1_fan: str, t2_fan: str, t3_fan: str, feature_speed_list: str, feature_name_list: str, feature_fan_combing: bool)->str:
+        multi_fan_data = data
+        layer_number = "0"
+        start_index = 1
+        prev_fan = t0_fan
+        this_fan = t0_fan
+        modified_data = ""
+        current_fan_speed = "0"
+        for my_index in range(1, len(multi_fan_data) - 1, 1):
+            layer = multi_fan_data[my_index]
+            if ";LAYER:" + str(the_start_layer) + "\n" in layer:
+                start_index = int(my_index) - 1
+                break
+        ## Track the previous tool changes
+        for num in range(1,start_index,1):
+            layer = multi_fan_data[num]
+            lines = layer.split("\n")
+            for line in lines:
+                if line == "T0":
+                    prev_fan = this_fan
+                    this_fan = t0_fan
+                elif line == "T1":
+                    prev_fan = this_fan
+                    this_fan = t1_fan
+                elif line == "T2":
+                    prev_fan = this_fan
+                    this_fan = t2_fan
+                elif line == "T3":
+                    prev_fan = this_fan
+                    this_fan = t3_fan
+        ## Get the current tool.
+        for l_index in range(start_index,start_index + 1,1):
+            layer = multi_fan_data[l_index]
+            lines = layer.split("\n")
+            for line in lines:
+                if line.startswith("T"):
+                    if line == "T0": this_fan = t0_fan
+                    if line == "T1": this_fan = t1_fan
+                    if line == "T2": this_fan = t2_fan
+                    if line == "T3": this_fan = t3_fan
+                    prev_fan = this_fan
+
+        ## Start to make insertions-------------------------------------
+        for l_index in range(start_index+1,len(multi_fan_data)-1,1):
+            layer = multi_fan_data[l_index]
+            lines = layer.split("\n")
+            for line in lines:
+                if line.startswith("T"):
+                    if line == "T0": this_fan = t0_fan
+                    if line == "T1": this_fan = t1_fan
+                    if line == "T2": this_fan = t2_fan
+                    if line == "T3": this_fan = t3_fan
+                    ## Turn off the prev fan
+                    modified_data += "M106 S0" + prev_fan + "\n"
+                    modified_data += line + "\n"
+                    ## Turn on the current fan
+                    modified_data += "M106 S" + str(current_fan_speed) + this_fan + "\n"
+                    prev_fan = this_fan
+                if ";LAYER:" in line:
+                    layer_number = str(line.split(":")[1])
+                    modified_data += line + "\n"
+                if int(layer_number) >= int(the_start_layer):
+                    temp = line.split(" ")[0]
+                    try:
+                        name_index = feature_name_list.index(temp)
+                    except:
+                        name_index = -1
+                    if name_index != -1:
+                        modified_data += line + "\n" + feature_speed_list[name_index] + this_fan + "\n"
+                        #modified_data += feature_speed_list[name_index] + this_fan + "\n"
+                        current_fan_speed = str(feature_speed_list[name_index].split("S")[1])
+                    elif ";MESH:NONMESH" in line:
+                        if feature_fan_combing == True:
+                            modified_data += line + "\n"
+                            modified_data += "M106 S0" + this_fan + "\n"
+                            current_fan_speed = "0"
+                        else:
+                            modified_data += line + "\n"
+                    ## If an end layer is defined - Insert the final speed and set the other variables to Final Speed to finish the file
+                    ## There cannot be a break here because if there are multiple fan numbers they still need to be shut off and turned on.
+                    elif line == ";LAYER:" + str(the_end_layer):
+                        modified_data += feature_speed_list[len(feature_speed_list) - 1] + this_fan + "\n"
+                        for set_speed in range(0, len(feature_speed_list) - 2):
+                            feature_speed_list[set_speed] = feature_speed_list[len(feature_speed_list) - 1]
+                    else:
+                    ## Layer and Tool get inserted into modified_data above.  All other lines go into modified_data here
+                        if not line.startswith("T") and not line.startswith(";LAYER:"): modified_data += line + "\n"
+            if modified_data.endswith("\n"): modified_data = modified_data[0: - 1]
+            multi_fan_data[l_index] = modified_data
+            modified_data = ""
+        return multi_fan_data
+
+    #Try to catch layer input errors, set the minimum speed to 12%, and put the strings together
+    def _layer_checker(self, fan_string: str, ty_pe: str, fan_mode: bool) -> str:
+        fan_string_l = str(fan_string.split("/")[0])
+        try:
+            if int(fan_string_l) <= 1: fan_string_l = "1"
+            if fan_string_l == "": fan_string_l = str(len(data))
+        except ValueError:
+            fan_string_l = str(len(data))
+        fan_string_l = str(int(fan_string_l) - 1)
+        fan_string_p = str(fan_string.split("/")[1])
+        if fan_string_p == "": fan_string_p = "0"
+        try:
+            if int(fan_string_p) < 0: fan_string_p = "0"
+            if int(fan_string_p) > 100: fan_string_p = "100"
+        except ValueError:
+            fan_string_p = "0"
+        ## Set the minimum fan speed to 12%
+        if int(fan_string_p) < 12 and int(fan_string_p) != 0:
+            fan_string_p = "12"
+        fan_layer_line = str(fan_string_l)
+        if fan_mode:
+            fan_percent_line = "M106 S" + str(round(int(fan_string_p) * 2.55))
+        else:
+            fan_percent_line = "M106 S" + str(round(int(fan_string_p) / 100, 1))
+        if ty_pe == "l":
+            return str(fan_layer_line)
+        elif ty_pe == "p":
+            return fan_percent_line
+
+    #Try to catch feature input errors, set the minimum speed to 12%, and put the strings together when 'By Feature'
+    def _feature_checker(self, fan_feat_string: int, fan_mode: bool) -> str:
+        if fan_feat_string < 0: fan_feat_string = 0
+        ## Set the minimum fan speed to 12%
+        if fan_feat_string > 0 and fan_feat_string < 12: fan_feat_string = 12
+        if fan_feat_string > 100: fan_feat_string = 100
+        if fan_mode:
+            fan_sp_feat = "M106 S" + str(round(fan_feat_string * 2.55))
+        else:
+            fan_sp_feat = "M106 S" + str(round(fan_feat_string / 100, 1))
+        return fan_sp_feat
+
+    # Add additional travel comments to turn the fan off during combing.
+    def _add_travel_comment(self, comment_data: str, lay_0_index: str) -> str:
+        for lay_num in range(int(lay_0_index), len(comment_data)-1,1):
+            layer = comment_data[lay_num]
+            lines = layer.split("\n")
+            ## Copy the data to new_data and make the insertions there
+            new_data = lines
+            g0_count = 0
+            g0_index = -1
+            feature_type = ";TYPE:SUPPORT"
+            is_travel = False
+            for index, line in enumerate(lines):
+                insert_index = 0
+                if ";TYPE:" in line:
+                    feature_type = line
+                    is_travel = False
+                    g0_count = 0
+                if ";MESH:NONMESH" in line:
+                    is_travel = True
+                    g0_count = 0
+                if line.startswith("G0 ") and not is_travel:
+                    g0_count += 1
+                    if g0_index == -1:
+                        g0_index = lines.index(line)
+                elif not line.startswith("G0 ") and not is_travel:
+                ## Add additional 'NONMESH' lines to shut the fan off during long combing moves--------
+                    if g0_count > 5:
+                        if not is_travel:
+                            new_data.insert(g0_index + insert_index, ";MESH:NONMESH")
+                            insert_index += 1
+                ## Add the feature_type at the end of the combing move to turn the fan back on
+                            new_data.insert(g0_index + g0_count + 1, feature_type)
+                            insert_index += 1
+                        g0_count = 0
+                        g0_index = -1
+                        is_travel = False
+                    elif g0_count <= 5:
+                        g0_count = 0
+                        g0_index = -1
+                        is_travel = False
+            comment_data[lay_num] = "\n".join(new_data)
+        return comment_data

plugins/SimulationView/SimulationPass.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+import math
 
 from UM.Math.Color import Color
 from UM.Math.Vector import Vector
@@ -148,24 +149,23 @@ class SimulationPass(RenderPass):
                         if layer == self._layer_view._current_layer_num:
                             # We look for the position of the head, searching the point of the current path
                             index = int(self._layer_view.getCurrentPath())
-                            offset = 0
                             for polygon in layer_data.getLayer(layer).polygons:
                                 # The size indicates all values in the two-dimension array, and the second dimension is
                                 # always size 3 because we have 3D points.
-                                if index >= polygon.data.size // 3 - offset:
-                                    index -= polygon.data.size // 3 - offset
-                                    offset = 1  # This is to avoid the first point when there is more than one polygon, since has the same value as the last point in the previous polygon
+                                if index >= polygon.data.size // 3 :
+                                    index -= polygon.data.size // 3
                                     continue
                                 # The head position is calculated and translated
-                                ratio = self._layer_view.getCurrentPath() - index
-                                pos_a = Vector(polygon.data[index + offset][0], polygon.data[index + offset][1],
-                                               polygon.data[index + offset][2])
-                                if ratio <= 0.0001 or index + offset < len(polygon.data):
+                                ratio = self._layer_view.getCurrentPath() - math.floor(self._layer_view.getCurrentPath())
+                                pos_a = Vector(polygon.data[index][0], polygon.data[index][1],
+                                               polygon.data[index][2])
+                                if ratio <= 0.0001 or index + 1 == len(polygon.data):
+                                    # in case there multiple polygons and polygon changes, the first point has the same value as the last point in the previous polygon
                                     head_position = pos_a + node.getWorldPosition()
                                 else:
-                                    pos_b = Vector(polygon.data[index + offset + 1][0],
-                                                   polygon.data[index + offset + 1][1],
-                                                   polygon.data[index + offset + 1][2])
+                                    pos_b = Vector(polygon.data[index + 1][0],
+                                                   polygon.data[index + 1][1],
+                                                   polygon.data[index + 1][2])
                                     vec = pos_a * (1.0 - ratio) + pos_b * ratio
                                     head_position = vec + node.getWorldPosition()
                                 break

plugins/SimulationView/SimulationView.py

@@ -57,7 +57,7 @@ class SimulationView(CuraView):
     LAYER_VIEW_TYPE_LINE_TYPE = 1
     LAYER_VIEW_TYPE_FEEDRATE = 2
     LAYER_VIEW_TYPE_THICKNESS = 3
-    SIMULATION_FACTOR = 3
+    SIMULATION_FACTOR = 2
 
     _no_layers_warning_preference = "view/no_layers_warning"
 
@@ -97,7 +97,8 @@ class SimulationView(CuraView):
         self._min_line_width = sys.float_info.max
         self._min_flow_rate = sys.float_info.max
         self._max_flow_rate = sys.float_info.min
-        self._cumulative_line_duration = {}
+        self._cumulative_line_duration_layer: Optional[int] = None
+        self._cumulative_line_duration: List[float] = []
 
         self._global_container_stack: Optional[ContainerStack] = None
         self._proxy = None
@@ -196,7 +197,7 @@ class SimulationView(CuraView):
         if len(cumulative_line_duration) > 0:
             self._current_time = time
             left_i = 0
-            right_i = self._max_paths - 1
+            right_i = len(cumulative_line_duration) - 1
             total_duration = cumulative_line_duration[-1]
             # make an educated guess about where to start
             i = int(right_i * max(0.0, min(1.0, self._current_time / total_duration)))
@@ -211,7 +212,9 @@ class SimulationView(CuraView):
             left_value = cumulative_line_duration[i - 1] if i > 0 else 0.0
             right_value = cumulative_line_duration[i]
 
-            assert (left_value <= self._current_time <= right_value)
+            if not (left_value <= self._current_time <= right_value):
+                Logger.warn(
+                    f"Binary search error (out of bounds): index {i}: left value {left_value} right value {right_value} and current time is {self._current_time}")
 
             fractional_value = (self._current_time - left_value) / (right_value - left_value)
 
@@ -244,19 +247,22 @@ class SimulationView(CuraView):
 
     def cumulativeLineDuration(self) -> List[float]:
         # Make sure _cumulative_line_duration is initialized properly
-        if self.getCurrentLayer() not in self._cumulative_line_duration:
+        if self.getCurrentLayer() != self._cumulative_line_duration_layer:
             #clear cache
-            self._cumulative_line_duration = {}
-            self._cumulative_line_duration[self.getCurrentLayer()] = []
+            self._cumulative_line_duration = []
             total_duration = 0.0
             polylines = self.getLayerData()
             if polylines is not None:
                 for polyline in polylines.polygons:
                     for line_duration in list((polyline.lineLengths / polyline.lineFeedrates)[0]):
                         total_duration += line_duration / SimulationView.SIMULATION_FACTOR
-                        self._cumulative_line_duration[self.getCurrentLayer()].append(total_duration)
+                        self._cumulative_line_duration.append(total_duration)
+                    # for tool change we add an extra tool path
+                    self._cumulative_line_duration.append(total_duration)
+            # set current cached layer
+            self._cumulative_line_duration_layer = self.getCurrentLayer()
 
-        return self._cumulative_line_duration[self.getCurrentLayer()]
+        return self._cumulative_line_duration
 
     def getLayerData(self) -> Optional["LayerData"]:
         scene = self.getController().getScene()

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -331,7 +331,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
             return False
 
         [printer, *_] = self._printers
-        return printer.name in ("ultimaker_methodx", "ultimaker_methodxl")
+        return printer.type in ("MakerBot Method X", "MakerBot Method XL")
 
     @pyqtProperty(bool, notify=_cloudClusterPrintersChanged)
     def supportsPrintJobActions(self) -> bool:

plugins/VersionUpgrade/VersionUpgrade56to57/VersionUpgrade56to57.py

@@ -0,0 +1,95 @@
+# Copyright (c) 2024 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+from typing import Tuple, List
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+_REMOVED_SETTINGS = {
+    "support_interface_skip_height",
+}
+_NEW_SETTING_VERSION = "23"
+
+
+class VersionUpgrade56to57(VersionUpgrade):
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades preferences to remove from the visibility list the settings that were removed in this version.
+        It also changes the preferences to have the new version number.
+
+        This removes any settings that were removed in the new Cura version.
+        :param serialized: The original contents of the preferences file.
+        :param filename: The file name of the preferences file.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION
+
+        # Remove deleted settings from the visible settings list.
+        if "general" in parser and "visible_settings" in parser["general"]:
+            visible_settings = set(parser["general"]["visible_settings"].split(";"))
+            for removed in _REMOVED_SETTINGS:
+                if removed in visible_settings:
+                    visible_settings.remove(removed)
+
+            parser["general"]["visible_settings"] = ";".join(visible_settings)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades instance containers to remove the settings that were removed in this version.
+        It also changes the instance containers to have the new version number.
+
+        This removes any settings that were removed in the new Cura version and updates settings that need to be updated
+        with a new value.
+
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION
+
+        if "values" in parser:
+            # Remove deleted settings from the instance containers.
+            for removed in _REMOVED_SETTINGS:
+                if removed in parser["values"]:
+                    del parser["values"][removed]
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades stacks to have the new version number.
+
+        :param serialized: The original contents of the stack.
+        :param filename: The original file name of the stack.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+
+        parser["metadata"]["setting_version"] = _NEW_SETTING_VERSION
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade56to57/__init__.py

@@ -0,0 +1,61 @@
+# Copyright (c) 2024 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade56to57
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade56to57.VersionUpgrade56to57()
+
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 7000022):        ("preferences", 7000023,        upgrade.upgradePreferences),
+            ("machine_stack", 6000022):      ("machine_stack", 6000023,      upgrade.upgradeStack),
+            ("extruder_train", 6000022):     ("extruder_train", 6000023,     upgrade.upgradeStack),
+            ("definition_changes", 4000022): ("definition_changes", 4000023, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000022):    ("quality_changes", 4000023,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000022):            ("quality", 4000023,            upgrade.upgradeInstanceContainer),
+            ("user", 4000022):               ("user", 4000023,               upgrade.upgradeInstanceContainer),
+            ("intent", 4000022):             ("intent", 4000023,             upgrade.upgradeInstanceContainer),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            }
+        }
+    }
+
+
+def register(app: "Application") -> Dict[str, Any]:
+    return {"version_upgrade": upgrade}

plugins/VersionUpgrade/VersionUpgrade56to57/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 5.6 to 5.7",
+    "author": "UltiMaker",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 5.6 to Cura 5.7.",
+    "api": 8,
+    "i18n-catalog": "cura"
+}

resources/definitions/ankermake_m5.def.json

@@ -112,7 +112,6 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_enable": { "value": true },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_roof_enable": { "value": true },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },

resources/definitions/artillery_base.def.json

@@ -114,7 +114,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },
         "support_xy_overrides_z": { "value": "'xy_overrides_z'" },

resources/definitions/atmat_signal_pro_base.def.json

@@ -154,7 +154,6 @@
         "support_infill_rate": { "value": "20" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "1" },
-        "support_interface_skip_height": { "value": "layer_height" },
         "support_join_distance": { "value": "1" },
         "support_offset": { "value": "1.5" },
         "support_pattern": { "default_value": "zigzag" },

resources/definitions/biqu_base.def.json

@@ -108,7 +108,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/blocks_base.def.json

@@ -97,7 +97,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },

resources/definitions/fdmprinter.def.json

@@ -1159,7 +1159,7 @@
                     "label": "Optimize Wall Printing Order",
                     "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization. First layer is not optimized when choosing brim as build plate adhesion type.",
                     "type": "bool",
-                    "default_value": false,
+                    "default_value": true,
                     "settable_per_mesh": true
                 },
                 "inset_direction":
@@ -1478,6 +1478,7 @@
                             "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.",
                             "type": "bool",
                             "value": true,
+                            "default_value": true,
                             "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'",
                             "limit_to_extruder": "roofing_extruder_nr",
                             "settable_per_mesh": true
@@ -4578,6 +4579,7 @@
                     "unit": "\u00b0C",
                     "type": "float",
                     "value": "material_print_temperature",
+                    "default_value": 0,
                     "enabled": "cool_min_layer_time > 0",
                     "minimum_value_warning": "max(material_final_print_temperature, material_initial_print_temperature)",
                     "maximum_value_warning": "material_print_temperature",
@@ -5421,20 +5423,6 @@
                         }
                     }
                 },
-                "support_interface_skip_height":
-                {
-                    "label": "Support Interface Resolution",
-                    "description": "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface.",
-                    "unit": "mm",
-                    "type": "float",
-                    "default_value": 0.2,
-                    "value": "layer_height",
-                    "minimum_value": "0",
-                    "maximum_value_warning": "support_interface_height",
-                    "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_meshes_present)",
-                    "settable_per_mesh": true
-                },
                 "support_interface_density":
                 {
                     "label": "Support Interface Density",
@@ -6112,7 +6100,101 @@
                     "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                     "limit_to_extruder": "adhesion_extruder_nr",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true
+                    "settable_per_extruder": true,
+                    "children":
+                    {
+                        "raft_base_margin":
+                        {
+                            "label": "Raft Base Extra Margin",
+                            "description": "If the raft base is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_margin",
+                            "default_value": 15,
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "maximum_value_warning": "min(raft_interface_margin, 20)",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "limit_to_extruder": "raft_base_extruder_nr",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
+                        },
+                        "raft_interface_margin":
+                        {
+                            "label": "Raft Middle Extra Margin",
+                            "description": "If the raft middle is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_margin",
+                            "default_value": 15,
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "maximum_value_warning": "min(raft_surface_margin, 20)",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "limit_to_extruder": "raft_interface_extruder_nr",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
+                        },
+                        "raft_surface_margin":
+                        {
+                            "label": "Raft Top Extra Margin",
+                            "description": "If the raft top is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_margin",
+                            "default_value": 15,
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "maximum_value_warning": "20",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "limit_to_extruder": "raft_surface_extruder_nr",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true
+                        }
+                    }
+                },
+                "raft_remove_inside_corners":
+                {
+                    "label": "Remove Raft Inside Corners",
+                    "description": "Remove inside corners from the raft, causing the raft to become convex.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "children":
+                    {
+                        "raft_base_remove_inside_corners":
+                        {
+                            "label": "Remove Raft Base Inside Corners",
+                            "description": "Remove inside corners from the raft base, causing the raft to become convex.",
+                            "type": "bool",
+                            "value": "raft_remove_inside_corners",
+                            "default_value": false,
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_interface_remove_inside_corners":
+                        {
+                            "label": "Remove Raft Middle Inside Corners",
+                            "description": "Remove inside corners from the raft middle part, causing the raft to become convex.",
+                            "type": "bool",
+                            "value": "raft_remove_inside_corners",
+                            "default_value": false,
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_surface_remove_inside_corners":
+                        {
+                            "label": "Remove Raft Top Inside Corners",
+                            "description": "Remove inside corners from the raft top part, causing the raft to become convex.",
+                            "type": "bool",
+                            "value": "raft_remove_inside_corners",
+                            "default_value": false,
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        }
+                    }
                 },
                 "raft_smoothing":
                 {
@@ -6124,9 +6206,53 @@
                     "minimum_value": "0",
                     "minimum_value_warning": "raft_interface_line_width",
                     "enabled": "resolveOrValue('adhesion_type') == 'raft' and not raft_remove_inside_corners",
-                    "limit_to_extruder": "adhesion_extruder_nr",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true
+                    "settable_per_extruder": false,
+                    "children":
+                    {
+                        "raft_base_smoothing":
+                        {
+                            "label": "Raft Base Smoothing",
+                            "description": "This setting controls how much inner corners in the raft base outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_smoothing",
+                            "default_value": 5,
+                            "minimum_value": "0",
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and not raft_base_remove_inside_corners",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_interface_smoothing":
+                        {
+                            "label": "Raft Middle Smoothing",
+                            "description": "This setting controls how much inner corners in the raft middle outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_smoothing",
+                            "default_value": 5,
+                            "minimum_value": "0",
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and not raft_interface_remove_inside_corners",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_surface_smoothing":
+                        {
+                            "label": "Raft Top Smoothing",
+                            "description": "This setting controls how much inner corners in the raft top outline are rounded. Inward corners are rounded to a semi circle with a radius equal to the value given here. This setting also removes holes in the raft outline which are smaller than such a circle.",
+                            "unit": "mm",
+                            "type": "float",
+                            "value": "raft_smoothing",
+                            "default_value": 5,
+                            "minimum_value": "0",
+                            "minimum_value_warning": "raft_interface_line_width",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and not raft_surface_remove_inside_corners",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        }
+                    }
                 },
                 "raft_airgap":
                 {
@@ -6157,66 +6283,53 @@
                     "settable_per_extruder": true,
                     "limit_to_extruder": "raft_surface_extruder_nr"
                 },
-                "raft_surface_layers":
+                "raft_base_thickness":
                 {
-                    "label": "Raft Top Layers",
-                    "description": "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1.",
-                    "type": "int",
-                    "default_value": 2,
-                    "minimum_value": "0",
-                    "maximum_value_warning": "20",
+                    "label": "Raft Base Thickness",
+                    "description": "Layer thickness of the base raft layer. This should be a thick layer which sticks firmly to the printer build plate.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 0.3,
+                    "value": "resolveOrValue('layer_height_0') * 1.2",
+                    "minimum_value": "0.001",
+                    "minimum_value_warning": "0.04",
+                    "maximum_value_warning": "0.75 * raft_base_line_width",
                     "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_surface_extruder_nr"
+                    "limit_to_extruder": "raft_base_extruder_nr"
                 },
-                "raft_surface_thickness":
+                "raft_base_line_width":
                 {
-                    "label": "Raft Top Layer Thickness",
-                    "description": "Layer thickness of the top raft layers.",
+                    "label": "Raft Base Line Width",
+                    "description": "Width of the lines in the base raft layer. These should be thick lines to assist in build plate adhesion.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.1,
-                    "value": "resolveOrValue('layer_height')",
+                    "default_value": 0.8,
                     "minimum_value": "0.001",
-                    "minimum_value_warning": "0.04",
-                    "maximum_value_warning": "0.75 * machine_nozzle_size",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
+                    "value": "machine_nozzle_size * 2",
+                    "minimum_value_warning": "machine_nozzle_size * 0.5",
+                    "maximum_value_warning": "machine_nozzle_size * 3",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_surface_extruder_nr"
+                    "limit_to_extruder": "raft_base_extruder_nr"
                 },
-                "raft_surface_line_width":
+                "raft_base_line_spacing":
                 {
-                    "label": "Raft Top Line Width",
-                    "description": "Width of the lines in the top surface of the raft. These can be thin lines so that the top of the raft becomes smooth.",
+                    "label": "Raft Base Line Spacing",
+                    "description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.4,
-                    "value": "line_width",
-                    "minimum_value": "0.001",
-                    "minimum_value_warning": "machine_nozzle_size * 0.1",
-                    "maximum_value_warning": "machine_nozzle_size * 2",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_surface_extruder_nr"
-                },
-                "raft_surface_line_spacing":
-                {
-                    "label": "Raft Top Spacing",
-                    "description": "The distance between the raft lines for the top raft layers. The spacing should be equal to the line width, so that the surface is solid.",
-                    "unit": "mm",
-                    "type": "float",
-                    "default_value": 0.4,
+                    "default_value": 1.6,
+                    "value": "raft_base_line_width * 2",
                     "minimum_value": "0",
-                    "minimum_value_warning": "raft_surface_line_width",
-                    "maximum_value_warning": "raft_surface_line_width * 3",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
-                    "value": "raft_surface_line_width",
+                    "minimum_value_warning": "raft_base_line_width",
+                    "maximum_value_warning": "100",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_surface_extruder_nr"
+                    "limit_to_extruder": "raft_base_extruder_nr"
                 },
                 "raft_interface_layers":
                 {
@@ -6279,53 +6392,114 @@
                     "settable_per_extruder": true,
                     "limit_to_extruder": "raft_interface_extruder_nr"
                 },
-                "raft_base_thickness":
+                "raft_surface_layers":
                 {
-                    "label": "Raft Base Thickness",
-                    "description": "Layer thickness of the base raft layer. This should be a thick layer which sticks firmly to the printer build plate.",
+                    "label": "Raft Top Layers",
+                    "description": "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1.",
+                    "type": "int",
+                    "default_value": 2,
+                    "minimum_value": "0",
+                    "maximum_value_warning": "20",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "limit_to_extruder": "raft_surface_extruder_nr"
+                },
+                "raft_surface_thickness":
+                {
+                    "label": "Raft Top Layer Thickness",
+                    "description": "Layer thickness of the top raft layers.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.3,
-                    "value": "resolveOrValue('layer_height_0') * 1.2",
+                    "default_value": 0.1,
+                    "value": "resolveOrValue('layer_height')",
                     "minimum_value": "0.001",
                     "minimum_value_warning": "0.04",
-                    "maximum_value_warning": "0.75 * raft_base_line_width",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "maximum_value_warning": "0.75 * machine_nozzle_size",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_base_extruder_nr"
+                    "limit_to_extruder": "raft_surface_extruder_nr"
                 },
-                "raft_base_line_width":
+                "raft_surface_line_width":
                 {
-                    "label": "Raft Base Line Width",
-                    "description": "Width of the lines in the base raft layer. These should be thick lines to assist in build plate adhesion.",
+                    "label": "Raft Top Line Width",
+                    "description": "Width of the lines in the top surface of the raft. These can be thin lines so that the top of the raft becomes smooth.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.8,
+                    "default_value": 0.4,
+                    "value": "line_width",
                     "minimum_value": "0.001",
-                    "value": "machine_nozzle_size * 2",
-                    "minimum_value_warning": "machine_nozzle_size * 0.5",
-                    "maximum_value_warning": "machine_nozzle_size * 3",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "minimum_value_warning": "machine_nozzle_size * 0.1",
+                    "maximum_value_warning": "machine_nozzle_size * 2",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_base_extruder_nr"
+                    "limit_to_extruder": "raft_surface_extruder_nr"
                 },
-                "raft_base_line_spacing":
+                "raft_surface_line_spacing":
                 {
-                    "label": "Raft Base Line Spacing",
-                    "description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.",
+                    "label": "Raft Top Spacing",
+                    "description": "The distance between the raft lines for the top raft layers. The spacing should be equal to the line width, so that the surface is solid.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 1.6,
-                    "value": "raft_base_line_width * 2",
+                    "default_value": 0.4,
                     "minimum_value": "0",
-                    "minimum_value_warning": "raft_base_line_width",
-                    "maximum_value_warning": "100",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "minimum_value_warning": "raft_surface_line_width",
+                    "maximum_value_warning": "raft_surface_line_width * 3",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
+                    "value": "raft_surface_line_width",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
-                    "limit_to_extruder": "raft_base_extruder_nr"
+                    "limit_to_extruder": "raft_surface_extruder_nr"
+                },
+                "raft_wall_count":
+                {
+                    "label": "Raft Wall Count",
+                    "description": "The number of contours to print around the linear pattern of the raft.",
+                    "type": "int",
+                    "default_value": 1,
+                    "minimum_value": "0",
+                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "children":
+                    {
+                        "raft_base_wall_count":
+                        {
+                            "label": "Raft Base Wall Count",
+                            "description": "The number of contours to print around the linear pattern in the base layer of the raft.",
+                            "type": "int",
+                            "default_value": 1,
+                            "value": "raft_wall_count",
+                            "minimum_value": "0",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_interface_wall_count":
+                        {
+                            "label": "Raft Middle Wall Count",
+                            "description": "The number of contours to print around the linear pattern in the middle layers of the raft.",
+                            "type": "int",
+                            "default_value": 0,
+                            "minimum_value": "0",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        },
+                        "raft_surface_wall_count":
+                        {
+                            "label": "Raft Top Wall Count",
+                            "description": "The number of contours to print around the linear pattern in the top layers of the raft.",
+                            "type": "int",
+                            "default_value": 0,
+                            "minimum_value": "0",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": false
+                        }
+                    }
                 },
                 "raft_speed":
                 {
@@ -6344,21 +6518,21 @@
                     "limit_to_extruder": "adhesion_extruder_nr",
                     "children":
                     {
-                        "raft_surface_speed":
+                        "raft_base_speed":
                         {
-                            "label": "Raft Top Print Speed",
-                            "description": "The speed at which the top raft layers are printed. These should be printed a bit slower, so that the nozzle can slowly smooth out adjacent surface lines.",
+                            "label": "Raft Base Print Speed",
+                            "description": "The speed at which the base raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high.",
                             "unit": "mm/s",
                             "type": "float",
-                            "default_value": 20,
+                            "default_value": 15,
                             "minimum_value": "0.1",
                             "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
-                            "maximum_value_warning": "100",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
-                            "value": "raft_speed",
+                            "maximum_value_warning": "200",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "value": "0.75 * raft_speed",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
-                            "limit_to_extruder": "raft_surface_extruder_nr"
+                            "limit_to_extruder": "raft_base_extruder_nr"
                         },
                         "raft_interface_speed":
                         {
@@ -6376,21 +6550,21 @@
                             "settable_per_extruder": true,
                             "limit_to_extruder": "raft_interface_extruder_nr"
                         },
-                        "raft_base_speed":
+                        "raft_surface_speed":
                         {
-                            "label": "Raft Base Print Speed",
-                            "description": "The speed at which the base raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high.",
+                            "label": "Raft Top Print Speed",
+                            "description": "The speed at which the top raft layers are printed. These should be printed a bit slower, so that the nozzle can slowly smooth out adjacent surface lines.",
                             "unit": "mm/s",
                             "type": "float",
-                            "default_value": 15,
+                            "default_value": 20,
                             "minimum_value": "0.1",
                             "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
-                            "maximum_value_warning": "200",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
-                            "value": "0.75 * raft_speed",
+                            "maximum_value_warning": "100",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
+                            "value": "raft_speed",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
-                            "limit_to_extruder": "raft_base_extruder_nr"
+                            "limit_to_extruder": "raft_surface_extruder_nr"
                         }
                     }
                 },
@@ -6410,10 +6584,10 @@
                     "limit_to_extruder": "adhesion_extruder_nr",
                     "children":
                     {
-                        "raft_surface_acceleration":
+                        "raft_base_acceleration":
                         {
-                            "label": "Raft Top Print Acceleration",
-                            "description": "The acceleration with which the top raft layers are printed.",
+                            "label": "Raft Base Print Acceleration",
+                            "description": "The acceleration with which the base raft layer is printed.",
                             "unit": "mm/s\u00b2",
                             "type": "float",
                             "default_value": 3000,
@@ -6421,9 +6595,9 @@
                             "minimum_value": "0.1",
                             "minimum_value_warning": "100",
                             "maximum_value_warning": "10000",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('acceleration_enabled') and raft_surface_layers > 0",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('acceleration_enabled')",
                             "settable_per_mesh": false,
-                            "limit_to_extruder": "raft_surface_extruder_nr"
+                            "limit_to_extruder": "raft_base_extruder_nr"
                         },
                         "raft_interface_acceleration":
                         {
@@ -6440,10 +6614,10 @@
                             "settable_per_mesh": false,
                             "limit_to_extruder": "raft_interface_extruder_nr"
                         },
-                        "raft_base_acceleration":
+                        "raft_surface_acceleration":
                         {
-                            "label": "Raft Base Print Acceleration",
-                            "description": "The acceleration with which the base raft layer is printed.",
+                            "label": "Raft Top Print Acceleration",
+                            "description": "The acceleration with which the top raft layers are printed.",
                             "unit": "mm/s\u00b2",
                             "type": "float",
                             "default_value": 3000,
@@ -6451,9 +6625,9 @@
                             "minimum_value": "0.1",
                             "minimum_value_warning": "100",
                             "maximum_value_warning": "10000",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('acceleration_enabled')",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('acceleration_enabled') and raft_surface_layers > 0",
                             "settable_per_mesh": false,
-                            "limit_to_extruder": "raft_base_extruder_nr"
+                            "limit_to_extruder": "raft_surface_extruder_nr"
                         }
                     }
                 },
@@ -6473,20 +6647,20 @@
                     "limit_to_extruder": "adhesion_extruder_nr",
                     "children":
                     {
-                        "raft_surface_jerk":
+                        "raft_base_jerk":
                         {
-                            "label": "Raft Top Print Jerk",
-                            "description": "The jerk with which the top raft layers are printed.",
+                            "label": "Raft Base Print Jerk",
+                            "description": "The jerk with which the base raft layer is printed.",
                             "unit": "mm/s",
                             "type": "float",
                             "default_value": 20,
                             "value": "raft_jerk",
                             "minimum_value": "0",
                             "minimum_value_warning": "5",
-                            "maximum_value_warning": "100",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled') and raft_surface_layers > 0",
+                            "maximum_value_warning": "50",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled')",
                             "settable_per_mesh": false,
-                            "limit_to_extruder": "raft_surface_extruder_nr"
+                            "limit_to_extruder": "raft_base_extruder_nr"
                         },
                         "raft_interface_jerk":
                         {
@@ -6503,20 +6677,20 @@
                             "settable_per_mesh": false,
                             "limit_to_extruder": "raft_interface_extruder_nr"
                         },
-                        "raft_base_jerk":
+                        "raft_surface_jerk":
                         {
-                            "label": "Raft Base Print Jerk",
-                            "description": "The jerk with which the base raft layer is printed.",
+                            "label": "Raft Top Print Jerk",
+                            "description": "The jerk with which the top raft layers are printed.",
                             "unit": "mm/s",
                             "type": "float",
                             "default_value": 20,
                             "value": "raft_jerk",
                             "minimum_value": "0",
                             "minimum_value_warning": "5",
-                            "maximum_value_warning": "50",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled')",
+                            "maximum_value_warning": "100",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and resolveOrValue('jerk_enabled') and raft_surface_layers > 0",
                             "settable_per_mesh": false,
-                            "limit_to_extruder": "raft_base_extruder_nr"
+                            "limit_to_extruder": "raft_surface_extruder_nr"
                         }
                     }
                 },
@@ -6535,20 +6709,20 @@
                     "limit_to_extruder": "adhesion_extruder_nr",
                     "children":
                     {
-                        "raft_surface_fan_speed":
+                        "raft_base_fan_speed":
                         {
-                            "label": "Raft Top Fan Speed",
-                            "description": "The fan speed for the top raft layers.",
+                            "label": "Raft Base Fan Speed",
+                            "description": "The fan speed for the base raft layer.",
                             "unit": "%",
                             "type": "float",
                             "minimum_value": "0",
                             "maximum_value": "100",
                             "default_value": 0,
                             "value": "raft_fan_speed",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
-                            "limit_to_extruder": "raft_surface_extruder_nr"
+                            "limit_to_extruder": "raft_base_extruder_nr"
                         },
                         "raft_interface_fan_speed":
                         {
@@ -6565,20 +6739,20 @@
                             "settable_per_extruder": true,
                             "limit_to_extruder": "raft_interface_extruder_nr"
                         },
-                        "raft_base_fan_speed":
+                        "raft_surface_fan_speed":
                         {
-                            "label": "Raft Base Fan Speed",
-                            "description": "The fan speed for the base raft layer.",
+                            "label": "Raft Top Fan Speed",
+                            "description": "The fan speed for the top raft layers.",
                             "unit": "%",
                             "type": "float",
                             "minimum_value": "0",
                             "maximum_value": "100",
                             "default_value": 0,
                             "value": "raft_fan_speed",
-                            "enabled": "resolveOrValue('adhesion_type') == 'raft'",
+                            "enabled": "resolveOrValue('adhesion_type') == 'raft' and raft_surface_layers > 0",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
-                            "limit_to_extruder": "raft_base_extruder_nr"
+                            "limit_to_extruder": "raft_surface_extruder_nr"
                         }
                     }
                 }
@@ -6689,7 +6863,7 @@
                     "type": "float",
                     "unit": "mm",
                     "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
-                    "default_value": "resolveOrValue('brim_width')",
+                    "default_value": 1.2,
                     "minimum_value": "0",
                     "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
                     "settable_per_mesh": false,
@@ -8273,28 +8447,6 @@
                     "settable_per_mesh": true,
                     "settable_per_extruder": true
                 },
-                "raft_remove_inside_corners":
-                {
-                    "label": "Remove Raft Inside Corners",
-                    "description": "Remove inside corners from the raft, causing the raft to become convex.",
-                    "type": "bool",
-                    "default_value": false,
-                    "resolve": "any(extruderValues('raft_remove_inside_corners'))",
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": false
-                },
-                "raft_base_wall_count":
-                {
-                    "label": "Raft Base Wall Count",
-                    "description": "The number of contours to print around the linear pattern in the base layer of the raft.",
-                    "type": "int",
-                    "default_value": 1,
-                    "enabled": "resolveOrValue('adhesion_type') == 'raft'",
-                    "resolve": "max(extruderValues('raft_base_wall_count'))",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": false
-                },
                 "group_outer_walls":
                 {
                     "label": "Group Outer Walls",
@@ -8329,7 +8481,7 @@
                 {
                     "label": "Flow Warning",
                     "description": "Limit on the flow warning for detection.",
-                    "default_value": "15.0",
+                    "default_value": 15.0,
                     "enabled": "ppr_enable",
                     "unit": "%",
                     "type": "float",
@@ -8339,7 +8491,7 @@
                 {
                     "label": "Flow Limit",
                     "description": "Limit on flow anomaly for detection.",
-                    "default_value": "25.0",
+                    "default_value": 25.0,
                     "enabled": "ppr_enable",
                     "unit": "%",
                     "type": "float",
@@ -8351,7 +8503,7 @@
                     "description": "Limit on Print temperature warning for detection.",
                     "unit": "\u00b0C",
                     "type": "float",
-                    "default_value": "3.0",
+                    "default_value": 3.0,
                     "enabled": "ppr_enable",
                     "settable_per_extruder": true
                 },
@@ -8361,7 +8513,7 @@
                     "description": "Limit on Print Temperature anomaly for detection.",
                     "unit": "\u00b0C",
                     "type": "float",
-                    "default_value": "7.0",
+                    "default_value": 7.0,
                     "enabled": "ppr_enable",
                     "settable_per_extruder": true
                 },
@@ -8371,7 +8523,7 @@
                     "description": "Limit on Build Volume Temperature warning for detection.",
                     "unit": "\u00b0C",
                     "type": "float",
-                    "default_value": "7.5",
+                    "default_value": 7.5,
                     "enabled": "ppr_enable",
                     "settable_per_extruder": false
                 },
@@ -8381,7 +8533,7 @@
                     "description": "Limit on Build Volume temperature Anomaly for detection.",
                     "unit": "\u00b0C",
                     "type": "float",
-                    "default_value": "10.0",
+                    "default_value": 10.0,
                     "enabled": "ppr_enable",
                     "settable_per_extruder": false
                 }

resources/definitions/flyingbear_base.def.json

@@ -92,7 +92,6 @@
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_line_width": { "value": "line_width - 0.1" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/fusion3_f410.def.json

@@ -112,7 +112,6 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 0 },
         "support_xy_distance": { "value": "wall_line_width_0 * 3" },

resources/definitions/kingroon_base.def.json

@@ -133,7 +133,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/koonovo_base.def.json

@@ -70,7 +70,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/koonovo_kn3.def.json

@@ -88,7 +88,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/koonovo_kn5.def.json

@@ -88,7 +88,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/longer_base.def.json

@@ -109,7 +109,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/mingda_base.def.json

@@ -119,7 +119,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/tank_m_base.def.json

@@ -70,7 +70,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/tronxy_x.def.json

@@ -111,7 +111,6 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
         "support_xy_distance": { "value": "wall_line_width_0 * 3" },

resources/definitions/two_trees_base.def.json

@@ -68,7 +68,6 @@
         "support_interface_density": { "value": 33.333 },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/definitions/ultimaker_method_base.def.json

@@ -99,7 +99,7 @@
         "acceleration_print":
         {
             "enabled": false,
-            "value": 300
+            "value": 800
         },
         "acceleration_print_layer_0":
         {
@@ -234,7 +234,7 @@
         "jerk_print":
         {
             "enabled": false,
-            "value": 12.5
+            "value": 6.25
         },
         "jerk_print_layer_0":
         {
@@ -279,7 +279,7 @@
         "jerk_travel":
         {
             "enabled": false,
-            "value": 12.5
+            "value": "jerk_print"
         },
         "jerk_travel_enabled":
         {
@@ -361,8 +361,10 @@
         "raft_interface_line_width": { "value": 0.7 },
         "raft_interface_speed": { "value": 90 },
         "raft_interface_thickness": { "value": 0.3 },
-        "raft_margin": { "value": 3 },
+        "raft_interface_wall_count": { "value": "raft_wall_count" },
+        "raft_margin": { "value": 1.2 },
         "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
+        "raft_surface_wall_count": { "value": "raft_wall_count" },
         "retraction_amount": { "value": 0.75 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": "speed_travel / 10" },

resources/definitions/vivedino_base.def.json

@@ -99,7 +99,6 @@
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
         "support_pattern": { "value": "'zigzag'" },
         "support_wall_count": { "value": 1 },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },

resources/extruders/ultimaker_methodx_extruder_left.def.json

@@ -14,8 +14,9 @@
             "default_value": 0,
             "maximum_value": "1"
         },
-        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
-        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
+        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
+        "machine_extruder_start_code_duration": { "default_value": 8 },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
         "machine_nozzle_size": { "default_value": 0.4 },

resources/extruders/ultimaker_methodx_extruder_right.def.json

@@ -14,8 +14,9 @@
             "default_value": 1,
             "maximum_value": "1"
         },
-        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
-        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
+        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
+        "machine_extruder_start_code_duration": { "default_value": 8 },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
         "machine_nozzle_size": { "default_value": 0.4 },

resources/extruders/ultimaker_methodxl_extruder_left.def.json

@@ -14,8 +14,9 @@
             "default_value": 0,
             "maximum_value": "1"
         },
-        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
-        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
+        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
+        "machine_extruder_start_code_duration": { "default_value": 10 },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
         "machine_nozzle_size": { "default_value": 0.4 },

resources/extruders/ultimaker_methodxl_extruder_right.def.json

@@ -14,8 +14,9 @@
             "default_value": 1,
             "maximum_value": "1"
         },
-        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
-        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
+        "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" },
+        "machine_extruder_start_code_duration": { "default_value": 10 },
         "machine_nozzle_offset_x": { "default_value": 0 },
         "machine_nozzle_offset_y": { "default_value": 0 },
         "machine_nozzle_size": { "default_value": 0.4 },

resources/i18n/fdmprinter.def.json.pot

@@ -3548,14 +3548,6 @@ msgctxt "support_bottom_height description"
 msgid "The thickness of the support floors. This controls the number of dense layers that are printed on top of places of a model on which support rests."
 msgstr ""
 
-msgctxt "support_interface_skip_height label"
-msgid "Support Interface Resolution"
-msgstr ""
-
-msgctxt "support_interface_skip_height description"
-msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
-msgstr ""
-
 msgctxt "support_interface_density label"
 msgid "Support Interface Density"
 msgstr ""

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.4
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/intent/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.4
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 20

resources/intent/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.6
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/intent/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.6
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg

@@ -12,9 +12,13 @@ type = intent
 variant = AA 0.4
 
 [values]
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 20
 jerk_print = 30
 speed_infill = =speed_print
-speed_print = 30
+speed_print = 35
+speed_roofing = =speed_topbottom
 speed_topbottom = =speed_print
 speed_wall = =speed_print
 speed_wall_0 = =speed_wall

resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg

@@ -12,6 +12,14 @@ type = intent
 variant = AA 0.4
 
 [values]
-speed_infill = 50
-top_bottom_thickness = 1.05
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
+acceleration_print = 2500
+acceleration_wall_0 = 1000
+inset_direction = inside_out
+jerk_wall_0 = 20
+speed_print = 50
+speed_roofing = =math.ceil(speed_wall*(35/50))
+speed_wall_0 = =math.ceil(speed_wall*(20/50))
+speed_wall_x = =math.ceil(speed_wall*(35/50))
+top_bottom_thickness = =max(1.2 , layer_height * 6)
 

resources/intent/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.4
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/intent/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.4
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 20

resources/intent/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.6
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/intent/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm_annealing.inst.cfg

@@ -15,7 +15,7 @@ variant = CC 0.6
 infill_sparse_density = 100
 jerk_print = 30
 material_shrinkage_percentage_xy = 100.3
-material_shrinkage_percentage_z = 102.0
+material_shrinkage_percentage_z = 100.9
 speed_infill = =speed_print
 speed_layer_0 = 20
 speed_print = 25

resources/qml/Actions.qml

@@ -120,8 +120,8 @@ Item
         text: catalog.i18nc("@action:inmenu menubar:edit", "&Undo")
         icon.name: "edit-undo"
         shortcut: StandardKey.Undo
-        onTriggered: UM.OperationStack.undo()
-        enabled: UM.OperationStack.canUndo
+        onTriggered: CuraActions.undo()
+        enabled: CuraActions.canUndo
     }
 
     Action
@@ -130,8 +130,8 @@ Item
         text: catalog.i18nc("@action:inmenu menubar:edit", "&Redo")
         icon.name: "edit-redo"
         shortcut: StandardKey.Redo
-        onTriggered: UM.OperationStack.redo()
-        enabled: UM.OperationStack.canRedo
+        onTriggered: CuraActions.redo()
+        enabled: CuraActions.canRedo
     }
 
     Action

resources/qml/Dialogs/AboutDialog.qml

@@ -58,7 +58,7 @@ UM.Dialog
         UM.Label
         {
             id: version
-            text: catalog.i18nc("@label","version: %1").arg(UM.Application.version)
+            text: catalog.i18nc("@label","version: %1").arg(CuraApplication.version())
             font: UM.Theme.getFont("large_bold")
             color: UM.Theme.getColor("button_text")
             anchors.right : logo.right

resources/qml/Preferences/GeneralPage.qml

@@ -124,6 +124,9 @@ UM.PreferencesPage
         UM.Preferences.resetPreference("info/send_engine_crash")
         sendEngineCrashCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_engine_crash"))
 
+        UM.Preferences.resetPreference("info/anonymous_engine_crash_report")
+        sendEngineCrashCheckboxAnonymous.checked = boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report"))
+
         UM.Preferences.resetPreference("info/automatic_update_check")
         checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
 
@@ -859,21 +862,63 @@ UM.PreferencesPage
                 font: UM.Theme.getFont("medium_bold")
                 text: catalog.i18nc("@label", "Privacy")
             }
+
             UM.TooltipArea
             {
                 width: childrenRect.width
                 height: visible ? childrenRect.height : 0
-                text: catalog.i18nc("@info:tooltip", "Should slicing crashes be automatically reported to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
+                text: catalog.i18nc("@info:tooltip", "Should slicing crashes be automatically reported to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored, unless you give explicit permission.")
 
                 UM.CheckBox
                 {
                     id: sendEngineCrashCheckbox
-                    text: catalog.i18nc("@option:check","Send (anonymous) engine crash reports")
+                    text: catalog.i18nc("@option:check","Send engine crash reports")
                     checked: boolCheck(UM.Preferences.getValue("info/send_engine_crash"))
                     onCheckedChanged: UM.Preferences.setValue("info/send_engine_crash", checked)
                 }
             }
 
+            ButtonGroup
+            {
+                id: curaCrashGroup
+                buttons: [sendEngineCrashCheckboxAnonymous, sendEngineCrashCheckboxUser]
+            }
+
+            UM.TooltipArea
+            {
+                width: childrenRect.width
+                height: visible ? childrenRect.height : 0
+                text: catalog.i18nc("@info:tooltip", "Send crash reports without any personally identifiable information or models data to UltiMaker.")
+                anchors.left: parent.left
+                anchors.leftMargin: UM.Theme.getSize("default_margin").width
+                Cura.RadioButton
+                {
+                    id: sendEngineCrashCheckboxAnonymous
+                    text: catalog.i18nc("@option:radio", "Anonymous crash reports")
+                    enabled: sendEngineCrashCheckbox.checked && Cura.API.account.isLoggedIn
+                    checked: boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report"))
+                    onClicked: UM.Preferences.setValue("info/anonymous_engine_crash_report", true)
+                }
+            }
+            UM.TooltipArea
+            {
+                width: childrenRect.width
+                height: visible ? childrenRect.height : 0
+                text: Cura.API.account.isLoggedIn ?
+                      catalog.i18nc("@info:tooltip", "Send crash reports with your registered UltiMaker account name and the project name to UltiMaker Sentry. No actual model data is being send.") :
+                      catalog.i18nc("@info:tooltip", "Please sign in to your UltiMaker account to allow sending non-anonymous data.")
+                anchors.left: parent.left
+                anchors.leftMargin: UM.Theme.getSize("default_margin").width
+                Cura.RadioButton
+                {
+                    id: sendEngineCrashCheckboxUser
+                    text: catalog.i18nc("@option:radio", "Include UltiMaker account name")
+                    enabled: sendEngineCrashCheckbox.checked && Cura.API.account.isLoggedIn
+                    checked: !boolCheck(UM.Preferences.getValue("info/anonymous_engine_crash_report")) && Cura.API.account.isLoggedIn
+                    onClicked: UM.Preferences.setValue("info/anonymous_engine_crash_report", false)
+                }
+            }
+
             UM.TooltipArea
             {
                 width: childrenRect.width

resources/qml/Preferences/MachinesPage.qml

@@ -12,6 +12,7 @@ import Cura 1.0 as Cura
 UM.ManagementPage
 {
     id: base
+    property var machineActionManager: CuraApplication.getMachineActionManagerQml()
     Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
 
     title: catalog.i18nc("@title:tab", "Printers")
@@ -58,10 +59,11 @@ UM.ManagementPage
         anchors.fill: parent
         spacing: UM.Theme.getSize("default_margin").height
 
+
         Repeater
         {
             id: machineActionRepeater
-            model: base.currentItem ? Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
+            model: base.currentItem ? machineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
 
             Item
             {

resources/qml/Preferences/SettingVisibilityPage.qml

@@ -123,7 +123,7 @@ UM.PreferencesPage
                 var idx = -1;
                 for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
                 {
-                    if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
+                    if(settingVisibilityPresetsModel.items[i].presetId === settingVisibilityPresetsModel.activePreset)
                     {
                         idx = i;
                         break;
@@ -159,7 +159,7 @@ UM.PreferencesPage
                 id: definitionsModel
                 containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
                 showAll: true
-                exclude: ["machine_settings", "command_line_settings"]
+                exclude: ["machine_settings", "command_line_settings", "ppr"]
                 showAncestors: true
                 expanded: ["*"]
                 visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
@@ -173,13 +173,13 @@ UM.PreferencesPage
                 id: loader
 
                 width: settingsListView.width - scrollBar.width
-                height: model.type != undefined ? UM.Theme.getSize("section").height : 0
+                height: model.type !== undefined ? UM.Theme.getSize("section").height : 0
 
                 property var definition: model
                 property var settingDefinitionsModel: definitionsModel
 
                 asynchronous: true
-                active: model.type != undefined
+                active: model.type !== undefined
                 sourceComponent:
                 {
                     switch (model.type)

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -160,7 +160,6 @@ Item
         ProfileWarningReset
         {
             id: profileWarningReset
-            width: childrenRect.width
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             fullWarning: false

resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml

@@ -187,7 +187,7 @@ Popup
                         //Add all the custom profiles.
                         Repeater
                         {
-                            model: Cura.CustomQualityProfilesDropDownMenuModel
+                            model: CuraApplication.getCustomQualityProfilesDropDownMenuModel()
                             MenuButton
                             {
                                 onClicked: Cura.MachineManager.setQualityChangesGroup(model.quality_changes_group)

resources/qml/PrintSetupSelector/ProfileWarningReset.qml

@@ -11,7 +11,7 @@ import "../Dialogs"
 Item
 {
     property bool fullWarning: true  // <- Can you see the warning icon and the text, or is it just the buttons?
-
+    property var simpleModeSettingsManager :CuraApplication.getSimpleModeSettingsManager()
     height: visible ? UM.Theme.getSize("action_button_icon").height : 0
     width: visible ? childrenRect.width: 0
     visible: Cura.MachineManager.hasUserSettings || (fullWarning && Cura.MachineManager.hasCustomQuality)
@@ -96,7 +96,7 @@ Item
             State
             {
                 name: "custom settings changed"
-                when: Cura.SimpleModeSettingsManager.isProfileCustomized
+                when: simpleModeSettingsManager.isProfileCustomized
                 PropertyChanges
                 {
                     target: warning

resources/qml/PrinterSelector/PrintSelectorCard.qml

@@ -79,7 +79,7 @@ Rectangle
                         anchors.verticalCenter: extruderIcon.verticalCenter
                         anchors.left: extruderIcon.right
                         anchors.leftMargin: UM.Theme.getSize("default_margin").width
-                        text: modelData.core
+                        text: modelData ? (modelData.core ? modelData.core : "" ) : ""
                         font: UM.Theme.getFont("default_bold")
                     }
 

resources/qml/Settings/SettingTextField.qml

@@ -223,7 +223,7 @@ SettingItem
 
                 cursorShape: Qt.IBeamCursor
 
-                onPressed: {
+                onPressed:(mouse)=> {
                     if (!input.activeFocus)
                     {
                         base.focusGainedByClick = true

resources/qml/Toolbar.qml

@@ -203,7 +203,7 @@ Item
             x: UM.Theme.getSize("default_margin").width
             y: UM.Theme.getSize("default_margin").height
 
-            source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""
+            source: UM.Controller.valid ? UM.Controller.activeToolPanel : ""
             enabled: UM.Controller.toolsEnabled
         }
     }
@@ -222,7 +222,7 @@ Item
         UM.Label
         {
             id: toolHint
-            text: UM.ActiveTool.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : ""
+            text: UM.Controller.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : ""
             color: UM.Theme.getColor("tooltip_text")
             anchors.horizontalCenter: parent.horizontalCenter
         }

resources/quality/beamup_l/beamup_l_coarse.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.60
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.30
 support_offset = 0.8
 support_z_distance = 0.4
 wall_thickness = 1.6

resources/quality/beamup_l/beamup_l_draft.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.60
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.20
 support_offset = 0.8
 support_z_distance = 0.3
 wall_thickness = 1.6

resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.30
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.06
 support_offset = 0.8
 support_z_distance = 0.12
 wall_thickness = 1.6

resources/quality/beamup_l/beamup_l_fine.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.30
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.10
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 1.6

resources/quality/beamup_l/beamup_l_normal.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.45
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.15
 support_offset = 0.8
 support_z_distance = 0.25
 wall_thickness = 1.6

resources/quality/beamup_s/beamup_s_coarse.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.60
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.30
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8

resources/quality/beamup_s/beamup_s_draft.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.40
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.20
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8

resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg

@@ -33,7 +33,6 @@ support_infill_rate = 20
 support_interface_enable = True
 support_interface_height = 0.30
 support_interface_pattern = zigzag
-support_interface_skip_height = 0.06
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8