Merge remote-tracking branch 'origin/1.5.1'

This commit is contained in:
Lars Brubaker 2016-03-10 18:18:12 -08:00
commit 6a56c267f3

View file

@ -13,7 +13,7 @@ build_height = 200
cancel_gcode = G28 X0\n
center_part_on_bed = 1
complete_objects = 0
connect_gcode = M205 X8\nM201 X1500 Y1500 Z100 E3000\nM204 S0 T1800
connect_gcode = M205 X8\nM201 X1000 Y1500 Z100 E3000\nM204 S0 T1800
cool_extruder_lift = 1
print_leveling_solution = 3 Point Plane
print_leveling_method = Manual
@ -158,7 +158,7 @@ toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 35
top_solid_layers = 4
travel_speed = 150
travel_speed = 100
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0