From fe34938bce6462db6b54af39d9a27e24a2432e34 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 7 Sep 2016 13:57:09 +0200 Subject: [PATCH 1/3] Update wording --- plugins/SliceInfoPlugin/SliceInfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 047a03575d..117ac2a178 100644 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -65,7 +65,7 @@ class SliceInfo(Extension): Preferences.getInstance().addPreference("info/asked_send_slice_info", False) if not Preferences.getInstance().getValue("info/asked_send_slice_info"): - self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura automatically sends slice info. You can disable this in preferences"), lifetime = 0, dismissable = False) + self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura collects anonymised slicing statistics. You can disable this in preferences"), lifetime = 0, dismissable = False) self.send_slice_info_message.addAction("Dismiss", catalog.i18nc("@action:button", "Dismiss"), None, "") self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered) self.send_slice_info_message.show() From bf394a42d5e7c57fa2fd8ecc1d7ae5c95250c739 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 7 Sep 2016 15:26:51 +0200 Subject: [PATCH 2/3] Fix UMO-DualExtrusion prime tower location CURA-2283 --- resources/definitions/ultimaker_original_dual.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 6feaa07470..8d2d5d85d6 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -78,7 +78,7 @@ "default_value": 185 }, "prime_tower_position_y": { - "default_value": 175 + "default_value": 160 } } } From bbb211b0f6dcc055f4a3ddf59e78d519a5c1f48a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 7 Sep 2016 15:28:58 +0200 Subject: [PATCH 3/3] Saving profile to g-code with empty container no longer results in empty string --- plugins/GCodeWriter/GCodeWriter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index c15b079097..95d6659dd1 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -66,7 +66,10 @@ class GCodeWriter(MeshWriter): ## Create a new container with container 2 as base and container 1 written over it. def _createFlattenedContainerInstance(self, instance_container1, instance_container2): flat_container = InstanceContainer(instance_container2.getName()) - flat_container.setDefinition(instance_container2.getDefinition()) + if instance_container1.getDefinition(): + flat_container.setDefinition(instance_container1.getDefinition()) + else: + flat_container.setDefinition(instance_container2.getDefinition()) flat_container.setMetaData(instance_container2.getMetaData()) for key in instance_container2.getAllKeys():