Merge remote-tracking branch 'origin/main' into zyyx_profile_addition

# Conflicts:
#	resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg

cura/CuraApplication.py

@@ -139,7 +139,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 23
+    SettingVersion = 24
 
     Created = False
 

cura/Machines/MachineNode.py

@@ -48,6 +48,7 @@ class MachineNode(ContainerNode):
         self.preferred_variant_name = my_metadata.get("preferred_variant_name", "")
         self.preferred_material = my_metadata.get("preferred_material", "")
         self.preferred_quality_type = my_metadata.get("preferred_quality_type", "")
+        self.supports_abstract_color = parseBool(my_metadata.get("supports_abstract_color", "false"))
 
         self._loadAll()
 

cura/Machines/VariantNode.py

@@ -63,6 +63,8 @@ class VariantNode(ContainerNode):
         filtered_materials = [material for material in materials if not self.machine.isExcludedMaterialBaseFile(material["id"])]
 
         for material in filtered_materials:
+            if material.get("abstract_color", False) and not self.machine.supports_abstract_color:
+                continue  # do not show abstract color profiles if the machine does not support them
             base_file = material["base_file"]
             if base_file not in self.materials:
                 self.materials[base_file] = MaterialNode(material["id"], variant = self)
@@ -126,6 +128,8 @@ class VariantNode(ContainerNode):
             return  # We won't add any materials.
         material_definition = container.getMetaDataEntry("definition")
 
+        if (not self.machine.supports_abstract_color) and container.getMetaDataEntry("abstract_color", False):
+            return
         base_file = container.getMetaDataEntry("base_file")
         if self.machine.isExcludedMaterialBaseFile(base_file):
             return  # Material is forbidden for this printer.

plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py

@@ -1,65 +1,217 @@
 # Copyright (c) 2020 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
 # Created by Wayne Porter
+# Re-write in April of 2024 by GregValiant (Greg Foresi)
+# Changes:
+#     Added an 'Enable' setting
+#     Added support for multi-line insertions (comma delimited)
+#     Added insertions in a range of layers or a single insertion at a layer.  Numbers are consistent with the Cura Preview (base1)
+#     Added frequency of Insertion (once only, every layer, every 2nd, 3rd, 5th, 10th, 25th, 50th, 100th)
+#     Added support for 'One at a Time' print sequence
+#     Rafts are allowed and accounted for but no insertions are made in raft layers
 
 from ..Script import Script
+import re
+from UM.Application import Application
 
 class InsertAtLayerChange(Script):
-    def __init__(self):
-        super().__init__()
 
     def getSettingDataString(self):
         return """{
-            "name": "Insert at layer change",
+            "name": "Insert at Layer Change",
             "key": "InsertAtLayerChange",
             "metadata": {},
             "version": 2,
             "settings":
             {
-                "insert_location":
+                "enabled":
                 {
-                    "label": "When to insert",
+                    "label": "Enable this script",
-                    "description": "Whether to insert code before or after layer change.",
+                    "description": "You must enable the script for it to run.",
+                    "type": "bool",
+                    "default_value": true,
+                    "enabled": true
+                },
+                "insert_frequency":
+                {
+                    "label": "How often to insert",
+                    "description": "Every so many layers starting with the Start Layer OR as single insertion at a specific layer.  If the print sequence is 'one_at_a_time' then the insertions will be made for every model.  Insertions are made at the beginning of a layer.",
                     "type": "enum",
-                    "options": {"before": "Before", "after": "After"},
+                    "options": {
-                    "default_value": "before"
+                        "once_only": "One insertion only",
+                        "every_layer": "Every Layer",
+                        "every_2nd": "Every 2nd",
+                        "every_3rd": "Every 3rd",
+                        "every_5th": "Every 5th",
+                        "every_10th": "Every 10th",
+                        "every_25th": "Every 25th",
+                        "every_50th": "Every 50th",
+                        "every_100th": "Every 100th"},
+                    "default_value": "every_layer",
+                    "enabled": "enabled"
+                },
+                "start_layer":
+                {
+                    "label": "Starting Layer",
+                    "description": "The layer before which the first insertion will take place.  If the Print_Sequence is 'All at Once' then use the layer numbers from the Cura Preview.  Enter '1' to start at gcode LAYER:0. In 'One at a Time' mode use the layer numbers from the first model that prints AND all models will receive the same insertions.  NOTE: There is never an insertion for raft layers.",
+                    "type": "int",
+                    "default_value": 1,
+                    "minimum_value": 1,
+                    "enabled": "insert_frequency != 'once_only' and enabled"
+                },
+                "end_layer":
+                {
+                    "label": "Ending Layer",
+                    "description": "The layer before which the last insertion will take place.  Enter '-1' to indicate the entire file.  Use layer numbers from the Cura Preview.",
+                    "type": "int",
+                    "default_value": -1,
+                    "minimum_value": -1,
+                    "enabled": "insert_frequency != 'once_only' and enabled"
+                },
+                "single_end_layer":
+                {
+                    "label": "Layer # for Single Insertion.",
+                    "description": "The layer before which the Gcode insertion will take place.  Use the layer numbers from the Cura Preview.",
+                    "type": "str",
+                    "default_value": "",
+                    "enabled": "insert_frequency == 'once_only' and enabled"
                 },
                 "gcode_to_add":
                 {
-                    "label": "G-code to insert",
+                    "label": "G-code to insert.",
-                    "description": "G-code to add before or after layer change.",
+                    "description": "G-code to add at start of the layer. Use a comma to delimit multi-line commands. EX: G28 X Y,M220 S100,M117 HELL0.  NOTE:  All inserted text will be converted to upper-case as some firmwares don't understand lower-case.",
                     "type": "str",
-                    "default_value": ""
+                    "default_value": "",
-                },
+                    "enabled": "enabled"
-                "skip_layers":
-                {
-                    "label": "Skip layers",
-                    "description": "Number of layers to skip between insertions (0 for every layer).",
-                    "type": "int",
-                    "default_value": 0,
-                    "minimum_value": 0
                 }
             }
         }"""
 
     def execute(self, data):
