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

cura/CuraApplication.py

@@ -268,7 +268,7 @@ class CuraApplication(QtApplication):
             ContainerRegistry.getInstance().load()
 
         # set the setting version for Preferences
-        Preferences.getInstance().setSettingVersion(CuraApplication.SettingVersion)
+        Preferences.getInstance().addPreference("metadata/setting_version", CuraApplication.SettingVersion)
 
         Preferences.getInstance().addPreference("cura/active_mode", "simple")
 

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -12,9 +12,8 @@ from UM.Util import parseBool
 from cura.CuraApplication import CuraApplication
 
 import UM.Dictionary
-from UM.Settings.InstanceContainer import InstanceContainer, InvalidInstanceError
+from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.ContainerRegistry import ContainerRegistry
-from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 
 
 ##  Handles serializing and deserializing material containers from an XML file
@@ -37,11 +36,7 @@ class XmlMaterialProfile(InstanceContainer):
     #   \return The corresponding setting_version.
     def xmlVersionToSettingVersion(self, xml_version: str) -> int:
         if xml_version == "1.3":
-            return 2  # FIXME & HACK: This is temporary hack. The setting_version has been increased in CuraApplication,
-                      # but we haven't decided on how to determine the versions of an XMLMaterialProfile yet.
-                      # This MUST be fixed after the decision has been made.
-        if xml_version == "1.3":
-            return 1
+            return 2
         return 0 #Older than 1.3.
 
     def getInheritedFiles(self):

plugins/XmlMaterialProfile/XmlMaterialUpgrader.py

@@ -21,11 +21,7 @@ class XmlMaterialUpgrader(VersionUpgrade):
 
     def _xmlVersionToSettingVersion(self, xml_version: str) -> int:
         if xml_version == "1.3":
-            return 2  # FIXME & HACK: This is temporary hack. The setting_version has been increased in CuraApplication,
-                      # but we haven't decided on how to determine the versions of an XMLMaterialProfile yet.
-                      # This MUST be fixed after the decision has been made.
-        if xml_version == "1.3":
-            return 1
+            return 2
         return 0 #Older than 1.3.
 
     def upgradeMaterial(self, serialised, filename):

plugins/XmlMaterialProfile/__init__.py

@@ -19,9 +19,7 @@ def getMetaData():
             "mimetype": "application/x-ultimaker-material-profile"
         },
         "version_upgrade": {
-            ("materials", 1000000): ("materials", 1000001, upgrader.upgradeMaterial),
-            # FIXME: This needs to be changed once we have decided on how to determine the versions
-            ("materials", 1000001): ("materials", 1000002, upgrader.upgradeMaterial),
+            ("materials", 1000000): ("materials", 1000002, upgrader.upgradeMaterial),
         },
         "sources": {
             "materials": {