From 02ff433c9238b79c5e132ab869cf7a8b34d9a831 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 22 Jul 2019 17:07:07 +0200 Subject: [PATCH 1/2] Use set for unordered collections of things Contributes to issue CURA-6672. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index f8cd2dda71..10a3a09c68 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1186,7 +1186,7 @@ class XmlMaterialProfile(InstanceContainer): def __str__(self): return "".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 = { From 14a1882e1418ed25cc7ef39c43992aaa422d3a90 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 23 Jul 2019 11:30:40 +0200 Subject: [PATCH 2/2] Add missing 4.1-4.2 upgrade to bundled package list --- resources/bundled_packages/cura.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 259ac05201..c45894e537 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -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" + } + } + }, "X3DReader": { "package_info": { "package_id": "X3DReader",