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
..
EngineMapingBase.cs	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
EngineMappingCura.cs	Design tools	2017-03-15 16:29:56 -07:00
EngineMappingMatterSlice.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
EngineMappingSlic3r.cs	Putting in support for filament runout sensor	2017-04-13 14:25:46 -07:00
MappingClasses.cs	Made a mapping for slic3r	2017-01-30 12:55:12 -08:00