Merge branch 'master' into feature_pause_at_height_optional_parking

# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -505,7 +505,7 @@ class PauseAtHeight(Script):
                     # Move the head back
                     if park_enabled:
                         if current_z < 15:
-                            prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n"
+                            prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
                         prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
                         prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + " ; move back down to resume height\n"
 

resources/definitions/anycubic_i3_mega_s.def.json

@@ -44,7 +44,7 @@
 
         "material_diameter": { "default_value": 1.75 },
 
-        "acceleration_print": { "value": 1800 },
+        "acceleration_print": { "value": 1500 },
         "acceleration_travel": { "value": 3000 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
         "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },

resources/definitions/anycubic_i3_mega_x.def.json

@@ -12,6 +12,9 @@
         "machine_name": { "default_value": "Anycubic i3 Mega X" },
         "machine_width": { "default_value": 300 },
         "machine_height": { "default_value": 305 },
-        "machine_depth": { "default_value": 300 }
+        "machine_depth": { "default_value": 300 },
+
+        "acceleration_print": { "value": 400 },
+        "acceleration_travel": { "value": 400 }
 	}
 }