Merge branch 'master' into development

2017-03-23 00:35:28 -04:00
parent bca26721ff 4a6c0db4fa
commit 0a1008f64f
13 changed files with 136 additions and 142 deletions
--- a/service/settings.py
+++ b/service/settings.py
@@ -408,14 +408,17 @@ class ContextMenuSettings(object):
            "ammoPattern"           : 1,
            "amount"                : 1,
            "cargo"                 : 1,
+            "cargoAmmo"             : 1,
            "changeAffectingSkills" : 1,
            "damagePattern"         : 1,
            "droneRemoveStack"      : 1,
            "droneSplit"            : 1,
+            "droneStack"            : 1,
            "factorReload"          : 1,
            "fighterAbilities"      : 1,
-            "implantSet"            : 1,
+            "implantSets"           : 1,
            "itemStats"             : 1,
+            "itemRemove"            : 1,
            "marketJump"            : 1,
            "metaSwap"              : 1,
            "moduleAmmoPicker"      : 1,