Merge branch 'master' of github.com:Ultimaker/Cura

.gitignore

@@ -53,6 +53,7 @@ plugins/GodMode
 plugins/OctoPrintPlugin
 plugins/ProfileFlattener
 plugins/SettingsGuide
+plugins/SettingsGuide2
 plugins/SVGToolpathReader
 plugins/X3GWriter
 

cura/CuraApplication.py

@@ -125,7 +125,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 = 14
+    SettingVersion = 15
 
     Created = False
 

plugins/ImageReader/ConfigUI.qml

@@ -43,7 +43,7 @@ UM.Dialog
                 TextField {
                     id: peak_height
                     objectName: "Peak_Height"
-                    validator: RegExpValidator {regExp: /^-?\d{1,3}([\,|\.]\d*)?$/}
+                    validator: RegExpValidator {regExp: /^\d{1,3}([\,|\.]\d*)?$/}
                     width: 180 * screenScaleFactor
                     onTextChanged: { manager.onPeakHeightChanged(text) }
                 }

plugins/ImageReader/ImageReader.py

@@ -50,7 +50,7 @@ class ImageReader(MeshReader):
         size = max(self._ui.getWidth(), self._ui.getDepth())
         return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher, self._ui.use_transparency_model, self._ui.transmittance_1mm)
 
-    def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher, use_transparency_model, transmittance_1mm):
+    def _generateSceneNode(self, file_name, xz_size, height_from_base, base_height, blur_iterations, max_size, lighter_is_higher, use_transparency_model, transmittance_1mm):
         scene_node = SceneNode()
 
         mesh = MeshBuilder()
@@ -68,8 +68,10 @@ class ImageReader(MeshReader):
         if img.width() < 2 or img.height() < 2:
             img = img.scaled(width, height, Qt.IgnoreAspectRatio)
 
+        height_from_base = max(height_from_base, 0)
         base_height = max(base_height, 0)
-        peak_height = max(peak_height, -base_height)
+        peak_height = base_height + height_from_base
+
 
         xz_size = max(xz_size, 1)
         scale_vector = Vector(xz_size, peak_height, xz_size)

plugins/ImageReader/ImageReaderUI.py

@@ -155,8 +155,10 @@ class ImageReaderUI(QObject):
         if len(value) > 0:
             try:
                 self.peak_height = float(value.replace(",", "."))
+                if self.peak_height < 0:
+                    self.peak_height = 2.5
             except ValueError:  # Can happen with incomplete numbers, such as "-".
-                self._width = 0
+                self.peak_height = 2.5  # restore default
         else:
             self.peak_height = 0
 

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -108,13 +108,12 @@ class PauseAtHeight(Script):
                     "type": "float",
                     "default_value": 3.3333
                 },
