Lars Brubaker 77c3b78eb1 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools ... # Conflicts: # PartPreviewWindow/PartPreviewContent.cs		2017-05-24 15:07:06 -07:00
..
Settings	Move to new library model and view	2017-05-20 00:41:02 -07:00
SlicePresetsWindow	New default constructor, moved hanchor vanchor	2017-02-01 16:39:24 -08:00
SlicerMapping	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
Slicing	Extract tests to dedicated assemblies	2015-05-06 09:08:30 -07:00
CuraEngineInfo.cs	Json Profiles	2016-04-27 14:35:57 -07:00
MatterSliceInfo.cs	Json Profiles	2016-04-27 14:35:57 -07:00
SettingsControlBar.cs	Fixed test	2016-12-07 16:26:35 -08:00
SettingsControlSelectors.cs	Adjust tab styling	2017-05-23 14:54:36 -07:00
Slic3rInfo.cs	Json Profiles	2016-04-27 14:35:57 -07:00
SliceEngineInfo.cs	Json Profiles	2016-04-27 14:35:57 -07:00
SliceSettingsDetailControl.cs	Moved all the easy static localized strings to non-static strings	2017-03-01 13:48:49 -08:00
SliceSettingsOrganizer.cs	Remove redundant default values from properties.json	2017-02-16 08:33:46 -08:00
SliceSettingsWidget.cs	Move more widgets to printer action bar	2017-05-24 14:19:02 -07:00
SlicingQueue.cs	Adding obj loading support	2017-05-22 17:52:08 -07:00