-        gcode_to_add = self.getSettingValueByKey("gcode_to_add") + "\n"
+        # Exit if the script is not enabled
-        skip_layers = self.getSettingValueByKey("skip_layers")
+        if not bool(self.getSettingValueByKey("enabled")):
-        count = 0
+            return data
-        for layer in data:
+        #Initialize variables
-            # Check that a layer is being printed
+        mycode = self.getSettingValueByKey("gcode_to_add").upper()
-            lines = layer.split("\n")
+        start_layer = int(self.getSettingValueByKey("start_layer"))
-            for line in lines:
+        end_layer = int(self.getSettingValueByKey("end_layer"))
-                if ";LAYER:" in line:
+        when_to_insert = self.getSettingValueByKey("insert_frequency")
-                    index = data.index(layer)
+        end_list = [0]
-                    if count == 0:
+        print_sequence = Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value")
-                        if self.getSettingValueByKey("insert_location") == "before":
+        # Get the topmost layer number and adjust the end_list
-                            layer = gcode_to_add + layer
+        if end_layer == -1:
-                        else:
+            if print_sequence == "all_at_once":
-                            layer = layer + gcode_to_add
+                for lnum in range(0, len(data) - 1):
-
+                    if ";LAYER:" in data[lnum]:
-                        data[index] = layer
+                        the_top = int(data[lnum].split(";LAYER:")[1].split("\n")[0])
-
+                end_list[0] = the_top
-                    count = (count + 1) % (skip_layers + 1)
+            # Get the topmost layer number for each model and append it to the end_list
-                    break
+            if print_sequence == "one_at_a_time":
+                for lnum in range(0, 10):
+                    if ";LAYER:0" in data[lnum]:
+                        start_at = lnum + 1
+                        break
+                for lnum in range(start_at, len(data)-1, 1):
+                    if ";LAYER:" in data[lnum] and not ";LAYER:0" in data[lnum] and not ";LAYER:-" in data[lnum]:
+                        end_list[len(end_list) - 1] = int(data[lnum].split(";LAYER:")[1].split("\n")[0])
+                        continue
+                    if ";LAYER:0" in data[lnum]:
+                        end_list.append(0)
+        elif end_layer != -1:
+            if print_sequence == "all_at_once":
+                # Catch an error if the entered End_Layer > the top layer in the gcode
+                for e_num, layer in enumerate(data):
+                    if ";LAYER:" in layer:
+                        top_layer = int(data[e_num].split(";LAYER:")[1].split("\n")[0])
+                end_list[0] = end_layer - 1
+                if top_layer < end_layer - 1:
+                    end_list[0] = top_layer
+            elif print_sequence == "one_at_a_time":
+                # Find the index of the first Layer:0
+                for lnum in range(0, 10):
+                    if ";LAYER:0" in data[lnum]:
+                        start_at = lnum + 1
+                        break
+                # Get the top layer number for each model
+                for lnum in range(start_at, len(data)-1):
+                    if ";LAYER:" in data[lnum] and not ";LAYER:0" in data[lnum] and not ";LAYER:-" in data[lnum]:
+                        end_list[len(end_list) - 1] = int(data[lnum].split(";LAYER:")[1].split("\n")[0])
+                    if ";LAYER:0" in data[lnum]:
+                        end_list.append(0)
+                # Adjust the end list if an end layer was named
+                for index, num in enumerate(end_list):
+                    if num > end_layer - 1:
+                        end_list[index] = end_layer - 1
+        #If the gcode_to_enter is multi-line then replace the commas with newline characters
+        if mycode != "":
+            if "," in mycode:
+                mycode = re.sub(",", "\n",mycode)
+            gcode_to_add = mycode
+        #Get the insertion frequency
+        match when_to_insert:
+            case "every_layer":
+                freq = 1
+            case "every_2nd":
+                freq = 2
+            case "every_3rd":
+                freq = 3
+            case "every_5th":
+                freq = 5
+            case "every_10th":
+                freq = 10
+            case "every_25th":
+                freq = 25
+            case "every_50th":
+                freq = 50
+            case "every_100th":
+                freq = 100
+            case "once_only":
+                the_insert_layer = int(self.getSettingValueByKey("single_end_layer"))-1
+            case _:
+                raise ValueError(f"Unexpected insertion frequency {when_to_insert}")
+        #Single insertion
+        if when_to_insert == "once_only":
+            # For print sequence 'All at once'
+            if print_sequence == "all_at_once":
+                for index, layer in enumerate(data):
+                    if ";LAYER:" + str(the_insert_layer) + "\n" in layer:
+                        lines = layer.split("\n")
+                        lines.insert(1,gcode_to_add)
+                        data[index] = "\n".join(lines)
+                        return data
+            # For print sequence 'One at a time'
+            else:
+                for index, layer in enumerate(data):
+                    if ";LAYER:" + str(the_insert_layer) + "\n" in layer:
+                        lines = layer.split("\n")
+                        lines.insert(1,gcode_to_add)
+                        data[index] = "\n".join(lines)
+                return data
+        # For multiple insertions
+        if when_to_insert != "once_only":
+            # Search from the line after the first Layer:0 so we know when a model ends if in One at a Time mode.
+            first_0 = True
+            next_layer = start_layer - 1
+            end_layer = end_list.pop(0)
+            for index, layer in enumerate(data):
+                lines = layer.split("\n")
+                for l_index, line in enumerate(lines):
+                    if ";LAYER:" in line:
+                        layer_number = int(line.split(":")[1])
+                        if layer_number == next_layer and layer_number <= end_layer:
+                            lines.insert(l_index + 1,gcode_to_add)
+                            data[index] = "\n".join(lines)
+                            next_layer += freq
+                        # Reset the next_layer for one-at-a-time
+                        if next_layer > int(end_layer):
+                            next_layer = start_layer - 1
+                        # Index to the next end_layer when a Layer:0 is encountered
+                        try:
+                            if not first_0 and layer_number == 0:
+                                end_layer = end_list.pop(0)
+                        except:
+                            pass
+                        # Beyond the initial Layer:0 futher Layer:0's indicate the top layer of a model.
+                        if layer_number == 0:
+                            first_0 = False
+                        break
         return data

