Check for moveType == move instead of x,y,z is not None, otherwise x,y,z,e moves wouldn't be seen as extrude/retract moves

(cherry picked from commit 1b6a46c)

src/octoprint/util/gcodeInterpreter.py

@@ -151,7 +151,7 @@ class gcode(object):
 					else:
 						e = 0.0
 
-					if x is not None or y is not None or z is not None:
+					if moveType == "move":
 						diffX = oldPos[0] - pos[0]
 						diffY = oldPos[1] - pos[1]
 						totalMoveTimeMinute += math.sqrt(diffX * diffX + diffY * diffY) / feedRateXY