Lars Brubaker 0b6c4e94f1 Merge branch '1.7' ... # Conflicts: # StaticData/SliceSettings/Properties.json		2017-03-14 14:18:57 -07:00
..
AdjustmentControls.cs	Tuning adjustments default to 1.0 on application restart	2017-03-09 12:46:06 -08:00
ControlWidgetBase.cs	Moved Mocros to the top of the controls window	2016-11-30 13:31:19 -08:00
FanControls.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
MacroControls.cs	disable rather than hide slice engines when not usable.	2017-02-23 13:33:47 -08:00
MovementControls.cs	Merge remote-tracking branch 'origin/1.7'	2017-02-18 14:04:59 -08:00
PowerControls.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
TemperatureControls.cs	Fixed test	2016-12-07 16:26:35 -08:00