plugins/VersionUpgrade/VersionUpgrade58to59/VersionUpgrade58to59.py

@@ -0,0 +1,103 @@
+# Copyright (c) 2024 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+from typing import Dict, List, Tuple
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+# Just to be sure, since in my testing there were both 0.1.0 and 0.2.0 settings about.
+_PLUGIN_NAME = "_plugin__curaenginegradualflow"
+_FROM_PLUGINS_SETTINGS = {
+    "gradual_flow_enabled",
+    "max_flow_acceleration",
+    "layer_0_max_flow_acceleration",
+    "gradual_flow_discretisation_step_size",
+    "reset_flow_duration",
+}  # type: Set[str]
+
+_NEW_SETTING_VERSION = "24"
+
+
+class VersionUpgrade58to59(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
+
+        # Fix renamed settings for visibility
+        if "visible_settings" in parser["general"]:
+            all_setting_keys = parser["general"]["visible_settings"].strip().split(";")
+            if all_setting_keys:
+                for idx, key in enumerate(all_setting_keys):
+                    if key.startswith(_PLUGIN_NAME):
+                        all_setting_keys[idx] = key.split("__")[-1]
+                parser["general"]["visible_settings"] = ";".join(all_setting_keys)
+
+        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
+
+        # Rename settings.
+        if "values" in parser:
+            for key, value in parser["values"].items():
+                if key.startswith(_PLUGIN_NAME):
+                    parser["values"][key.split("__")[-1]] = parser["values"][key]
+                    del parser["values"][key]
+
+        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/VersionUpgrade58to59/__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 VersionUpgrade58to59
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade58to59.VersionUpgrade58to59()
+
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 7000023):        ("preferences", 7000024,        upgrade.upgradePreferences),
+            ("machine_stack", 6000023):      ("machine_stack", 6000024,      upgrade.upgradeStack),
+            ("extruder_train", 6000023):     ("extruder_train", 6000024,     upgrade.upgradeStack),
+            ("definition_changes", 4000023): ("definition_changes", 4000024, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000023):    ("quality_changes", 4000024,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000023):            ("quality", 4000024,            upgrade.upgradeInstanceContainer),
+            ("user", 4000023):               ("user", 4000024,               upgrade.upgradeInstanceContainer),
+            ("intent", 4000023):             ("intent", 4000024,             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/VersionUpgrade58to59/plugin.json

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

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -918,9 +918,6 @@ class XmlMaterialProfile(InstanceContainer):
         base_metadata["properties"] = property_values
         base_metadata["definition"] = "fdmprinter"
 
-        # Certain materials are loaded but should not be visible / selectable to the user.
-        base_metadata["visible"] = not base_metadata.get("abstract_color", False)
-
         compatible_entries = data.iterfind("./um:settings/um:setting[@key='hardware compatible']", cls.__namespaces)
         try:
             common_compatibility = cls._parseCompatibleValue(next(compatible_entries).text) # type: ignore

resources/definitions/fdmprinter.def.json

@@ -16,7 +16,8 @@
         "preferred_quality_type": "normal",
         "machine_extruder_trains": { "0": "fdmextruder" },
         "supports_usb_connection": true,
-        "supports_network_connection": false
+        "supports_network_connection": false,
+        "supports_abstract_color": false
     },
     "settings":
     {

resources/definitions/ultimaker_factor4.def.json

@@ -39,6 +39,7 @@
         "preferred_quality_type": "draft",
         "preferred_variant_name": "AA 0.4",
         "supported_actions": [ "DiscoverUM3Action" ],
+        "supports_abstract_color": true,
         "supports_material_export": true,
         "supports_network_connection": true,
         "supports_usb_connection": false,

resources/definitions/ultimaker_s5.def.json

@@ -48,6 +48,7 @@
         "preferred_variant_buildplate_name": "Glass",
         "preferred_variant_name": "AA 0.4",
         "supported_actions": [ "DiscoverUM3Action" ],
+        "supports_abstract_color": true,
         "supports_material_export": true,
         "supports_network_connection": true,
         "supports_usb_connection": false,

resources/definitions/ultimaker_s7.def.json

@@ -36,6 +36,7 @@
         "preferred_variant_name": "AA 0.4",
         "quality_definition": "ultimaker_s5",
         "supported_actions": [ "DiscoverUM3Action" ],
+        "supports_abstract_color": true,
         "supports_material_export": true,
         "supports_network_connection": true,
         "supports_usb_connection": false,

resources/definitions/ultimaker_sketch.def.json

@@ -0,0 +1,186 @@
+{
+    "version": 2,
+    "name": "MakerBot Sketch",
+    "inherits": "ultimaker",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker B.V.",
+        "file_formats": "application/x-makerbot-sketch",
+        "platform": "ultimaker_sketch_platform.obj",
+        "exclude_materials": [
+            "dsm_",
+            "Essentium_",
+            "imade3d_",
+            "chromatik_",
+            "3D-Fuel_",
+            "bestfilament_",
+            "emotiontech_",
+            "eryone_",
+            "eSUN_",
+            "Extrudr_",
+            "fabtotum_",
+            "fdplast_",
+            "filo3d_",
+            "ultimaker_rapidrinse_175",
+            "goofoo_",
+            "ideagen3D_",
+            "imade3d_",
+            "innofill_",
+            "layer_one_",
+            "leapfrog_",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "redd_",
+            "tizyx_",
+            "verbatim_",
+            "Vertex_",
+            "volumic_",
+            "xyzprinting_",
+            "zyyx_pro_",
+            "octofiber_",
+            "fiberlogy_",
+            "generic_",
+            "ultimaker_asa",
+            "ultimaker_abs",
+            "ultimaker_nylon",
+            "ultimaker_rapidrinse",
+            "ultimaker_sr30",
+            "ultimaker_petg",
+            "ultimaker_pva",
+            "ultimaker_metallic_pla"
+        ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" },
+        "preferred_quality_type": "draft",
+        "preferred_variant_name": "0.4mm",
+        "reference_machine_id": "sketch",
+        "supports_network_connection": true,
+        "supports_usb_connection": false,
+        "variants_name": "Extruder",
+        "weight": -1
+    },
+    "overrides":
+    {
+        "acceleration_enabled":
+        {
+            "enabled": false,
+            "value": false
+        },
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_width": { "value": "3" },
+        "cool_during_extruder_switch":
+        {
+            "enabled": false,
+            "value": false
+        },
+        "cool_fan_full_at_height": { "value": "layer_height + layer_height_0" },
+        "cool_fan_speed": { "value": 100 },
+        "cool_fan_speed_0": { "value": 0 },
+        "cool_min_layer_time": { "value": 8 },
+        "extruder_prime_pos_abs": { "default_value": true },
+        "fill_outline_gaps": { "value": false },
+        "gantry_height": { "value": "60" },
+        "infill_angles": { "value": "[45,45,45,45,45,135,135,135,135,135]" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 0 },
+        "infill_pattern": { "value": "'zigzag'" },
+        "infill_sparse_density": { "value": 20 },
+        "infill_wipe_dist": { "value": 0 },
+        "initial_layer_line_width_factor": { "value": 125 },
+        "inset_direction": { "value": "'inside_out'" },
+        "jerk_enabled":
+        {
+            "enabled": false,
+            "value": false
+        },
+        "layer_height_0": { "value": "layer_height * 1.25" },
+        "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
+        "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 150 },
+        "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Griffin" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 150 },
+        "machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_y": { "default_value": 300 },
+        "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_min_cool_heat_time_window": { "value": "15" },
+        "machine_name": { "default_value": "MakerBot Sketch" },
+        "machine_nozzle_cool_down_speed": { "default_value": 0.8 },
+        "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
+        "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" },
+        "machine_width": { "default_value": 150 },
+        "material_diameter": { "default_value": 1.75 },
+        "material_flow": { "default_value": 100 },
+        "min_bead_width":
+        {
+            "minimum_value": "line_width * 0.5",
+            "minimum_value_warning": "line_width * 0.75",
+            "value": "line_width"
+        },
+        "min_wall_line_width":
+        {
+            "minimum_value": "line_width * 0.5",
+            "minimum_value_warning": "line_width * 0.75",
+            "value": "line_width"
+        },
+        "multiple_mesh_overlap": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "prime_blob_enable":
+        {
+            "default_value": true,
+            "enabled": true,
+            "value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
+        },
+        "raft_margin": { "value": "5" },
+        "retract_at_layer_change": { "value": true },
+        "retraction_amount":
+        {
+            "maximum_value": 6,
+            "maximum_value_warning": 5.75,
+            "value": 5.5
+        },
+        "retraction_combing": { "value": "'no_outer_surfaces'" },
+        "retraction_min_travel": { "value": "2 * line_width" },
+        "retraction_prime_speed": { "value": "15" },
+        "retraction_speed": { "value": "25" },
+        "roofing_material_flow": { "value": 100 },
+        "skin_material_flow": { "value": 95 },
+        "skin_material_flow_layer_0": { "value": 100 },
+        "skirt_brim_line_width": { "value": 1 },
+        "skirt_brim_speed": { "value": 15 },
+        "skirt_height": { "value": 3 },
+        "speed_print": { "value": 50 },
+        "speed_roofing": { "value": "0.8 * speed_print" },
+        "speed_support": { "value": "0.7 * speed_print" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "speed_roofing" },
+        "speed_travel": { "value": 80 },
+        "speed_wall": { "value": "0.5 * speed_print" },
+        "speed_wall_0": { "value": "1 * speed_wall" },
+        "speed_wall_x": { "value": "1 * speed_wall" },
+        "speed_z_hop": { "value": 10 },
+        "support_angle": { "value": "45" },
+        "support_structure": { "value": "'tree'" },
+        "top_bottom_thickness": { "value": "4 * layer_height" },
+        "travel_avoid_distance": { "value": "machine_nozzle_tip_outer_diameter / 2 * 1.5" },
+        "travel_avoid_supports": { "value": true },
+        "wall_0_inset": { "value": "0" },
+        "wall_0_material_flow_layer_0": { "value": "1 * material_flow" },
+        "wall_thickness": { "value": "2 * machine_nozzle_size" },
+        "wall_x_material_flow": { "value": "0.95 * material_flow" },
+        "wall_x_material_flow_layer_0": { "value": "1 * material_flow" },
+        "xy_offset": { "value": 0 },
+        "xy_offset_layer_0": { "value": 0 },
+        "z_seam_corner": { "value": "'z_seam_corner_any'" },
+        "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
+    }
+}

