Lars Brubaker c0a7331579 Merge branch '1.7' into design_tools ... # Conflicts: # SlicerConfiguration/Settings/SettingsHelpers.cs # StaticData/SliceSettings/Properties.json # StaticData/Translations/Master.txt		2017-04-12 12:29:31 -07:00
..
ApplicationSettings	Moved all the easy static localized strings to non-static strings	2017-03-01 13:48:49 -08:00
CalibrationSettings	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
CloudSettings	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
PrinterSettings	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
PrintLeveling	Merge branch '1.7' into design_tools	2017-04-12 12:29:31 -07:00
LanguageSelector.cs	Expanded translation set	2017-01-04 10:25:19 -08:00
PrinterConfigurationPage.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
RunningMacroPage.cs	Fixed a bug with the progress bar	2017-02-06 14:23:55 -08:00
SettingsViewBase.cs	Made leveling settings editable when not connected	2016-07-29 09:44:16 -07:00
ThemeSelectorWindow.cs	Added class for new theme selector window that will link to the Configuration tab. UI is mostly done, code needs to be formatted more coherently, and save theme functionality is not there!	2014-10-08 16:09:08 -07:00