Merge branch 'master' into price_optimize

2019-03-19 08:42:06 +03:00
parent 7ddd3a35d1 573d8e068c
commit 8063647bba
16 changed files with 224 additions and 29 deletions
--- a/service/settings.py
+++ b/service/settings.py
@@ -526,6 +526,7 @@ class ContextMenuSettings(object):
            "targetResists"         : 1,
            "whProjector"           : 1,
            "moduleFill"            : 1,
+            "spoolup"               : 1,
        }

        self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings)