3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Jaime van Kessel 2019-07-23 11:33:52 +02:00
commit 9cdf18525c
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -1186,7 +1186,7 @@ class XmlMaterialProfile(InstanceContainer):
def __str__(self):
return "<XmlMaterialProfile '{my_id}' ('{name}') from base file '{base_file}'>".format(my_id = self.getId(), name = self.getName(), base_file = self.getMetaDataEntry("base_file"))
_metadata_tags_that_have_cura_namespace = ["pva_compatible", "breakaway_compatible"]
_metadata_tags_that_have_cura_namespace = {"pva_compatible", "breakaway_compatible"}
# Map XML file setting names to internal names
__material_settings_setting_map = {

17
resources/bundled_packages/cura.json
View file

@ -764,6 +764,23 @@
}
}
},
"VersionUpgrade41to42": {
"package_info": {
"package_id": "VersionUpgrade41to42",
"package_type": "plugin",
"display_name": "Version Upgrade 4.1 to 4.2",
"description": "Upgrades configurations from Cura 4.1 to Cura 4.2.",
"package_version": "1.0.0",
"sdk_version": "6.0.0",
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"VersionUpgrade42to43": {
"package_info": {
"package_id": "VersionUpgrade42to43",