Lars Brubaker c0a7331579 Merge branch '1.7' into design_tools ... # Conflicts: # SlicerConfiguration/Settings/SettingsHelpers.cs # StaticData/SliceSettings/Properties.json # StaticData/Translations/Master.txt		2017-04-12 12:29:31 -07:00
..
AdjustmentControls.cs	Made the ability to probe the be with G30 on printers with probe	2017-04-12 12:12:11 -07:00
ControlWidgetBase.cs
FanControls.cs
MacroControls.cs	disable rather than hide slice engines when not usable.	2017-02-23 13:33:47 -08:00
MovementControls.cs
PowerControls.cs
TemperatureControls.cs