Lars Brubaker c3f434fe3e Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... # Conflicts: # MatterControl.Printing/Settings/PrinterSettingsLayer.cs # MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs		2020-11-02 18:24:19 -08:00
..
Drivers	make emulated probe return reasonable result	2020-10-27 13:05:35 -07:00
Io	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2020-11-02 18:24:19 -08:00
ConnectFailedEventArgs.cs	Improving end of print behavior	2020-10-25 08:48:43 -07:00
PrinterConnection.cs	finishing up validate leveling stream	2020-10-27 17:45:01 -07:00
PrintPauseEventArgs.cs
TemperatureEventArgs.cs