Merge branch 'master' into wx3

2014-12-12 14:42:25 +03:00
parent ff55f2817b 5adaaac75e
commit 3c1bf22e87
104 changed files with 1847 additions and 1009 deletions
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -708,7 +708,12 @@ class ShipBrowser(wx.Panel):
            self.raceselect.Show(False)
            self.Layout()

-    RACE_ORDER = ["amarr", "caldari", "gallente", "minmatar", "sisters", "ore", "serpentis", "angel", "blood", "sansha", "guristas", "jove", None]
+    RACE_ORDER = [
+        "amarr", "caldari", "gallente", "minmatar",
+        "sisters", "ore",
+        "serpentis", "angel", "blood", "sansha", "guristas", "mordu",
+        "jove", None
+    ]

    def raceNameKey(self, ship):
        return self.RACE_ORDER.index(ship.race), ship.name