Merge branch '3.3'

This commit is contained in:
Ghostkeeper 2018-03-29 16:57:55 +02:00
commit d244a37feb
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
3 changed files with 28 additions and 1 deletions

View file

@ -209,6 +209,7 @@ class CuraApplication(QtApplication):
("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"),
("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"),
("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"),
("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"),
}
)