From 3db85b2493eb5b402875ed94225784f4e72c18f7 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 6 Nov 2018 13:48:15 +0100 Subject: [PATCH 1/5] Try to strip extra curaproject extensions CURA-5896 --- cura/PrintInformation.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 0d6418d388..86c90e03d3 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -374,6 +374,11 @@ class PrintInformation(QObject): if self._base_name.endswith(OLD_CURA_PROJECT_EXT): self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_EXT)] + # CURA-5896 Try to strip extra extensions with an infinite amount of ".curaproject.3mf". + OLD_CURA_PROJECT_3MF_EXT = ".curaproject.3mf" + while self._base_name.endswith(OLD_CURA_PROJECT_3MF_EXT): + self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_3MF_EXT)] + self._updateJobName() @pyqtProperty(str, fset = setBaseName, notify = baseNameChanged) From ef3bb044f4b09fe5ab7702d9aff5e82e35145f6e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 6 Nov 2018 15:31:51 +0100 Subject: [PATCH 2/5] Rename CC Red 0.6 to CC 0.6 --- .../ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg | 2 +- .../ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 2 +- resources/variants/ultimaker_s5_cc06.inst.cfg | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index 104c385aa3..99b4b142fa 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = draft weight = -3 material = generic_cffcpe -variant = CC Red 0.6 +variant = CC 0.6 [values] adhesion_type = skirt diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index 14cb93e53b..80c383aa8d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = draft weight = -3 material = generic_cffpa -variant = CC Red 0.6 +variant = CC 0.6 [values] adhesion_type = skirt diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index 30c4ea8f51..c94d239c81 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = draft weight = -3 material = generic_gffcpe -variant = CC Red 0.6 +variant = CC 0.6 [values] adhesion_type = brim diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 5a0640c858..e7d4d1955b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = draft weight = -3 material = generic_gffpa -variant = CC Red 0.6 +variant = CC 0.6 [values] adhesion_type = brim diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 21e2dd0661..9045c36fbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = draft weight = -3 material = generic_pla -variant = CC Red 0.6 +variant = CC 0.6 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 1c54089058..8e747bb06f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -9,7 +9,7 @@ type = quality quality_type = fast weight = -2 material = generic_pla -variant = CC Red 0.6 +variant = CC 0.6 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index dd888eff6f..d41d08118a 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -1,5 +1,5 @@ [general] -name = CC Red 0.6 +name = CC 0.6 version = 4 definition = ultimaker_s5 @@ -11,7 +11,7 @@ hardware_type = nozzle [values] brim_width = 7 machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = CC Red 0.6 +machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 material_print_temperature = =default_material_print_temperature + 10 raft_acceleration = =acceleration_print From 94924783b688c908cf9664d7ae6168f2c89f6a5c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Nov 2018 17:16:29 +0100 Subject: [PATCH 3/5] Defensive coding: Old file-extensions may have been saved as all-caps. [CURA-5896] --- cura/PrintInformation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 86c90e03d3..e11f70a54c 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -371,12 +371,12 @@ class PrintInformation(QObject): # Strip the old "curaproject" extension from the name OLD_CURA_PROJECT_EXT = ".curaproject" - if self._base_name.endswith(OLD_CURA_PROJECT_EXT): + if self._base_name.lower().endswith(OLD_CURA_PROJECT_EXT): self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_EXT)] # CURA-5896 Try to strip extra extensions with an infinite amount of ".curaproject.3mf". OLD_CURA_PROJECT_3MF_EXT = ".curaproject.3mf" - while self._base_name.endswith(OLD_CURA_PROJECT_3MF_EXT): + while self._base_name.lower().endswith(OLD_CURA_PROJECT_3MF_EXT): self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_3MF_EXT)] self._updateJobName() From 982123a04e105a532a24fc5591bc5a349bd0963f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 7 Nov 2018 10:31:29 +0100 Subject: [PATCH 4/5] Update bundled package versions for materials using CC 0.6 --- resources/bundled_packages/cura.json | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 8ec0c3d29d..fceee75539 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -753,7 +753,7 @@ "package_type": "material", "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -771,7 +771,7 @@ "package_type": "material", "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -789,7 +789,7 @@ "package_type": "material", "display_name": "Generic CFF CPE", "description": "The generic CFF CPE profile which other profiles can be based upon.", - "package_version": "1.0.0", + "package_version": "1.1.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -807,7 +807,7 @@ "package_type": "material", "display_name": "Generic CFF PA", "description": "The generic CFF PA profile which other profiles can be based upon.", - "package_version": "1.0.0", + "package_version": "1.1.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -825,7 +825,7 @@ "package_type": "material", "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -843,7 +843,7 @@ "package_type": "material", "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -861,7 +861,7 @@ "package_type": "material", "display_name": "Generic GFF CPE", "description": "The generic GFF CPE profile which other profiles can be based upon.", - "package_version": "1.0.0", + "package_version": "1.1.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -879,7 +879,7 @@ "package_type": "material", "display_name": "Generic GFF PA", "description": "The generic GFF PA profile which other profiles can be based upon.", - "package_version": "1.0.0", + "package_version": "1.1.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -915,7 +915,7 @@ "package_type": "material", "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -933,7 +933,7 @@ "package_type": "material", "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -969,7 +969,7 @@ "package_type": "material", "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -987,7 +987,7 @@ "package_type": "material", "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -1005,7 +1005,7 @@ "package_type": "material", "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -1041,7 +1041,7 @@ "package_type": "material", "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { @@ -1297,7 +1297,7 @@ "package_type": "material", "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { @@ -1316,7 +1316,7 @@ "package_type": "material", "display_name": "Ultimaker Breakaway", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/breakaway", "author": { @@ -1335,7 +1335,7 @@ "package_type": "material", "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { @@ -1354,7 +1354,7 @@ "package_type": "material", "display_name": "Ultimaker CPE+", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/cpe", "author": { @@ -1373,7 +1373,7 @@ "package_type": "material", "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { @@ -1392,7 +1392,7 @@ "package_type": "material", "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/pc", "author": { @@ -1411,7 +1411,7 @@ "package_type": "material", "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { @@ -1430,7 +1430,7 @@ "package_type": "material", "display_name": "Ultimaker PP", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/pp", "author": { @@ -1449,7 +1449,7 @@ "package_type": "material", "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { @@ -1468,7 +1468,7 @@ "package_type": "material", "display_name": "Ultimaker TPU 95A", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.1.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { From 2c28e931ea5cb66ce123bc1ce590957ecc499000 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 7 Nov 2018 11:06:40 +0100 Subject: [PATCH 5/5] Rename CC Red 0.6 to CC 0.6 in the Changelog. Contributes to CURA-5900. --- plugins/ChangeLogPlugin/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index 266442473c..7e5cf2dd3b 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -11,8 +11,8 @@ It is now possible to specify the cooling fan to use if your printer has multipl *Settings refactor The CuraEngine has been refactored to create a more testable, future-proof way of storing and representing settings. This makes slicing faster, and future development easier. -*Print core CC Red 0.6 -The new print core CC Red 0.6 is selectable when the Ultimaker S5 profile is active. This print core is optimized for use with abrasive materials and composites. +*Print core CC 0.6 +The new print core CC 0.6 is selectable when the Ultimaker S5 profile is active. This print core is optimized for use with abrasive materials and composites. *File name and layer display Added M117 commands to GCODE to give real-time information about the print job file name and layer number shown on the printer’s display when printing via USB. Contributed by adecastilho.