-                "redo_layers":
+                "redo_layer":
                 {
-                    "label": "Redo Layers",
+                    "label": "Redo Layer",
-                    "description": "Redo a number of previous layers after a pause to increases adhesion.",
+                    "description": "Redo the last layer before the pause, to get the filament flowing again after having oozed a bit during the pause.",
-                    "unit": "layers",
+                    "type": "bool",
-                    "type": "int",
+                    "default_value": false
-                    "default_value": 0
                 },
                 "standby_temperature":
                 {
@@ -160,7 +159,7 @@ class PauseAtHeight(Script):
         park_x = self.getSettingValueByKey("head_park_x")
         park_y = self.getSettingValueByKey("head_park_y")
         layers_started = False
-        redo_layers = self.getSettingValueByKey("redo_layers")
+        redo_layer = self.getSettingValueByKey("redo_layer")
         standby_temperature = self.getSettingValueByKey("standby_temperature")
         firmware_retract = Application.getInstance().getGlobalContainerStack().getProperty("machine_firmware_retract", "value")
         control_temperatures = Application.getInstance().getGlobalContainerStack().getProperty("machine_nozzle_temp_enabled", "value")
@@ -264,24 +263,23 @@ class PauseAtHeight(Script):
                     if current_e >= 0:
                         break
 
-                # include a number of previous layers
+                # Maybe redo the last layer.
-                for i in range(1, redo_layers + 1):
+                if redo_layer:
-                    prev_layer = data[index - i]
+                    prev_layer = data[index - 1]
                     layer = prev_layer + layer
 
                     # Get extruder's absolute position at the
-                    # beginning of the first layer redone
+                    # beginning of the redone layer.
                     # see https://github.com/nallath/PostProcessingPlugin/issues/55
-                    if i == redo_layers:
+                    # Get X and Y from the next layer (better position for
-                        # Get X and Y from the next layer (better position for
+                    # the nozzle)
-                        # the nozzle)
+                    x, y = self.getNextXY(layer)
-                        x, y = self.getNextXY(layer)
+                    prev_lines = prev_layer.split("\n")
-                        prev_lines = prev_layer.split("\n")
+                    for lin in prev_lines:
-                        for lin in prev_lines:
+                        new_e = self.getValue(lin, "E", current_e)
-                            new_e = self.getValue(lin, "E", current_e)
+                        if new_e != current_e:
-                            if new_e != current_e:
+                            current_e = new_e
-                                current_e = new_e
+                            break
-                                break
 
                 prepend_gcode = ";TYPE:CUSTOM\n"
                 prepend_gcode += ";added code by post processing\n"
@@ -364,8 +362,8 @@ class PauseAtHeight(Script):
 
                     prepend_gcode += self.putValue(M = 82) + " ; switch back to absolute E values\n"
 
-                    # reset extrude value to pre pause value
+                # reset extrude value to pre pause value
-                    prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
+                prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
 
                 layer = prepend_gcode + layer
 

plugins/Toolbox/src/CloudSync/CloudPackageChecker.py

@@ -75,8 +75,8 @@ class CloudPackageChecker(QObject):
             Logger.log("w", "Received invalid JSON for user subscribed packages from the Web Marketplace")
 
     def _handleCompatibilityData(self, subscribed_packages_payload: List[Dict[str, Any]]) -> None:
-        user_subscribed_packages = [plugin["package_id"] for plugin in subscribed_packages_payload]
+        user_subscribed_packages = {plugin["package_id"] for plugin in subscribed_packages_payload}
-        user_installed_packages = self._package_manager.getUserInstalledPackages()
+        user_installed_packages = self._package_manager.getAllInstalledPackageIDs()
 
         # We need to re-evaluate the dismissed packages
         # (i.e. some package might got updated to the correct SDK version in the meantime,

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os
@@ -367,11 +367,18 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         self._sendCommand("M84")
 
     def _sendNextGcodeLine(self):
-        if self._gcode_position >= len(self._gcode):
+        """
+        Send the next line of g-code, at the current `_gcode_position`, via a
+        serial port to the printer.
+
+        If the print is done, this sets `_is_printing` to `False` as well.
+        """
+        try:
+            line = self._gcode[self._gcode_position]
+        except IndexError:  # End of print, or print got cancelled.
             self._printers[0].updateActivePrintJob(None)
             self._is_printing = False
             return
-        line = self._gcode[self._gcode_position]
 
         if ";" in line:
             line = line[:line.find(";")]
@@ -401,7 +408,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
         if print_job is None:
             controller = GenericOutputController(self)
             controller.setCanUpdateFirmware(True)
-            print_job = PrintJobOutputModel(output_controller=controller, name=CuraApplication.getInstance().getPrintInformation().jobName)
+            print_job = PrintJobOutputModel(output_controller = controller, name = CuraApplication.getInstance().getPrintInformation().jobName)
             print_job.updateState("printing")
             self._printers[0].updateActivePrintJob(print_job)
 

plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py

@@ -0,0 +1,104 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# 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
+
+class VersionUpgrade462to47(VersionUpgrade):
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades preferences to have the new version number.
+        :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"] = "15"
+
+        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 have the new version number.
+
+        This changes the maximum deviation setting if that setting was present
+        in the profile.
+        :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"] = "15"
+
+        if "values" in parser:
+            # Maximum Deviation's effect was corrected. Previously the deviation
+            # ended up being only half of what the user had entered. This was
+            # fixed in Cura 4.7 so there we need to halve the deviation that the
+            # user had entered.
+            #
+            # This got accidentally merged in Cura 4.6.0. In 4.6.2 we removed
+            # that. In 4.7 it's not unmerged, so there we need to revert all
+            # that again.
+            if "meshfix_maximum_deviation" in parser["values"]:
+                maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
+                if maximum_deviation.startswith("="):
+                    maximum_deviation = maximum_deviation[1:]
+                maximum_deviation = "=(" + maximum_deviation + ") / 2"
+                parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
+
+        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"] = "15"
+
+        # Update Pause at Height script parameters if present.
+        if "post_processing_scripts" in parser["metadata"]:
+            new_scripts_entries = []
+            for script_str in parser["metadata"]["post_processing_scripts"].split("\n"):
+                if not script_str:
+                    continue
+                script_str = script_str.replace(r"\\\n", "\n").replace(r"\\\\", "\\\\")  # Unescape escape sequences.
+                script_parser = configparser.ConfigParser(interpolation=None)
+                script_parser.optionxform = str  # type: ignore  # Don't transform the setting keys as they are case-sensitive.
+                script_parser.read_string(script_str)
+                if "PauseAtHeight" in script_parser:
+                    if "redo_layers" in script_parser["PauseAtHeight"]:
+                        script_parser["PauseAtHeight"]["redo_layer"] = str(int(script_parser["PauseAtHeight"]["redo_layers"]) > 0)
+                        del script_parser["PauseAtHeight"]["redo_layers"]  # Has been renamed to without the S.
+                script_io = io.StringIO()
+                script_parser.write(script_io)
+                script_str = script_io.getvalue()
+                script_str = script_str.replace("\\\\", r"\\\\").replace("\n", r"\\\n")  # Escape newlines because configparser sees those as section delimiters.
+                new_scripts_entries.append(script_str)
+            parser["metadata"]["post_processing_scripts"] = "\n".join(new_scripts_entries)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade462to47/__init__.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade462to47
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade462to47.VersionUpgrade462to47()
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000014):        ("preferences", 6000015,        upgrade.upgradePreferences),
+            ("machine_stack", 4000014):      ("machine_stack", 4000015,      upgrade.upgradeStack),
+            ("extruder_train", 4000014):     ("extruder_train", 4000015,     upgrade.upgradeStack),
+            ("definition_changes", 4000014): ("definition_changes", 4000015, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000014):    ("quality_changes", 4000015,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000014):            ("quality", 4000015,            upgrade.upgradeInstanceContainer),
+            ("user", 4000014):               ("user", 4000015,               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/VersionUpgrade462to47/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 4.6.2 to 4.7",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.",
+    "api": "7.2.0",
+    "i18n-catalog": "cura"
+}

