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
..
ControlWidgets	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -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	All new 1.7.1 changes	2017-05-19 14:39:57 -07: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	new ray trace bundle work	2016-09-09 20:22:46 -07:00
TemperatureIndicator.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
XYZJogControls.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00