Merged kfsone/tradedangerous into master

eyeonus · Feb 3, 2015 · 29e3d25 · 29e3d25
2 parents fe7c107 + 24ab971
commit 29e3d25
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 3 deletions.
diff --git a/cache.py b/cache.py
@@ -185,7 +185,10 @@
     ^[^A-Z0-9] |
     \s{2,} |
     \S\s\S\s |
-    ^OEN
+    ^OEN |
+    ^MCK(EF|FE)\b |
+    \bCHAN\s+DLER |
+    \b[O0]UMONT
 )''', flags=re.X)
 
 

diff --git a/corrections.py b/corrections.py
@@ -24,6 +24,7 @@
     "51 AQUILAE/COKEHUB":                   "Coke Hub",
     "ADENETS/ALLEN HORIZONS":               DELETED,
     "ADEO/OOBROVOLSKI CITY":                "Dobrovolski City",
+    "AFLI/QU IETELET DOCK":                 DELETED,
     "AINUNNICORI/TANIHUB":                  "Tani Hub",
     "AKANDI/AGNESICOLONY":                  DELETED,
     "AKHENATEN/WANG PLATFORM":              DELETED,
@@ -44,6 +45,9 @@
     "AULIN/ALUIN ENTERPIRSE":               "Aulin Enterprise",
     "AULIN/EOWAROS RING":                   DELETED,
     "BALDUR/DUTTON STATION":                DELETED,
+    "BALTAH'SINE/BALTAH''SINE STATION":     DELETED,
+    "BALTAH'SINE/BALTHAISINE STATION":      DELETED,
+    "BAVARINGONI/CHAN DLER PLATFORM":       "Chandler Platform",
     "BD+13 693/DRUMMOND`S PROGRESS":        "Drummond's Progress",
     "BD+65 1846/SHARGIN BEACON":            DELETED,
     "BD-02 4304/BRANOENSTEIN ENTERPRISE":   DELETED,
@@ -62,6 +66,8 @@
     "FUTHORC/ACQUIREO TASTE ORBITAL":       DELETED,
     "G 165-13/NAODODOUR PLATFORM":          DELETED,
     "GCRV 4654/HERZEFELD LANDING":          "Herzfeld Landing",
+    "GD 219/MCKEF RING":                    DELETED,
+    "GD 219/MCKFE RING":                    DELETED,
     "GROOMBRIDGE 1618/FRANKUN RING":        "Franklin Ring",
     "HATMEHING/HEVEI.IUS TERMINAL":         DELETED,
     "HATMEHING/HEVEIIUS TERMINAL":          DELETED,
@@ -104,10 +110,12 @@
     "LTT 15449/REILLI DOCK":                "Reilly Dock",
     "LTT 16218/CHARGAFFPORT":               "Chargaff Port",
     "LTT 7548/ALEXANDRIA RINF":             "Alexandria Ring",
+    "LTT 8750/OUMONT STATION":              DELETED,
     "LTT 9455/OLEARY VISION":               "O'Leary Vision",
     "LUGH/BALANOIN GATEWAY":                DELETED,
     "MANNODAVA/ALIPORT":                    DELETED,
     "MANNONA/THORNYCROFY PENAL COLONY":     "Thornycroft Penal Colony",
+    "MATLEHI/KUBEEMCDOWELL PORT":           "Kube-McDowell Port",
     "MCC 467/ROB HUBBARD RING":             "Ron Hubbard Ring",
     "MINJANGO/OENNING PLATFORM":            "Denning Platform",
     "MISISTURE/GELFANO DOCK":               DELETED,