Lars Brubaker 4929f834d6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... Conflicts: SlicerConfiguration/Settings/ProfileManager.cs		2016-09-01 11:18:32 -07:00
..
Settings	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-09-01 11:18:32 -07:00
SlicePresetsWindow	Code clean up	2016-08-31 13:57:49 -07:00
SlicerMapping	Adding in the ability to turn on and off thin line code	2016-08-26 12:13:39 -07:00
Slicing
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	More settings moved to GetValue	2016-06-16 10:31:18 -07:00
SettingsControlSelectors.cs	Disable Edit Preset button on default item	2016-08-23 09:35:22 -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	Made the settings history be disabled when not signed in.	2016-08-31 13:09:06 -07:00
SliceSettingsOrganizer.cs	Made the cost and mass fields update as settings are changed	2016-07-18 10:52:36 -07:00
SliceSettingsWidget.cs	Got the check and uncheck of reload ui settings to work	2016-08-25 17:43:30 -07:00
SlicingQueue.cs	Migrate SettingsProfile functionality to new SettingsHelpers type	2016-07-18 16:58:25 -07:00