Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-01-03 08:30:27 +01:00
commit 08dc035f6e
3 changed files with 5 additions and 1 deletions

View file

@ -501,6 +501,7 @@ class CuraApplication(QtApplication):
preferences.addPreference("cura/choice_on_open_project", "always_ask")
preferences.addPreference("cura/use_multi_build_plate", False)
preferences.addPreference("view/settings_list_height", 600)
preferences.addPreference("view/settings_visible", False)
preferences.addPreference("cura/currency", "")
preferences.addPreference("cura/material_settings", "{}")