Merge branch '2.6'

This commit is contained in:
Ghostkeeper 2017-06-16 15:54:59 +02:00
commit e16d88517d
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75

View file

@ -51,7 +51,7 @@ def register(app):
from UM.VersionUpgradeManager import VersionUpgradeManager
VersionUpgradeManager.getInstance().registerCurrentVersion(
("materials", XmlMaterialProfile.XmlMaterialProfile.Version * 1000000 + CuraApplication.SettingVersion),
(CuraApplication.ResourceTypes.MaterialInstanceContainer, "application/x-uranium-instancecontainer")
(CuraApplication.ResourceTypes.MaterialInstanceContainer, "application/x-ultimaker-material-profile")
)
return {"version_upgrade": upgrader,