resources/definitions/fdmextruder.def.json

@@ -6,7 +6,7 @@
         "type": "extruder",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 14,
+        "setting_version": 15,
         "visible": false,
         "position": "0"
     },

resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 14,
+        "setting_version": 15,
         "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,
@@ -5983,7 +5983,7 @@
                     "description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true.",
                     "type": "float",
                     "unit": "mm",
-                    "default_value": 0.05,
+                    "default_value": 0.025,
                     "minimum_value": "0.001",
                     "minimum_value_warning": "0.01",
                     "maximum_value_warning": "0.3",

resources/definitions/hms434.def.json

@@ -17,12 +17,13 @@
  "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
  "fiberlogy_hd_pla",
  "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
- "generic_abs", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175",  "generic_pla_175",  "generic_pva_175", "generic_tpu_175",
+ "generic_abs", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175",    "generic_pva_175", "generic_tpu_175",
  "imade3d_petg_175", "imade3d_pla_175",
  "innofill_innoflex60_175",
  "leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural",
  "octofiber_pla",
  "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
+ "redd_abs", "redd_asa", "redd_hips", "redd_nylon", "redd_petg", "redd_pla", "redd_tpe",
  "verbatim_bvoh_175",
  "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU",
  "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva",
@@ -34,7 +35,7 @@
         "preferred_variant_name": "0.4mm TP extruder",
 
         "has_machine_quality":    true,
