Merge branch '3.4'

This commit is contained in:
Ghostkeeper 2018-06-14 14:57:20 +02:00
commit e0699a0997
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A

View File

@ -262,9 +262,6 @@ class PauseAtHeight(Script):
if current_z < 15: if current_z < 15:
prepend_gcode += self.putValue(G=1, Z=15, F=300) + "\n" prepend_gcode += self.putValue(G=1, Z=15, F=300) + "\n"
# Disable the E steppers
prepend_gcode += self.putValue(M=84, E=0) + "\n"
# Set extruder standby temperature # Set extruder standby temperature
prepend_gcode += self.putValue(M=104, S=standby_temperature) + "; standby temperature\n" prepend_gcode += self.putValue(M=104, S=standby_temperature) + "; standby temperature\n"