Lars Brubaker 0b6c4e94f1 Merge branch '1.7' ... # Conflicts: # StaticData/SliceSettings/Properties.json		2017-03-14 14:18:57 -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'	2017-03-14 14:18:57 -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