-        "preferred_quality_type": "normal",
+        "preferred_quality_type": "high",
 
         "machine_extruder_trains":
         {
@@ -172,7 +173,7 @@
 
         "meshfix_maximum_resolution":       {"value": 0.01 },
         "meshfix_maximum_travel_resolution":{"value": 0.1 },
-        "meshfix_maximum_deviation":        {"value": 0.01 },
+        "meshfix_maximum_deviation":        {"value": 0.005 },
 
         "minimum_polygon_circumference":    {"value": 0.05 },
         "coasting_enable":                  {"value": false},

resources/definitions/peopoly_moai.def.json

@@ -171,7 +171,7 @@
             "value": "0.1"
         },
         "meshfix_maximum_deviation": {
-            "value": "0.003"
+            "value": "0.002"
         },
         "skin_outline_count": {
             "value": 0

resources/definitions/skriware_2.def.json

@@ -591,7 +591,7 @@
             "value": "0.2"
         },
         "meshfix_maximum_deviation": {
-            "default_value": 0.005
+            "default_value": 0.003
         },
         "jerk_roofing": {
             "value": "10"

resources/definitions/tronxy_d01.def.json

@@ -0,0 +1,37 @@
+{
+    "name": "Tronxy D01",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy D01" },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 220 },
+        "machine_height": { "default_value": 220 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-32, 45],
+                [-32, -30],
+                [32, -30],
+                [32, 45]
+            ]
+        },
+        "gantry_height": { "value": 30 },
+
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" },
+
+        "machine_max_feedrate_x": { "value": 150 },
+        "machine_max_feedrate_y": { "value": 150 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 },
+        "machine_max_acceleration_x": { "value": 150 },
+        "machine_max_acceleration_y": { "value": 150 },
+        "machine_max_acceleration_z": { "value": 150 },
+        "machine_max_acceleration_e": { "value": 150 },
+        "machine_acceleration": { "value": 120 }
+    }
+}

resources/definitions/tronxy_x.def.json

