From 8da1c6b40c040c5a5db74d7ad3d09187e85333df Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:00:08 +0100 Subject: [PATCH 1/5] Updated changelog from Stable Update changelog to reflect changes --- resources/texts/change_log.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 50aee251e8..129e9d93ac 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -2,23 +2,35 @@ * New features and improvements: - Introduced the MethodX and MethodXL printers with their materials and the option to write to .makerbot -- Prime tower base settings increase the stability of large prime towers; You can tune the Size, Height, and Slope to increase your prime tower sturdiness -- Introduced the setting for Raft Line Spacing, but for the primetower +- Prime tower base settings increase the stability of large prime towers; You can tune the Size, Height, and Slope to increase your prime tower's sturdiness +- Introduced the setting for Raft Line Spacing, but for the prime tower - The Start and End gcodes now accept variables, and math including those variables - Updated the Support Z Distance to allow for more different values, no longer only multiple layerheights * Bug fixes: - Fixed a crash for some linux users when trying to open the file menu +* Bugs resolved since the Beta Release +- Introduced Balanced and Solid profiles for 1C cores to UltiMaker Method X and Method XL +- Improved self-support for UltiMaker MethodX and MethodXL printers so the second extruder will not be used +- The prime tower is now always enabled when the second extruder is used for the MethodX and MethodXL printers +- Updated the default prime tower position so it doesn't prevent slicing for some printers +- The raft was affected by non-uniform scaling in Z only +- Slice information attributes were not available through start-end code formulas +- Resolved an issue with 100% support roof for tree support, contributed by @ThomasRahm + * Printer definitions, profiles and materials: +- Updated bridge flows for UltiMaker PLA, TPLA and ABS to address pillowing in AA 0.8 for UltiMaker printers - Introduced Ender 3 V3 SE, contributed by @dim1triy * Community translations: - Updated Spanish translation for Lightning infill, contributed by @Pelochus +- Updated German translation for Laying object flat on buildplate, contributed by @gluetolf +- Updated Brazilian translations, contributed by @Patola -* Known Issue -- The predicted printing time for dual extrusion printjobs on the Method are deviating from the actual printing time. Printjobs will take longer than predicted for now. - +* Known Issues +- The predicted printing time for dual extrusion printjobs on the Method X and Method XL are deviating from the actual printing time +- It’s not possible yet, to use Method series printers with Digital Factory. We hope to resolve this for the next release. [5.5] From 02655cde2ec4a48a29a55a73841af08335a5a26b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 27 Nov 2023 17:28:24 +0100 Subject: [PATCH 2/5] Add tool tip + icon + description for solid intent CURA-11394 --- cura/Machines/Models/IntentCategoryModel.py | 5 +++++ cura/Machines/Models/IntentSelectionModel.py | 5 +++-- cura/Machines/Models/IntentTranslations.py | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index e9b94d4233..cf08c53e74 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -61,6 +61,11 @@ class IntentCategoryModel(ListModel): "The annealing profile requires post-processing in an oven after the print is finished. This profile retains the dimensional accuracy of the printed part after annealing and improves strength, stiffness, and thermal resistance.") } + cls._translations["solid"] = { + "name": catalog.i18nc("@label", "Solid"), + "description": catalog.i18nc("@text", + "A highly dense and strong part but at a slower print time. Great for functional parts.") + } return cls._translations def __init__(self, intent_category: str) -> None: diff --git a/cura/Machines/Models/IntentSelectionModel.py b/cura/Machines/Models/IntentSelectionModel.py index 3df94e4ad8..80176f823e 100644 --- a/cura/Machines/Models/IntentSelectionModel.py +++ b/cura/Machines/Models/IntentSelectionModel.py @@ -57,8 +57,9 @@ class IntentSelectionModel(ListModel): self._onChange() - _default_intent_categories = ["default", "visual", "engineering", "quick", "annealing"] - _icons = {"default": "GearCheck", "visual": "Visual", "engineering": "Nut", "quick": "SpeedOMeter", "annealing": "Anneal"} + _default_intent_categories = ["default", "visual", "engineering", "quick", "annealing", "solid"] + _icons = {"default": "GearCheck", "visual": "Visual", "engineering": "Nut", "quick": "SpeedOMeter", + "annealing": "Anneal", "solid": "Hammer"} def _onContainerChange(self, container: ContainerInterface) -> None: """Updates the list of intents if an intent profile was added or removed.""" diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index 43fe771d67..25c2bfab76 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -24,3 +24,8 @@ intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } +intent_translations["quick"] = { + "name": catalog.i18nc("@label", "Solid"), + "description": catalog.i18nc("@text", + "A highly dense and strong part but at a slower print time. Great for functional parts.") +} From 6cca53430494dd8b8e728649c1d5f29fc79c0f63 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 28 Nov 2023 10:34:08 +0100 Subject: [PATCH 3/5] Fix previous commit CURA-11394 --- cura/Machines/Models/IntentTranslations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index 25c2bfab76..3a2afcb7c5 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -24,7 +24,7 @@ intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } -intent_translations["quick"] = { +intent_translations["solid"] = { "name": catalog.i18nc("@label", "Solid"), "description": catalog.i18nc("@text", "A highly dense and strong part but at a slower print time. Great for functional parts.") From 3e725448d9885a249d1ef2b35d64fea69498c253 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:36:45 +0100 Subject: [PATCH 4/5] Apply suggestions from code review Based on codereview Co-authored-by: Casper Lamboo --- resources/texts/change_log.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 129e9d93ac..de95562b6e 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -12,11 +12,11 @@ * Bugs resolved since the Beta Release - Introduced Balanced and Solid profiles for 1C cores to UltiMaker Method X and Method XL -- Improved self-support for UltiMaker MethodX and MethodXL printers so the second extruder will not be used +- Improved self-support for UltiMaker MethodX and MethodXL printers so the support extruder will not be used - The prime tower is now always enabled when the second extruder is used for the MethodX and MethodXL printers - Updated the default prime tower position so it doesn't prevent slicing for some printers -- The raft was affected by non-uniform scaling in Z only -- Slice information attributes were not available through start-end code formulas +- Fixed an issue where raft layers were partially printed +- Slice information template variables were not available through start-end code formulas - Resolved an issue with 100% support roof for tree support, contributed by @ThomasRahm * Printer definitions, profiles and materials: From 5b6e9d1005888e29190170c4b870a7db1eeef579 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 28 Nov 2023 11:57:11 +0100 Subject: [PATCH 5/5] Pin the release versions Contributes to CURA-11385 --- conanfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8a182354ec..af6c0fccf1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -50,7 +50,7 @@ class CuraConan(ConanFile): def set_version(self): if not self.version: - self.version = "5.6.0-beta.2" + self.version = "5.6.0" @property def _i18n_options(self): @@ -323,18 +323,18 @@ class CuraConan(ConanFile): self.requires("zlib/1.2.13") self.requires("pyarcus/5.3.0") self.requires("dulcificum/0.1.0-beta.1") # TODO update pin for stable - self.requires("curaengine/(latest)@ultimaker/stable") + self.requires("curaengine/5.6.0") self.requires("pysavitar/5.3.0") self.requires("pynest2d/5.3.0") self.requires("curaengine_plugin_gradual_flow/0.1.0") - self.requires("uranium/(latest)@ultimaker/stable") - self.requires("cura_binary_data/(latest)@ultimaker/stable") + self.requires("uranium/5.6.0") + self.requires("cura_binary_data/5.6.0") self.requires("cpython/3.10.4") if self.options.internal: self.requires("cura_private_data/(latest)@internal/testing") self.requires("fdm_materials/(latest)@internal/testing") else: - self.requires("fdm_materials/(latest)@ultimaker/stable") + self.requires("fdm_materials/5.6.0") def build_requirements(self): if self.options.get_safe("enable_i18n", False):