Update wipe to wipe&prime tower in naming.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index de879b940fa5cfa230eaae3542ebd54b01d7b455..15da8947dcd3cdf04604b454074c6880825d2667 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -1350,10 +1350,10 @@ void main(void)
                        glColor4ub(127, 127, 127, 200)
                        #if UM2, draw bat-area zone for head. THe head can't stop there, because its bat-area.
                        #UpperRight
-                       clipWidth = 50;
-                       clipHeight = 35;
-                       posX = sx / 2 - clipWidth;
-                       posY = sy / 2 - clipHeight;
+                       clipWidth = 50
+                       clipHeight = 10
+                       posX = sx / 2 - clipWidth
+                       posY = sy / 2 - clipHeight
                        glBegin(GL_QUADS)
                        glVertex3f(posX, posY, 0.1)
                        glVertex3f(posX+clipWidth, posY, 0.1)
@@ -1361,10 +1361,10 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #UpperLeft
-                       clipWidth = 55;
-                       clipHeight = 35;
-                       posX = -sx / 2;
-                       posY = sy / 2 - clipHeight;
+                       clipWidth = 55
+                       clipHeight = 10
+                       posX = -sx / 2
+                       posY = sy / 2 - clipHeight
                        glBegin(GL_QUADS)
                        glVertex3f(posX, posY, 0.1)
                        glVertex3f(posX+clipWidth, posY, 0.1)
@@ -1372,10 +1372,10 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #LowerRight
-                       clipWidth = 50;
-                       clipHeight = 5;
-                       posX = sx / 2 - clipWidth;
-                       posY = -sy / 2;
+                       clipWidth = 50
+                       clipHeight = 10
+                       posX = sx / 2 - clipWidth
+                       posY = -sy / 2
                        glBegin(GL_QUADS)
                        glVertex3f(posX, posY, 0.1)
                        glVertex3f(posX+clipWidth, posY, 0.1)
@@ -1383,10 +1383,10 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #LowerLeft
-                       clipWidth = 55;
-                       clipHeight = 5;
-                       posX = -sx / 2;
-                       posY = -sy / 2;
+                       clipWidth = 55
+                       clipHeight = 10
+                       posX = -sx / 2
+                       posY = -sy / 2
                        glBegin(GL_QUADS)
                        glVertex3f(posX, posY, 0.1)
                        glVertex3f(posX+clipWidth, posY, 0.1)

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index e944345a6dba95360382b70c4648976c3a937bba..9f2c3df7cc5d249dc37bced0240de3a53806a4f8 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -165,7 +165,7 @@ setting('print_bed_temperature',      70, int,   'basic',    _('Speed and Temper
 setting('support',                'None', [_('None'), _('Touching buildplate'), _('Everywhere')], 'basic', _('Support')).setLabel(_("Support type"), _("Type of support structure build.\n\"Touching buildplate\" is the most commonly used support setting.\n\nNone does not do any support.\nTouching buildplate only creates support where the support structure will touch the build platform.\nEverywhere creates support even on top of parts of the model."))
 setting('platform_adhesion',      'None', [_('None'), _('Brim'), _('Raft')], 'basic', _('Support')).setLabel(_("Platform adhesion type"), _("Different options that help in preventing corners from lifting due to warping.\nBrim adds a single layer thick flat area around your object which is easy to cut off afterwards, and the recommended option.\nRaft adds a thick raster at below the object and a thin interface between this and your object.\n(Note that enabling the brim or raft disables the skirt)"))
 setting('support_dual_extrusion',  'Both', [_('Both'), _('First extruder'), _('Second extruder')], 'basic', _('Support')).setLabel(_("Support dual extrusion"), _("Which extruder to use for support material, for break-away support you can use both extruders.\nBut if one of the materials is more expensive then the other you could select an extruder to use for support material. This causes more extruder switches.\nYou can also use the 2nd extruder for soluble support materials."))
-setting('wipe_tower',              False, bool,  'basic',    _('Dual extrusion')).setLabel(_("Wipe tower"), _("The wipe-tower is a tower printed on every layer when switching between nozzles.\nThe old nozzle is wiped off on the tower before the new nozzle is used to print the 2nd color."))
+setting('wipe_tower',              False, bool,  'basic',    _('Dual extrusion')).setLabel(_("Wipe&prime tower"), _("The wipe-tower is a tower printed on every layer when switching between nozzles.\nThe old nozzle is wiped off on the tower before the new nozzle is used to print the 2nd color."))
 setting('ooze_shield',             False, bool,  'basic',    _('Dual extrusion')).setLabel(_("Ooze shield"), _("The ooze shield is a 1 line thick shell around the object which stands a few mm from the object.\nThis shield catches any oozing from the unused nozzle in dual-extrusion."))
 setting('filament_diameter',        2.85, float, 'basic',    _('Filament')).setRange(1).setLabel(_("Diameter (mm)"), _("Diameter of your filament, as accurately as possible.\nIf you cannot measure this value you will have to calibrate it, a higher number means less extrusion, a smaller number generates more extrusion."))
 setting('filament_diameter2',          0, float, 'basic',    _('Filament')).setRange(0).setLabel(_("Diameter2 (mm)"), _("Diameter of your filament for the 2nd nozzle. Use 0 to use the same diameter as for nozzle 1."))

diff --git a/changelog b/changelog
index e75a892c2403a04ff4972796fb3a5af7ac8ecd5c..de07db0767b31c61de601140370789eef0834690 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,9 @@
 Development
 * Adjusted the gantry height to 55mm for the Ultimaker, as 60mm was 3mm to high for the default setup with an V2 hotend.
-* Added disallowed zones for UM2.
+* Added disallowed zones for UM2
+* Added ooze-shield for dual-color printing
+* Added wipe tower for dual-extrusion
+* Added no-go zones for UM2 glass clips
 
 Ultimaker2 - Firmware update - 13.11-1
 * Slightly tweaked the SD-Card error problems.