Merge branch 'CURA-7683_VersionUpgrader_for_libArachne_5.0' into libArachne_rebased

cura/CuraApplication.py

@@ -127,7 +127,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 = 16
+    SettingVersion = 18
 
     Created = False
 

plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py

@@ -0,0 +1,98 @@
+# 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
+
+_removed_settings = {
+    "travel_compensate_overlapping_walls_enabled",
+    "travel_compensate_overlapping_walls_0_enabled",
+    "travel_compensate_overlapping_walls_x_enabled"
+}
+
+
+class VersionUpgrade49to50(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"] = "18"
+
+        # Remove deleted settings from the visible settings list.
+        if "general" in parser and "visible_settings" in parser["general"]:
+            visible_settings = set(parser["general"]["visible_settings"].split(";"))
+            for removed in _removed_settings:
+                if removed in visible_settings:
+                    visible_settings.remove(removed)
+            parser["general"]["visible_settings"] = ";".join(visible_settings)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades instance containers to remove the settings that were removed in this version.
+        It also changes the instance containers to have the new version number.
+
+        This removes any settings that were removed in the new Cura version and updates settings that need to be updated
+        with a new value.
+
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "18"
+
+        if "values" in parser:
+            # Remove deleted settings from the instance containers.
+            for removed in _removed_settings:
+                if removed in parser["values"]:
+                    del parser["values"][removed]
+
+            # Disable Fuzzy Skin as it doesn't work with with the libArachne walls
+            if "magic_fuzzy_skin_enabled" in parser["values"]:
+                parser["values"]["magic_fuzzy_skin_enabled"] = "False"
+
+        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"] = "18"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py

@@ -0,0 +1,67 @@
+# 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 VersionUpgrade49to50
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade49to50.VersionUpgrade49to50()
+
+def getMetaData() -> Dict[str, Any]:
+    return {  # Since there is no VersionUpgrade from 48 to 49 yet, upgrade the 48 profiles to 50.
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000016):        ("preferences", 6000018,        upgrade.upgradePreferences),
+            ("machine_stack", 4000016):      ("machine_stack", 4000018,      upgrade.upgradeStack),
+            ("extruder_train", 4000016):     ("extruder_train", 4000018,     upgrade.upgradeStack),
+            ("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000016):    ("quality_changes", 4000018,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000016):            ("quality", 4000018,            upgrade.upgradeInstanceContainer),
+            ("user", 4000016):               ("user", 4000018,               upgrade.upgradeInstanceContainer),
+
+            ("preferences", 6000016):        ("preferences", 6000018,        upgrade.upgradePreferences),
+            ("machine_stack", 4000016):      ("machine_stack", 4000018,      upgrade.upgradeStack),
+            ("extruder_train", 4000016):     ("extruder_train", 4000018,     upgrade.upgradeStack),
+            ("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000016):    ("quality_changes", 4000018,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000016):            ("quality", 4000018,            upgrade.upgradeInstanceContainer),
+            ("user", 4000016):               ("user", 4000018,               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/VersionUpgrade49to50/plugin.json

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

resources/definitions/blv_mgn_cube_300.def.json

@@ -4,7 +4,7 @@
   "inherits": "blv_mgn_cube_base",
   "metadata": {
     "visible": true,
-    "setting_version": 16,
+    "setting_version": 18,
     "author": "wolfgangmauer",
     "manufacturer": "BLV",
     "file_formats": "text/x-gcode",

resources/definitions/blv_mgn_cube_350.def.json

@@ -4,7 +4,7 @@
   "inherits": "blv_mgn_cube_base",
   "metadata": {
     "visible": true,
-    "setting_version": 16,
+    "setting_version": 18,
     "author": "wolfgangmauer",
     "manufacturer": "BLV",
     "file_formats": "text/x-gcode",

resources/definitions/fdmextruder.def.json

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

resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 16,
+        "setting_version": 18,
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,

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

@@ -4,7 +4,7 @@ name = Quick
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = quick
 quality_type = draft

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = fast
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = high
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = normal
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Quick
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = quick
 quality_type = draft

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = fast
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = high
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = normal
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Quick
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = quick
 quality_type = draft

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = fast

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = fast
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = high
 intent_category = visual

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

@@ -4,7 +4,7 @@ name = Accurate
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 intent_category = engineering
 quality_type = normal

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

@@ -4,7 +4,7 @@ name = Visual
 definition = liquid
 
 [metadata]
-setting_version = 16
+setting_version = 18
 type = intent
 quality_type = normal
 intent_category = visual

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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 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 = 16
+setting_version = 18
 type = intent
 intent_category = quick
 quality_type = q030