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
..
Properties	Porting the python emulator to c#	2017-01-10 08:21:11 -08:00
App.config	Update to framework 4.6.1	2017-03-15 14:45:14 -07:00
Emulator.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
PrinterEmulator.csproj	Update to framework 4.6.1	2017-03-15 14:45:14 -07:00
PrinterEmulator.sln	Porting the python emulator to c#	2017-01-10 08:21:11 -08:00
Program.cs	Took out old emulator and put in a new c# one	2017-01-10 12:24:01 -08:00