Merge branch 'master' into v2.2.0b1

# Conflicts: # eve.db
2018-06-12 21:41:04 -04:00
parent 3ebfe045c5 d4d55c026a
commit e19d231eba
13 changed files with 45 additions and 39 deletions
--- a/gui/builtinContextMenus/whProjector.py
+++ b/gui/builtinContextMenus/whProjector.py
@@ -195,7 +195,7 @@ class WhProjector(ContextMenu):
    def getLocalizedEnvironments(self):
        sMkt = Market.getInstance()

-        grp = sMkt.getGroup("Uninteractable Localized Effect Beacon")
+        grp = sMkt.getGroup("Abyssal Hazards")

        effects = dict()