Lars Brubaker 8f47fd3efd Merge branch '1.5.3' ... Conflicts: StaticData/PrinterSettings/JumpStart/V1/config.ini		2016-05-04 14:28:29 -07:00
..
material	Made jump start have better default queue, correct on connect gcode and start gcode	2016-02-26 14:40:20 -08:00
calibration.ini	Made jump start have better default queue, correct on connect gcode and start gcode	2016-02-26 14:40:20 -08:00
config.ini	Merge branch '1.5.3'	2016-05-04 14:28:29 -07:00
setup.ini	Changed model name of JumpStart printer to V1	2016-01-28 10:19:52 -08:00