@@ -0,0 +1,166 @@
+{
+    "name": "Tronxy Base Printer",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": false,
+        "author": "AdderMk2",
+        "manufacturer": "Tronxy",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": ["MachineSettingsAction"],
+
+        "machine_extruder_trains": {
+            "0": "tronxy_base_extruder_0"
+        },
+
+        "has_materials": true,
+        "has_variants": true,
+        "has_machine_quality": true,
+        "variants_name": "Nozzle Size",
+
+        "preferred_variant_name": "0.4mm Nozzle",
+        "preferred_quality_type": "normal",
+        "preferred_material": "generic_pla"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy Base Printer" },
+        "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel}\nG0 E3 F200\nG92 E0\n" },
+        "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" },
+
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_feedrate_e": { "value": 50 },
+
+        "machine_max_acceleration_x": { "value": 120 },
+        "machine_max_acceleration_y": { "value": 120 },
+        "machine_max_acceleration_z": { "value": 120 },
+        "machine_max_acceleration_e": { "value": 120 },
+        "machine_acceleration": { "value": 100 },
+
+        "machine_max_jerk_xy": { "value": 20 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_max_jerk_e": { "value": 5 },
+
+        "machine_heated_bed": { "default_value": true },
+
+        "material_diameter": { "default_value": 1.75 },
+
+        "acceleration_print": { "value": "machine_acceleration" },
+        "acceleration_travel": { "value": "machine_acceleration" },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+
+        "jerk_print": { "value": 20 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+
+        "acceleration_enabled": { "value": false },
+        "jerk_enabled": { "value": false },
+
+        "speed_print": { "value": 60.0 } ,
+        "speed_infill": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print / 1.33" },
+        "speed_wall_0": { "value": "speed_wall" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_topbottom": { "value": "speed_print / 1.5" },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" },
+        "speed_layer_0": { "value": 30.0 },
+        "speed_print_layer_0": { "value": "speed_layer_0" },
+        "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_z_hop": { "value": 5 },
+
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+
+        "line_width": { "value": "machine_nozzle_size" },
+
+        "optimize_wall_printing_order": { "value": "True" },
+
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow": { "value": 100 },
+        "travel_compensate_overlapping_walls_0_enabled": { "value": "False" },
+
+        "z_seam_type": { "value": "'back'" },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        
+        "infill_sparse_density": { "value": "20" },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "skin_overlap": { "value": 10.0 },
+        "infill_wipe_dist": { "value": 0.0 },
+        "wall_0_wipe_dist": { "value": 0.0 },
+
+        "fill_perimeter_gaps": { "value": "'everywhere'" },
+        "fill_outline_gaps": { "value": false },
+        "filter_out_tiny_gaps": { "value": false },
+
+        "retraction_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e",
+            "maximum_value": 200
+        },
+        "retraction_retract_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e",
+            "maximum_value": 200
+        },
+        "retraction_prime_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e",
+            "maximum_value": 200
+        },
+        
+        "retraction_hop_enabled": { "value": "False" },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        
+        "retraction_enable": { "value": true },
+        "retraction_count_max": { "value": 100 },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_min_travel": { "value": 1.5 },
+
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_fan_enabled": { "value": true },
+        "cool_min_layer_time": { "value": 10 },
+
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "skirt_gap": { "value": 10.0 },
+        "skirt_line_count": { "value": 3 },
+
+        "adaptive_layer_height_variation": { "value": 0.04 },
+        "adaptive_layer_height_variation_step": { "value": 0.04 },
+
+        "meshfix_maximum_resolution": { "value": "0.05" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
+
+        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_infill_rate": { "value": "0 if support_tree_enable else 20" },
+        "support_use_towers": { "value": false },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_wall_count": { "value": 1 },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 4 },
+
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "minimum_support_area": { "value": 2 },
+        "minimum_interface_area": { "value": 10 },
+        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
+        "wall_thickness": {"value": "line_width * 2" }
+    }
+}

resources/definitions/tronxy_x5sa.def.json

@@ -0,0 +1,28 @@
+{
+    "name": "Tronxy X5SA/X5ST/Pro",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy X5SA" },
+        "machine_width": { "default_value": 330 },
+        "machine_depth": { "default_value": 330 },
+        "machine_height": { "default_value": 400 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-48, 45],
+                [-48, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 40 },
+
+        "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }
+    }
+}

resources/definitions/tronxy_x5sa_400.def.json

@@ -0,0 +1,33 @@
+{
+    "name": "Tronxy X5SA/X5ST/Pro 400",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy X5SA 400" },
+        "machine_width": { "default_value": 400 },
+        "machine_depth": { "default_value": 400 },
+        "machine_height": { "default_value": 400 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-48, 45],
+                [-48, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 40 },
+
+        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"},
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" },
+
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 }
+    }
+}

resources/definitions/tronxy_x5sa_500.def.json

@@ -0,0 +1,33 @@
+{
+    "name": "Tronxy X5SA/X5ST/Pro 500",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy X5SA 500" },
+        "machine_width": { "default_value": 500 },
+        "machine_depth": { "default_value": 500 },
+        "machine_height": { "default_value": 600 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-48, 45],
+                [-48, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 40 },
+
+        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n "},
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" },
+
+        "machine_max_feedrate_x": { "value": 150 },
+        "machine_max_feedrate_y": { "value": 150 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 }
+    }
+}

resources/definitions/tronxy_xy2.def.json