resources/definitions/ultimaker_sketch_large.def.json

@@ -0,0 +1,40 @@
+{
+    "version": 2,
+    "name": "MakerBot Sketch Large",
+    "inherits": "ultimaker_sketch",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker B.V.",
+        "file_formats": "application/x-makerbot-sketch",
+        "platform": "ultimaker_sketch_large_platform.obj",
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "ultimaker_sketch_large_extruder" },
+        "preferred_material": "ultimaker_pla_175",
+        "preferred_quality_type": "draft",
+        "preferred_variant_name": "0.4mm",
+        "reference_machine_id": "sketch_large",
+        "supports_network_connection": true,
+        "supports_usb_connection": false,
+        "variants_name": "Extruder",
+        "weight": -1
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 250 },
+        "machine_name": { "default_value": "MakerBot Sketch Large" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount":
+        {
+            "maximum_value": 6.5,
+            "maximum_value_warning": 6.25,
+            "value": 6
+        },
+        "retraction_prime_speed": { "value": "retraction_speed * 0.8" },
+        "speed_travel": { "value": 150 }
+    }
+}

resources/extruders/ultimaker_sketch_extruder.def.json

@@ -0,0 +1,22 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "ultimaker_sketch",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/ultimaker_sketch_large_extruder.def.json

