Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools ... # Conflicts: # PartPreviewWindow/View3D/View3DWidget.cs # SlicerConfiguration/SliceSettingsWidget.cs # SlicerConfiguration/SlicingQueue.cs # StaticData/SliceSettings/Properties.json		2017-05-19 14:57:04 -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	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 branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07: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