@@ -0,0 +1,38 @@
+{
+    "name": "Tronxy XY-2",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy XY-2" },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 220 },
+        "machine_height": { "default_value": 260 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-30, 45],
+                [-30, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 40 },
+
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
+
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 },
+        "machine_max_acceleration_x": { "value": 150 },
+        "machine_max_acceleration_y": { "value": 150 },
+        "machine_max_acceleration_z": { "value": 150 },
+        "machine_max_acceleration_e": { "value": 150 },
+        "machine_acceleration": { "value": 80 }
+    }
+}

resources/definitions/tronxy_xy2pro.def.json

@@ -0,0 +1,43 @@
+{
+    "name": "Tronxy XY-2 Pro",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy XY-2 Pro" },
+        "machine_width": { "default_value": 255 },
+        "machine_depth": { "default_value": 255 },
+        "machine_height": { "default_value": 260 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-48, 45],
+                [-48, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 40 },
+
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
+
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 },
+
+        "machine_max_acceleration_x": { "value": 120 },
+        "machine_max_acceleration_y": { "value": 120 },
+        "machine_max_acceleration_z": { "value": 120 },
+        "machine_max_acceleration_e": { "value": 120 },
+        "machine_acceleration": { "value": 150 },
+
+        "machine_max_jerk_xy": { "value": 20 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_max_jerk_e": { "value": 5 }
+    }
+}

resources/definitions/tronxy_xy3.def.json

@@ -0,0 +1,38 @@
+{
+    "name": "Tronxy XY-3",
+    "version": 2,
+    "inherits": "tronxy_x",
+    "metadata": {
+        "quality_definition": "tronxy_x",
+        "visible": true,
+        "author": "AdderMk2",
+        "platform": "tronxy.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Tronxy XY-3" },
+        "machine_width": { "default_value": 310 },
+        "machine_depth": { "default_value": 310 },
+        "machine_height": { "default_value": 330 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-30, 45],
+                [-30, -30],
+                [27, -30],
+                [27, 45]
+            ]
+        },
+        "gantry_height": { "value": 30 },
+
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
+
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 20 },
+        "machine_max_feedrate_e": { "value": 120 },
+        "machine_max_acceleration_x": { "value": 150 },
+        "machine_max_acceleration_y": { "value": 150 },
+        "machine_max_acceleration_z": { "value": 150 },
+        "machine_max_acceleration_e": { "value": 150 },
+        "machine_acceleration": { "value": 80 }
+    }
+}

resources/definitions/ultimaker_s3.def.json

@@ -155,7 +155,7 @@
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "default_value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },

resources/definitions/ultimaker_s5.def.json

@@ -157,7 +157,7 @@
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "default_value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },

resources/extruders/hms434_tool_1.def.json

@@ -19,7 +19,7 @@
           "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
         },
         "machine_extruder_end_code": {
-           "default_value": "\nG1 X10 Y120 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n"
+           "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n"
         }
     }
 }

resources/extruders/hms434_tool_2.def.json

@@ -19,7 +19,7 @@
           "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
         },
         "machine_extruder_end_code": {
-           "default_value": "\nG1 X10 Y120 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"
+           "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"
         }
     }
 }

resources/extruders/tronxy_base_extruder_0.def.json

@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "tronxy_x",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+        
+    }
+}

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s3
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = draft

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = fast

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = fast
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = high
 intent_category = visual

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = normal

resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = ultimaker_s5
 
 [metadata]
-setting_version = 14
+setting_version = 15
 type = intent
 quality_type = normal
 intent_category = visual

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q010
 intent_category = visual

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = q015

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q015
 intent_category = visual

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = q020

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q020

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q020
 intent_category = visual

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q025

resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q030

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q010
 intent_category = visual

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = q015

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q015
 intent_category = visual

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = q020

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q020

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q020
 intent_category = visual

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q025

resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg

@@ -4,7 +4,7 @@ name = Quick
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = quick
 quality_type = q030

resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q010
 intent_category = visual

resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Accurate
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 intent_category = engineering
 quality_type = q015

resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg

@@ -4,7 +4,7 @@ name = Visual
 definition = uni_base
 
 [metadata]
-setting_version = 13
+setting_version = 15
 type = intent
 quality_type = q015
 intent_category = visual