Lars Brubaker 0b6c4e94f1 Merge branch '1.7' ... # Conflicts: # StaticData/SliceSettings/Properties.json		2017-03-14 14:18:57 -07:00
..
ControlWidgets	Merge branch '1.7'	2017-03-14 14:18:57 -07:00
PrinterConnections	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
TerminalWindow	Explicitly filter M105 from sent lines	2017-03-09 10:10:07 -08:00
EditLevelingSettingsWindow.cs	Clear user baby stepping after new print leveling.	2017-02-01 13:38:14 -08:00
EditMacrosWindow.cs	Convert public EventHandler fields to events	2017-01-24 11:49:13 -08:00
EditManualMovementSpeedsWindow.cs	Add manual_movement_speeds to properties.json	2017-02-16 11:48:04 -08:00
EditTemperaturePresetsWindow.cs	Remove duplicate .Click event from ButtonBase	2017-01-17 15:31:08 -08:00
ManualPrinterControls.cs	Fixed the e controls to disable correctly.	2017-02-27 13:26:33 -08:00
PrintLevelingPlane.cs
TemperatureIndicator.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
XYZJogControls.cs	Make sure we don't try to reference the hotKeyButton if not created.	2017-03-09 10:31:01 -08:00