@@ -0,0 +1,22 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "ultimaker_sketch_large",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_abs
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_abs
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_abs
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_abs
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = DBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = D020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = D030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = FBE 0.40mm
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_005
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = Elegoo_layer_015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = Elegoo_layer_010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = Elegoo_layer_020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg

@@ -8,7 +8,7 @@ intent_category = quick
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_005
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg

@@ -8,7 +8,7 @@ intent_category = engineering
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_015
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg

@@ -8,7 +8,7 @@ intent_category = engineering
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = Elegoo_layer_010
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_engineering.inst.cfg

@@ -8,7 +8,7 @@ intent_category = engineering
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg

@@ -8,7 +8,7 @@ intent_category = quick
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_020
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg

@@ -8,7 +8,7 @@ intent_category = quick
 is_experimental = True
 material = generic_pla
 quality_type = Elegoo_layer_030
-setting_version = 23
+setting_version = 24
 type = intent
 variant = 0.40mm_Elegoo_Nozzle
 

resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_abs
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_abs
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_abs
 quality_type = high
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_abs
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_cpe
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_cpe
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_nylon
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_nylon
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pc
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pc
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_petg
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_petg
 quality_type = high
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_petg
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_pla
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = fast
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = high
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pla
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = VO 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.25_petg_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_petg
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.25
 

resources/intent/ultimaker_factor4/um_f4_aa0.25_pla_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_pla
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.25
 

resources/intent/ultimaker_factor4/um_f4_aa0.25_tough-pla_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_tough_pla
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.25
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_abs
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_cpe_plus
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_cpe
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_annealing.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = annealing
 material = generic_nylon
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_nylon
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_pc
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.1mm_visual.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = visual
 material = generic_petg
 quality_type = normal
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_engineering.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = engineering
 material = generic_petg
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm_quick.inst.cfg

@@ -8,7 +8,7 @@ intent_category = quick
 is_experimental = True
 material = generic_petg
 quality_type = draft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4
 

resources/intent/ultimaker_factor4/um_f4_aa0.4_petg_0.3mm_quick.inst.cfg

@@ -7,7 +7,7 @@ version = 4
 intent_category = quick
 material = generic_petg
 quality_type = verydraft
-setting_version = 23
+setting_version = 24
 type = intent
 variant = AA 0.4