Merge branch '4.0' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2018-12-31 10:28:53 +01:00
commit 37af42aa93
8 changed files with 61 additions and 10 deletions

View file

@ -500,7 +500,7 @@ class CuraApplication(QtApplication):
preferences.addPreference("cura/choice_on_profile_override", "always_ask")
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("cura/currency", "")
preferences.addPreference("cura/material_settings", "{}")