From 221d82b6d6ec4dd93988ce4dbcfc0985208aa23c Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 27 Apr 2015 20:47:40 -0700 Subject: [PATCH 1/2] Fixes #225 Generator already running --- CHANGES.txt | 3 + data/ShipVendor.csv | 20 ++++ data/Station.csv | 278 ++++++++++++++++++++++++++------------------ data/System.csv | 49 ++++++++ tradecalc.py | 33 +++--- 5 files changed, 255 insertions(+), 128 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b19ebf75..92986eae 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,9 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 ============================================================================== +v6.18.6 Apr 27 2015 +. (kfsone) Fixed #225 'Generator already running' + v6.18.5 Apr 26 2015 . (kfsone) Fixed #224 run -vv and above was raising an exception . (kfsone) Fixed #223 "unrecognized system" errors diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv index 4373283d..8de6b5a3 100644 --- a/data/ShipVendor.csv +++ b/data/ShipVendor.csv @@ -84,6 +84,14 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id,mod 'AFLI','Quetelet Dock','Type 7','2015-04-25 22:57:23' 'AFLI','Quetelet Dock','Type 9','2015-04-25 22:57:25' 'AFLI','Quetelet Dock','Viper','2015-04-25 22:57:27' +'AGASTARIYA','Biruni Gateway','Adder','2015-04-27 02:54:53' +'AGASTARIYA','Biruni Gateway','Anaconda','2015-04-27 02:54:55' +'AGASTARIYA','Biruni Gateway','Cobra','2015-04-27 02:54:57' +'AGASTARIYA','Biruni Gateway','Eagle','2015-04-27 02:54:59' +'AGASTARIYA','Biruni Gateway','Hauler','2015-04-27 02:55:02' +'AGASTARIYA','Biruni Gateway','Sidewinder','2015-04-27 02:55:04' +'AGASTARIYA','Biruni Gateway','Type 6','2015-04-27 02:55:06' +'AGASTARIYA','Biruni Gateway','Viper','2015-04-27 02:55:08' 'AIABIKO','Jett Ring','Cobra','2015-03-08 08:24:18' 'AIABIKO','Jett Ring','Eagle','2015-03-08 08:24:18' 'AIABIKO','Jett Ring','Hauler','2015-03-08 08:24:19' @@ -2372,6 +2380,8 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id,mod 'SALARHUL','Hiraga Gateway','Type 6','2015-03-22 18:44:27' 'SALARHUL','Hiraga Gateway','Type 7','2015-03-22 18:44:32' 'SALARHUL','Hiraga Gateway','Type 9','2015-03-22 18:44:15' +'SANNA','Skyline High','Eagle','2015-04-27 03:07:36' +'SANNA','Skyline High','Sidewinder','2015-04-27 03:07:40' 'SESUANG','Drummond Enterprise','Adder','2015-03-17 08:31:01' 'SESUANG','Drummond Enterprise','Asp','2015-03-17 08:31:01' 'SESUANG','Drummond Enterprise','Dropship','2015-03-17 08:31:01' @@ -2657,6 +2667,16 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id,mod 'VOLKHAB','Vernadsky Dock','Type 6','2015-03-04 19:50:35' 'VOLKHAB','Vernadsky Dock','Type 7','2015-03-04 19:50:35' 'VOLKHAB','Vernadsky Dock','Viper','2015-03-04 19:50:35' +'WASHODIA','Rayhan Al-Biruni Port','Anaconda','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Asp','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Cobra','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Dropship','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Eagle','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Hauler','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Sidewinder','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Type 6','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Type 7','2015-04-27 16:39:07' +'WASHODIA','Rayhan Al-Biruni Port','Type 9','2015-04-27 16:39:07' 'WISE 1800+0134','Underwood Dock','Adder','2015-03-04 19:50:35' 'WISE 1800+0134','Underwood Dock','Cobra','2015-03-04 19:50:35' 'WISE 1800+0134','Underwood Dock','Eagle','2015-03-04 19:50:35' diff --git a/data/Station.csv b/data/Station.csv index 47ffbe39..0507696a 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -50,6 +50,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, '101 TAURI','Linenger Station',1177,'?','L','Y','Y','2015-02-27 05:11:07','?','?','?','?' '101 TAURI','Ramon Station',2191,'?','M','Y','N','2015-02-27 05:13:10','?','?','?','?' '101 TAURI','Schmitt Orbital',384,'?','L','Y','Y','2015-02-27 05:08:56','?','?','?','?' +'109 HERCULIS','Bennett Colony',0,'?','?','Y','?','2015-04-27 18:54:00','?','?','?','?' +'109 HERCULIS','So-Yeon Mines',0,'?','?','Y','?','2015-04-27 18:36:00','?','?','?','?' '109 PISCIUM','Ising Dock',1946,'?','L','Y','Y','2015-02-27 05:14:31','?','?','?','?' '11 AQUILAE','Efremov Camp',289,'?','M','Y','?','2015-04-12 05:59:47','?','?','?','?' '11 AQUILAE','Nielsen Hub',237,'?','M','Y','?','2015-04-12 06:00:03','?','?','?','?' @@ -87,9 +89,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, '15 URSAE MAJORIS','Bamford Horizons',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' '15 URSAE MAJORIS','Salam Terminal',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' '157 G. AQUARII','Dunbar Hub',142,'Y','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' -'157 G. AQUARII','Lucid City',263,'N','M','Y','N','2015-03-14 04:11:30','N','?','?','?' -'157 G. AQUARII','Titov Point',3810,'?','M','N','N','2015-03-11 12:44:59','Y','?','?','?' -'157 G. AQUARII','Titov Port',5629,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' +'157 G. AQUARII','Lucid City',263,'N','M','Y','N','2015-04-27 19:24:30','N','N','Y','Y' +'157 G. AQUARII','Titov Port',5646,'?','M','N','N','2015-04-27 19:25:47','Y','N','Y','Y' '16 C URSAE MAJORIS','Daimler Station',2525,'?','L','Y','?','2015-03-29 02:29:19','?','?','?','?' '16 CEPHEI','Song Settlement',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' '16 CYGNI','Borisenko Dock',146754,'?','L','Y','?','2015-04-21 02:00:19','?','?','?','?' @@ -180,9 +181,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, '24 G. CARINAE','Chawla Landing',1677,'?','M','Y','N','2015-03-19 03:13:40','N','N','Y','N' '24 IOTA CRATERIS','Cartan Terminal',874,'?','M','Y','N','2015-03-18 10:04:58','N','N','Y','Y' '24 IOTA CRATERIS','Haber Dock',874,'?','L','Y','Y','2015-03-19 03:13:40','Y','Y','Y','Y' -'241 G. AQUARII','Anderson Ring',2578,'?','L','?','?','2015-02-23 23:54:35','?','?','?','?' -'241 G. AQUARII','Gibson City',1057,'?','L','Y','?','2015-02-23 23:54:35','?','?','?','?' -'241 G. AQUARII','Romanenko Enterprise',1749,'?','L','?','?','2015-02-23 23:54:35','?','?','?','?' +'241 G. AQUARII','Anderson Ring',2586,'?','L','Y','Y','2015-04-27 17:06:35','Y','Y','Y','Y' +'241 G. AQUARII','Gibson City',1033,'?','L','Y','Y','2015-04-27 17:05:10','Y','Y','Y','Y' +'241 G. AQUARII','Romanenko Enterprise',1690,'?','L','Y','Y','2015-04-27 17:06:02','Y','Y','Y','Y' '25 NU-2 DRACONIS','Avicenna City',1896,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' '26 DRACONIS','Bouch Beacon',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' '26 DRACONIS','Veach Plant',749,'N','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','Y' @@ -252,7 +253,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, '37 GEMINORUM','Utley City',254,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' '37 LIBRAE','Den Berg Gateway',1000,'Y','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' '37 LIBRAE','Roosa Market',1680,'Y','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' -'37 XI BOOTIS','Bresnik Terminal',10731,'Y','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' +'37 XI BOOTIS','Bresnik Terminal',10731,'Y','L','Y','Y','2015-04-26 08:09:48','Y','Y','Y','Y' '37 XI BOOTIS','Schirba Plant',10731,'Y','L','?','?','2015-02-23 23:54:35','?','?','?','?' '38 LYNCIS','Macleod Market',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' '38 VIRGINIS','Balandin Hub',4136,'?','M','?','?','2015-04-14 04:19:34','?','?','?','?' @@ -408,7 +409,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, '61 VIRGINIS','Furukawa Port',106,'Y','L','Y','Y','2015-03-18 10:34:36','Y','Y','Y','Y' '62 URSAE MAJORIS','Akers Hub',340,'?','L','Y','N','2015-03-18 10:37:33','N','Y','Y','Y' '62 URSAE MAJORIS','Armstrong Orbital',4188,'?','M','Y','N','2015-03-18 10:39:08','Y','Y','Y','N' -'62 URSAE MAJORIS','Bolotov City',623,'?','L','Y','Y','2015-03-18 10:37:53','Y','Y','Y','Y' +'62 URSAE MAJORIS','Bolotov City',623,'Y','L','Y','Y','2015-04-26 12:03:31','Y','Y','Y','Y' '62 URSAE MAJORIS','Curbeam Dock',341,'?','M','Y','N','2015-03-18 10:37:13','Y','Y','Y','Y' '62 URSAE MAJORIS','Gurney Station',255,'?','L','Y','Y','2015-03-18 10:36:51','Y','Y','Y','Y' '62 URSAE MAJORIS','Low City',100401,'?','M','Y','N','2015-03-18 10:39:31','N','N','Y','N' @@ -542,7 +543,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ABURU','Dyomin Plant',611,'?','M','Y','N','2015-04-09 02:31:38','N','Y','Y','Y' 'AC +26 37030','Culbertson Port',1497,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'AC +26 37030','Kimbrough Settlement',1497,'Y','M','Y','?','2015-02-23 23:54:35','?','?','?','?' -'AC +40 428-42','Friend''s Progress',0,'?','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' +'AC +40 428-42','Friend''s Progress',1457,'N','M','Y','N','2015-04-26 08:45:00','Y','Y','Y','N' 'AC +40 428-42','Shinn Station',0,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'AC YAI','August Von Steinheil Dock',0,'?','?','Y','?','2015-02-25 01:32:00','?','?','?','?' 'AC YANTO','Boucher Installation',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -699,7 +700,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'AFLI','Pu City',37,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'AFLI','Quetelet Dock',517,'N','L','Y','Y','2015-04-25 22:56:26','Y','Y','Y','Y' 'AFLI','Reinhold Orbital',512,'Y','M','Y','N','2015-04-25 23:05:46','Y','Y','Y','N' -'AFLI','Thomas Ring',425,'N','M','Y','N','2015-03-14 04:11:30','N','N','N','Y' +'AFLI','Thomas Ring',526,'N','M','Y','N','2015-04-27 03:53:03','N','N','N','Y' 'AFLI','Zander Vision',408,'Y','M','N','N','2015-03-13 21:48:28','N','Y','Y','N' 'AG+11 1351','Cochrane Terminal',3591,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'AG+21 1754','Oleskiw Hangar',0,'?','?','Y','?','2015-03-17 19:52:27','?','?','?','?' @@ -715,7 +716,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'AGASTANI','Bell Terminal',1811,'?','L','Y','?','2015-04-21 02:00:27','?','?','?','?' 'AGASTANI','Leslie City',1000,'?','L','Y','?','2015-04-20 16:38:53','?','?','?','?' 'AGASTANI','Vesalius Terminal',4504,'?','L','Y','?','2015-04-21 02:00:27','?','?','?','?' -'AGASTARIYA','Biruni Gateway',1900,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' +'AGASTARIYA','Biruni Gateway',1924,'N','L','Y','Y','2015-04-27 02:54:13','Y','Y','Y','Y' 'AGASTII','Beebe''s Claim',0,'?','?','Y','?','2015-03-01 04:24:00','?','?','?','?' 'AGASTJA','Leiber Port',1640,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' 'AGASTJA','Ziemianski Ring',930,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -934,7 +935,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ALKAID','Maxwell City',14591,'N','L','Y','Y','2015-04-09 21:57:02','Y','Y','Y','Y' 'ALKAID','Nagata Orbital',1238,'N','M','Y','N','2015-04-09 21:26:49','Y','N','Y','Y' 'ALKAID','Watson Relay',13219,'Y','L','Y','Y','2015-04-09 21:39:59','Y','Y','Y','Y' -'ALKALUROPS','Macquorn Rankine Station',2373,'N','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'ALKALUROPS','Brenton Hub',1646224,'Y','M','?','N','2015-04-26 20:26:16','N','Y','Y','Y' +'ALKALUROPS','Macquorn Rankine Station',2446,'N','M','Y','N','2015-04-26 19:33:00','Y','N','Y','Y' 'ALKONDRA','Carson City',686,'Y','L','Y','Y','2015-04-22 15:53:58','Y','Y','Y','Y' 'ALKONDU','Pond Outpost',1176,'N','M','?','N','2015-04-14 04:19:34','Y','?','?','?' 'ALKUNDAN','Fontenay Landing',19,'N','L','Y','Y','2015-03-19 08:28:06','Y','Y','Y','Y' @@ -1024,9 +1026,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'AMAHUACA','Arend Station',1046,'?','L','Y','?','2015-04-21 02:00:30','?','?','?','?' 'AMAHUACA','Kandrup Gateway',1852,'?','M','Y','?','2015-04-20 16:38:53','?','?','?','?' 'AMAHUACA','Suntzeff Hub',1358,'?','M','Y','?','2015-04-20 16:38:53','?','?','?','?' -'AMAHUMASI','Goldreich City',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' -'AMAHUMASI','Van Houten City',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' -'AMAHUMASI','Winthrop Terminal',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'AMAHUMASI','Goldreich City',238,'N','?','Y','N','2015-04-26 02:57:01','N','N','Y','N' +'AMAHUMASI','Van Houten City',878,'N','?','Y','N','2015-04-26 03:24:43','N','Y','Y','Y' +'AMAHUMASI','Winthrop Terminal',879,'N','?','Y','Y','2015-04-26 02:28:56','Y','Y','Y','Y' 'AMAIRII','Frimout Relay',47,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'AMAIRII','Guest Terminal',33,'N','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'AMAIT','Lopez de Villalobos Prospect',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -1298,7 +1300,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ANTILOPE','Shaikh City',17582,'?','M','Y','?','2015-04-21 02:00:33','?','?','?','?' 'ANTILOPE','Tavares Ring',569,'?','L','Y','?','2015-04-21 02:00:33','?','?','?','?' 'ANTINICA','Benyovszky Terminal',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' -'ANTOVE DEN','Tall Dock',300,'Y','L','Y','?','2015-03-25 11:14:00','?','?','?','?' +'ANTOVE DEN','Tall Dock',377,'Y','L','Y','Y','2015-04-26 22:41:25','Y','Y','Y','Y' 'ANTOVII','Hevelius Landing',13,'N','M','Y','N','2015-04-10 14:55:09','Y','N','Y','Y' 'ANTOVII','Rabinowitz Platform',0,'?','?','Y','?','2015-04-10 15:04:00','?','?','?','?' 'ANU','Irvin Plant',760,'?','M','N','?','2015-04-21 02:00:33','?','?','?','?' @@ -1338,9 +1340,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'AO GUANG','H. G. Wells Plant',1518,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'AO GUANG','Kotov Settlement',1518,'Y','L','?','?','2015-02-23 23:54:35','?','?','?','?' 'AO KONBUL','Peirce Freeport',1476,'Y','M','?','?','2015-04-14 04:19:34','Y','?','?','?' -'AO QIN','Bohnhoff Orbital',183,'N','M','Y','N','2015-04-15 10:57:59','Y','N','Y','N' -'AO QIN','Brunner Horizons',504,'N','L','Y','Y','2015-04-15 10:58:31','Y','Y','Y','Y' -'AO QIN','Smith Laboratory',303,'N','M','Y','N','2015-04-15 10:58:56','Y','N','Y','N' +'AO QIN','Bohnhoff Orbital',181,'N','M','Y','N','2015-04-26 02:41:08','N','N','Y','N' +'AO QIN','Brunner Horizons',505,'N','L','Y','Y','2015-04-26 02:43:08','Y','Y','Y','Y' +'AO QIN','Smith Laboratory',303,'N','M','Y','N','2015-04-27 02:00:11','N','N','Y','N' 'AO RUN','Eratosthenes Platform',0,'?','?','Y','?','2015-04-10 16:52:00','?','?','?','?' 'AO SHUN','Pawelczyk Terminal',1286,'Y','L','Y','Y','2015-04-20 16:38:53','?','?','?','?' 'AO SHUN','Rzeppa Gateway',2349,'Y','M','Y','N','2015-04-21 04:55:31','Y','Y','Y','N' @@ -2509,6 +2511,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'BELA OH','Armero Platform',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'BELA OH','Fairey Mines',0,'?','?','Y','?','2015-03-28 08:28:00','?','?','?','?' 'BELA WENA','Arai''s Pride',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'BELAAKO','Al-Farabi Station',0,'?','?','?','N','2015-04-26 15:35:24','N','Y','Y','Y' +'BELAAKO','Duke Dock',0,'?','?','?','N','2015-04-26 15:35:12','N','Y','Y','Y' +'BELAAKO','Lamarck Station',0,'Y','L','?','Y','2015-04-26 15:30:42','Y','Y','Y','Y' 'BELABA','Barr Port',1578,'Y','M','Y','N','2015-04-18 02:18:54','N','N','Y','Y' 'BELACABUNDA','Morgan Orbital',327828,'?','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'BELACAJAN','Crown Base',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -2986,7 +2991,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'BRUTAS','Collins Dock',228,'N','M','Y','N','2015-03-22 13:01:06','Y','Y','Y','Y' 'BRUTAS','Comer Dock',54,'N','M','Y','N','2015-04-12 09:40:03','N','N','Y','N' 'BRUTHANVAN','Lovell Depot',2924,'?','M','Y','N','2015-04-23 00:37:06','Y','N','Y','Y' -'BRYNHILO','Manarov Orbital',1682,'?','L','Y','?','2015-04-22 21:45:11','?','?','?','?' +'BRYNHILO','Manarov Orbital',1682,'?','L','Y','Y','2015-04-26 18:11:56','Y','Y','Y','Y' 'BUAN ZHA','Bosch Depot',0,'?','?','Y','?','2015-04-11 14:04:41','?','?','?','?' 'BUGAS','Belyanin Hub',52,'Y','M','N','N','2015-03-13 21:48:28','N','?','?','?' 'BUGAS','Bernstein Terminal',52,'Y','M','?','N','2015-04-14 04:19:34','N','?','?','?' @@ -3051,8 +3056,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'BYERU BESE','Garnier Station',629,'?','L','Y','?','2015-04-22 21:45:11','?','?','?','?' 'BYERU BESE','Tall Station',2147,'?','M','Y','?','2015-04-22 21:45:11','?','?','?','?' 'BYGGVI','Kondakova Beacon',655,'N','M','?','N','2015-04-24 18:04:13','N','N','Y','Y' -'BYLGIT','Harrison City',2169,'?','M','Y','N','2015-03-20 12:06:54','N','N','N','Y' -'BYLGIT','Thornycroft Gateway',1242,'?','L','Y','Y','2015-03-20 12:06:31','Y','Y','Y','Y' +'BYLGIT','Harrison City',2169,'N','M','Y','N','2015-04-26 07:21:45','N','N','N','Y' +'BYLGIT','Thornycroft Gateway',1253,'N','L','Y','Y','2015-04-26 05:41:23','Y','Y','Y','Y' 'BZ CETI','Coleman Ring',734,'?','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'CABRU','Lanier Terminal',51,'?','M','Y','?','2015-04-22 21:45:11','?','?','?','?' 'CABRU','Pook City',28,'?','L','Y','?','2015-04-22 21:45:11','?','?','?','?' @@ -3128,6 +3133,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CALOR','Cleave Refinery',28,'Y','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'CALOR','Julian Hub',21,'Y','L','Y','Y','2015-02-23 23:54:35','?','?','?','?' 'CALOR','Papin Terminal',37,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' +'CAMA','Collins Platform',0,'?','?','Y','?','2015-04-26 23:36:00','?','?','?','?' 'CAMA','Eddington Market',485,'?','L','Y','?','2015-04-14 06:24:48','?','?','?','?' 'CAMA','Gauss Hub',345,'?','L','Y','?','2015-04-14 06:24:34','?','?','?','?' 'CAMA','Jacquard Gateway',857,'Y','M','Y','?','2015-04-14 06:25:29','?','?','?','?' @@ -3241,6 +3247,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CARNOECK','Bacon City',102,'Y','L','Y','Y','2015-04-08 10:59:04','Y','Y','Y','Y' 'CARNOECK','Midgley Terminal',1638,'N','M','Y','N','2015-04-08 11:03:34','N','Y','Y','N' 'CARNOECK','Mitchell Ring',1223,'N','M','Y','N','2015-04-08 11:01:19','N','Y','Y','N' +'CARNONACAE','Chacornac Settlement',0,'?','?','Y','?','2015-04-27 03:16:00','?','?','?','?' 'CARNS','Christy Terminal',23,'?','M','N','N','2015-03-16 10:42:31','N','N','Y','Y' 'CARNS','Humason Orbital',23,'?','L','?','Y','2015-04-14 04:19:34','Y','Y','Y','Y' 'CARNS','Shaw Station',40,'?','M','?','N','2015-04-14 04:19:34','Y','N','Y','Y' @@ -3421,7 +3428,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CD-53 9442','Roemer Dock',403553,'?','M','Y','N','2015-03-13 06:49:15','?','?','?','?' 'CD-54 471','Cochrane Platform',827,'Y','M','Y','N','2015-03-14 04:11:30','N','?','?','?' 'CD-54 471','Kramski Holding',494,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'CD-54 9671','Somayaji Terminal',650,'N','L','Y','Y','2015-03-24 03:14:26','Y','Y','Y','Y' +'CD-54 9671','Somayaji Terminal',648,'N','L','Y','Y','2015-04-26 22:41:43','Y','Y','Y','Y' 'CD-55 8747','Perrine Colony',0,'?','?','Y','?','2015-04-04 16:38:00','?','?','?','?' 'CD-55 8747','Wright Dock',0,'?','?','Y','?','2015-04-04 16:26:00','?','?','?','?' 'CD-58 538','Haberlandt Orbital',1977,'?','M','Y','N','2015-03-24 14:57:50','N','Y','Y','N' @@ -3520,6 +3527,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CERKTONDHS','Bluford Gateway',42,'Y','L','Y','Y','2015-04-14 16:22:02','Y','Y','Y','Y' 'CERKTONDHS','Buchli Terminal',74,'Y','L','Y','N','2015-03-14 04:11:30','?','?','?','?' 'CERKTONDHS','Hahn Orbital',73,'Y','L','Y','N','2015-03-14 04:11:30','?','?','?','?' +'CERNI','Sagan Port',0,'?','?','Y','?','2015-04-27 21:54:00','?','?','?','?' 'CERNO','Kanwar Enterprise',2709,'N','L','Y','Y','2015-02-23 23:54:35','?','?','?','?' 'CERNOBOG','Henderson Port',9106,'N','M','Y','N','2015-04-14 04:16:04','N','Y','Y','Y' 'CERNOBOG','Kirkwood Vision',164,'N','L','Y','Y','2015-04-14 04:04:34','Y','Y','Y','Y' @@ -3574,8 +3582,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CHAC CIMIH','Abernathy Ring',1200,'?','L','?','Y','2015-04-19 16:04:15','Y','Y','Y','Y' 'CHAC CIMIH','Blackman Dock',21474,'?','M','?','N','2015-04-19 16:05:56','N','Y','Y','Y' 'CHAC CIMIH','Busch Ring',390,'Y','L','Y','Y','2015-04-13 21:41:42','Y','Y','Y','Y' -'CHAC CIMIH','Oxley Terminal',701,'Y','L','N','Y','2015-04-16 12:44:30','Y','Y','Y','Y' +'CHAC CIMIH','Oxley Terminal',701,'Y','L','Y','Y','2015-04-27 21:56:00','Y','Y','Y','Y' 'CHACOBOG','Trinh Enterprise',2403,'?','L','Y','?','2015-04-23 01:33:06','?','?','?','?' +'CHACOC','Hughes Landing',0,'?','?','Y','?','2015-04-27 16:34:22','?','?','?','?' +'CHACOC','Pratchett Legacy',0,'?','?','Y','?','2015-04-27 16:54:00','?','?','?','?' 'CHACOCHA','O''Neill Settlement',34,'N','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' 'CHACOCHA','Purbach Holdings',3050,'N','M','Y','N','2015-03-13 21:48:28','N','Y','Y','Y' 'CHAGIN','Macquorn Rankine Works',0,'?','?','Y','?','2015-03-15 09:29:15','?','?','?','?' @@ -3592,7 +3602,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CHAKMO','Kornbluth Hangar',351,'Y','M','Y','N','2015-03-18 00:44:15','Y','Y','Y','N' 'CHAKMO','Scithers Plant',480,'N','M','Y','N','2015-03-14 04:11:30','Y','Y','Y','Y' 'CHALBICI','Meade Platform',0,'?','?','Y','?','2015-03-02 15:12:00','?','?','?','?' -'CHAMATH','Altshuller Orbital',2654,'?','M','N','?','2015-04-16 12:44:39','?','?','?','?' +'CHAMATH','Altshuller Orbital',2654,'Y','M','N','?','2015-04-26 15:13:38','?','?','?','?' 'CHAMATH','Grothendieck Orbital',1125,'?','M','N','?','2015-04-16 12:44:39','?','?','?','?' 'CHAMATH','Kennicott Hub',1780,'?','L','Y','?','2015-04-12 09:21:06','?','?','?','?' 'CHAMBO','Deb Settlement',824,'Y','M','Y','N','2015-04-12 22:31:56','Y','Y','Y','N' @@ -3701,8 +3711,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CHENETI','South Port',1644,'N','M','?','N','2015-04-14 04:19:34','Y','Y','Y','Y' 'CHENETI','Wirtanen Port',50,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'CHENG DEN','Auld Market',121,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'CHENG DEN','Hutchinson Station',151,'N','L','Y','?','2015-02-23 23:54:35','?','?','?','?' -'CHENG DEN','Panshin Station',222,'N','L','Y','?','2015-02-23 23:54:35','?','?','?','?' +'CHENG DEN','Hutchinson Station',149,'N','L','Y','Y','2015-04-27 18:59:04','Y','Y','Y','Y' +'CHENG DEN','Panshin Station',215,'N','L','Y','Y','2015-04-27 18:59:36','Y','Y','Y','Y' 'CHERANG','Stjepan Seljan Base',0,'?','?','Y','?','2015-03-17 14:02:00','?','?','?','?' 'CHERANG','Swift Prospect',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'CHERBONES','Chalker Landing',576677,'N','M','Y','N','2015-03-18 06:51:16','N','Y','Y','Y' @@ -4069,7 +4079,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'CPD-70 2439','Godwin Dock',2026,'Y','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'CPD-70 2439','Szentmartony Dock',2026,'Y','M','Y','?','2015-04-03 21:28:52','?','?','?','?' 'CPD-70 2439','Weyn Dock',2026,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' -'CPO 24','Grabe Hangar',2707,'N','M','Y','N','2015-03-17 19:52:30','N','N','Y','Y' +'CPO 24','Grabe Hangar',2696,'N','M','Y','N','2015-04-26 20:22:42','N','N','Y','Y' 'CPO 24','Heng Terminal',397,'N','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','Y' 'CR DRACO','Celebi Hub',6,'Y','M','Y','N','2015-03-19 11:14:56','N','N','Y','Y' 'CR DRACO','Semeonis Settlement',10,'N','M','Y','N','2015-04-11 14:04:39','Y','Y','Y','Y' @@ -4144,6 +4154,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'DACIAN TSE','Sharman Camp',0,'?','?','Y','?','2015-03-15 11:54:00','?','?','?','?' 'DADAL','Dedman Landing',1183,'?','M','Y','N','2015-04-22 02:00:22','N','N','Y','Y' 'DADAL','Fiennes City',1647,'?','M','Y','N','2015-04-22 02:00:22','N','N','Y','Y' +'DAESITIATES','Ellis Gateway',0,'?','?','Y','?','2015-04-27 00:32:00','?','?','?','?' +'DAESITIATES','Stephenson Hub',1100,'N','?','?','N','2015-04-27 00:44:09','N','Y','Y','Y' 'DAGAZ','Wakata Refinery',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' 'DAGDHANGJEL','Pasteur Terminal',10029,'N','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'DAGR','Chaviano Platform',3189,'?','M','Y','?','2015-02-24 14:31:59','?','?','?','?' @@ -4806,7 +4818,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ERAVIANS','Godwin Orbital',0,'?','?','Y','?','2015-03-22 23:26:00','?','?','?','?' 'ERAVIANS','Thuot Gateway',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'ERH LONGO','Brongniart City',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'ERIO','Babakin Hub',30,'N','L','Y','Y','2015-02-23 23:54:35','?','?','?','?' +'ERIO','Babakin Hub',40,'N','L','Y','Y','2015-04-26 20:35:42','Y','Y','Y','Y' 'ERIO','Johri Gateway',2116,'?','M','?','?','2015-04-10 05:59:38','?','?','?','?' 'ERIO','Schaumasse Prospect',1500,'?','M','?','?','2015-04-10 05:59:27','?','?','?','?' 'ERISHIKO','Shirley Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -4830,6 +4842,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ESEASA','Vavrova Ring',199,'N','L','Y','Y','2015-04-11 22:41:21','Y','Y','Y','Y' 'ESHU','Shajn Terminal',1740,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' 'ESIEN MING','Cortes Dock',66,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' +'ESTAE','Cogswell Dock',0,'?','?','Y','?','2015-04-27 17:44:00','?','?','?','?' 'ESUMINDII','Heng Port',0,'?','?','Y','?','2015-04-11 14:04:12','?','?','?','?' 'ESUMINDII','Nourse City',1798,'N','L','Y','Y','2015-04-25 13:21:53','Y','Y','Y','Y' 'ESUSEKU','Clifford Hub',2412,'Y','M','Y','N','2015-03-20 12:32:05','N','Y','Y','Y' @@ -4932,6 +4945,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'EXPHIAY','Worlidge Hub',0,'?','?','Y','?','2015-03-07 09:14:46','?','?','?','?' 'EZ AQUARII','Magnus Gateway',498,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'EZERISHAPA','Nespoli Ring',0,'?','?','Y','?','2015-03-18 21:30:00','?','?','?','?' +'EZERNO','Fulton Relay',30,'?','M','Y','N','2015-04-27 05:13:15','N','Y','Y','Y' +'EZERNO','Wilcutt Orbital',20,'N','M','Y','N','2015-04-27 05:12:44','Y','N','Y','Y' 'FACECE','Fortress York',914,'?','L','Y','Y','2015-04-10 20:52:47','Y','Y','Y','Y' 'FACECE','Patrick Depot',1298,'?','L','Y','Y','2015-04-10 20:53:26','Y','Y','Y','Y' 'FACECE','Penrose Port',2528,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' @@ -5007,7 +5022,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'FINTIA','Alcock Relay',2201,'?','M','N','N','2015-02-26 17:06:26','N','N','Y','Y' 'FINTIA','Giclas Mines',370,'?','M','?','N','2015-04-14 04:19:34','N','Y','Y','Y' 'FINTIA','Ohain Platform',470,'?','L','?','Y','2015-04-14 04:19:34','Y','Y','Y','Y' -'FIONN','Burnell Terminal',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'FIONN','Burnell Terminal',322,'Y','M','Y','N','2015-04-26 14:29:13','N','Y','Y','N' 'FIONN','Currie Enterprise',128,'Y','L','Y','Y','2015-04-15 19:29:51','Y','Y','Y','Y' 'FIRDAUS','Bernoulli Hangar',8125,'?','M','Y','?','2015-04-11 20:02:23','?','?','?','?' 'FIRDAUS','Lynn Terminal',7776,'?','M','Y','?','2015-04-11 20:02:32','?','?','?','?' @@ -5504,7 +5519,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'GHEKREEP','Ali Station',17,'N','M','Y','N','2015-03-13 21:48:28','N','Y','Y','Y' 'GHEKREEP','Haber Dock',0,'?','M','N','N','2015-02-24 08:04:08','N','N','Y','Y' 'GHEKREEP','Townshend Gateway',17,'?','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'GHIMR','Kingsmill Hub',110,'?','L','Y','Y','2015-03-28 10:48:18','Y','Y','Y','Y' +'GHIMR','Kingsmill Hub',110,'N','L','Y','Y','2015-04-26 20:34:46','Y','Y','Y','Y' 'GHIMR','Santos Prospect',142,'?','M','Y','N','2015-03-28 10:49:06','N','N','Y','Y' 'GHIMR','Wells Orbital',142,'?','M','N','N','2015-03-28 10:48:48','N','Y','Y','Y' 'GIABAING','Jones City',0,'?','?','Y','?','2015-03-21 07:46:00','?','?','?','?' @@ -5767,7 +5782,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'GUANGUL','Laue''s Claim',247,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'GUANGUL','Poleshchuk Terminal',0,'?','?','Y','?','2015-04-17 05:00:07','?','?','?','?' 'GUANGUL','Sy Base',0,'?','?','Y','?','2015-04-19 16:40:00','?','?','?','?' -'GUARADA','Borel Outpost',0,'?','?','Y','?','2015-02-25 01:32:00','?','?','?','?' +'GUARADA','Borel Outpost',46105,'N','M','Y','N','2015-04-27 00:21:56','N','N','Y','Y' 'GUARAS','Doi Colony',0,'?','?','Y','?','2015-04-03 21:28:52','?','?','?','?' 'GUARAS','Hawley Port',207019,'Y','?','Y','?','2015-04-14 21:48:34','?','?','?','Y' 'GUARAS','Klimuk Ring',206332,'Y','L','Y','Y','2015-04-14 21:47:18','Y','Y','Y','Y' @@ -6695,6 +6710,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HIP 24655','Hogan Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'HIP 24923','Hennepin Platform',146994,'N','M','Y','N','2015-03-13 21:48:28','N','?','?','?' 'HIP 25231','Brouwer Works',0,'?','?','Y','?','2015-04-05 21:10:01','?','?','?','?' +'HIP 25359','Dassault Vision',0,'?','?','Y','?','2015-04-27 06:28:00','?','?','?','?' 'HIP 25559','Cantor Market',0,'?','?','Y','?','2015-04-17 13:00:07','?','?','?','?' 'HIP 25559','Eskridge Station',0,'?','?','Y','?','2015-04-17 13:00:07','?','?','?','?' 'HIP 25559','Russell Terminal',0,'?','?','Y','?','2015-04-17 13:00:07','?','?','?','?' @@ -6735,6 +6751,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HIP 28813','Schouten Ring',1755,'N','L','Y','Y','2015-04-15 16:01:19','Y','Y','Y','Y' 'HIP 29312','Morgan Orbital',958,'N','M','Y','N','2015-04-17 18:04:17','N','N','Y','N' 'HIP 29312','Ohm Horizons',651,'N','L','Y','Y','2015-04-22 06:15:00','Y','Y','Y','Y' +'HIP 29314','Furuta Dock',0,'?','?','Y','?','2015-04-27 06:00:00','?','?','?','?' 'HIP 29444','Gehry Dock',0,'?','M','Y','?','2015-04-11 14:04:08','?','?','?','?' 'HIP 296','Malvern Gateway',604,'N','L','Y','Y','2015-04-05 04:49:02','Y','Y','Y','Y' 'HIP 296','Nakamura City',0,'?','?','Y','?','2015-04-05 15:02:19','?','?','?','?' @@ -6889,7 +6906,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HIP 53719','Quick Orbital',420,'?','L','?','Y','2015-04-14 04:19:34','Y','Y','Y','Y' 'HIP 53719','Smith City',90,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'HIP 54040','Nesvadba Dock',0,'?','?','Y','?','2015-03-05 04:34:00','?','?','?','?' -'HIP 54083','Crossfield Hub',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'HIP 54083','Crossfield Hub',101,'N','?','Y','N','2015-04-26 09:02:35','N','Y','Y','Y' 'HIP 54422','Sagan Outpost',0,'?','?','Y','?','2015-03-19 19:48:00','?','?','?','?' 'HIP 5443','Apianus Mines',1336,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'HIP 5443','Belyavsky Works',796,'?','M','N','N','2015-03-14 18:43:00','N','N','Y','Y' @@ -7230,6 +7247,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HIP 81469','Corbusier City',2215,'N','M','Y','N','2015-03-13 21:48:28','Y','?','?','?' 'HIP 81469','Haack Port',3102,'N','M','?','N','2015-04-14 04:19:34','N','?','?','?' 'HIP 81662','McCoy Enterprise',11031,'Y','L','Y','Y','2015-03-15 05:09:22','Y','Y','Y','Y' +'HIP 81767','Belyayev Dock',0,'?','?','Y','?','2015-04-27 03:04:00','?','?','?','?' 'HIP 81831','Hilbert Port',0,'?','?','Y','?','2015-03-01 09:26:00','?','?','?','?' 'HIP 81831','Vlamingh Station',0,'?','?','Y','?','2015-03-01 09:36:00','?','?','?','?' 'HIP 81862','Bachman Dock',12803,'?','L','Y','Y','2015-03-27 21:16:10','Y','Y','Y','Y' @@ -7540,6 +7558,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HR 1064','Thomas Port',2433,'?','M','N','N','2015-03-28 12:11:45','N','Y','Y','Y' 'HR 1076','Elwood Dock',1584,'N','M','Y','N','2015-03-13 21:48:28','N','Y','Y','Y' 'HR 108','Krylov City',0,'?','?','Y','?','2015-03-21 14:16:00','?','?','?','?' +'HR 108','Terry Gateway',0,'?','?','Y','?','2015-04-26 20:06:00','?','?','?','?' 'HR 1139','Nasmyth Gateway',0,'?','?','Y','?','2015-04-18 11:50:00','?','?','?','?' 'HR 115','Schmidt Beacon',2097,'N','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'HR 1245','Crown Dock',12875,'N','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' @@ -7660,7 +7679,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HR 571','Bainbridge Market',1115,'N','L','Y','Y','2015-04-13 15:35:42','Y','Y','Y','Y' 'HR 571','Kopal Station',2078,'N','M','Y','N','2015-04-04 03:08:24','N','Y','Y','Y' 'HR 571','Shavyrin Terminal',616,'N','L','Y','Y','2015-04-04 02:56:11','Y','Y','Y','Y' -'HR 5751','Willis Oasis',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'HR 5751','Lander Survey',692,'Y','L','?','N','2015-04-26 08:41:43','N','Y','Y','Y' +'HR 5751','Willis Oasis',1218,'N','L','Y','N','2015-04-26 09:10:17','N','N','Y','Y' 'HR 5930','Crown Orbital',0,'?','?','Y','?','2015-04-17 01:00:07','?','?','?','?' 'HR 5960','Ali Orbital',2862,'Y','L','Y','Y','2015-03-15 14:44:03','Y','Y','Y','Y' 'HR 5960','Payette Dock',3810,'Y','M','Y','N','2015-03-15 14:44:37','Y','Y','Y','N' @@ -7716,15 +7736,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HR 7012','Lee Prospect',472,'N','M','Y','N','2015-04-11 02:32:14','N','N','Y','Y' 'HR 7047','Grant Dock',2567,'Y','L','Y','Y','2015-03-09 18:57:04','?','?','?','?' 'HR 7047','Kafka Terminal',3535,'N','M','Y','N','2015-03-09 18:58:48','?','?','?','?' -'HR 706','Chernykh Port',1513,'?','M','Y','?','2015-04-16 12:44:41','?','?','?','?' -'HR 706','Glushko Vision',1770,'?','L','Y','?','2015-04-16 12:44:41','?','?','?','?' -'HR 706','Kopal Orbital',345,'?','M','Y','?','2015-04-12 11:14:36','?','?','?','?' +'HR 706','Chernykh Port',1513,'?','M','Y','N','2015-04-26 04:58:23','N','?','Y','Y' +'HR 706','Glushko Vision',1770,'Y','L','Y','Y','2015-04-26 04:56:02','Y','Y','Y','Y' +'HR 706','Kopal Orbital',345,'?','M','Y','N','2015-04-26 05:04:38','N','?','Y','Y' 'HR 706','Laming Orbital',628,'N','L','Y','Y','2015-04-26 02:00:18','Y','Y','Y','Y' -'HR 706','Laurent Station',272,'?','M','Y','?','2015-04-12 11:14:17','?','?','?','?' -'HR 706','Riccioli Terminal',1501,'?','L','Y','?','2015-04-16 12:44:41','?','?','?','?' -'HR 706','Rubin Dock',1039,'?','M','?','?','2015-04-14 04:19:34','?','?','?','?' -'HR 706','Valz Orbital',431,'?','M','?','?','2015-04-14 04:19:34','?','?','?','?' -'HR 706','Wright Terminal',1517,'?','L','Y','?','2015-04-16 12:44:41','?','?','?','?' +'HR 706','Laurent Station',272,'?','M','Y','N','2015-04-26 05:05:38','Y','?','Y','Y' +'HR 706','Riccioli Terminal',1501,'?','L','Y','Y','2015-04-26 04:57:48','Y','Y','Y','Y' +'HR 706','Rubin Dock',1039,'?','M','?','?','2015-04-26 04:59:40','?','?','Y','Y' +'HR 706','Valz Orbital',431,'?','M','?','N','2015-04-26 05:02:11','Y','Y','Y','Y' +'HR 706','Wright Terminal',1517,'?','L','Y','Y','2015-04-26 05:08:19','Y','Y','Y','Y' 'HR 7079','Ochoa Terminal',870,'N','L','Y','Y','2015-04-13 19:26:05','Y','Y','Y','Y' 'HR 7221','Jewitt Port',1888,'N','L','Y','Y','2015-03-21 16:15:58','Y','Y','Y','Y' 'HR 7221','Veron City',1885,'N','L','Y','Y','2015-03-21 16:17:19','Y','Y','Y','Y' @@ -7752,7 +7772,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'HR 7766','Clair City',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'HR 7766','Crook Ring',0,'?','?','Y','?','2015-02-25 01:31:59','?','?','?','?' 'HR 7766','MacGregor Enterprise',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'HR 7766','Markov Hub',746,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' +'HR 7766','Markov Hub',746,'Y','L','Y','Y','2015-04-26 10:45:05','Y','Y','Y','Y' 'HR 7766','Sohl Station',1228,'Y','L','Y','?','2015-02-25 01:31:56','?','?','?','?' 'HR 7766','Tarski Gateway',404,'Y','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'HR 7793','Benyovszky Ring',3631,'?','L','Y','?','2015-04-12 09:51:13','?','?','?','?' @@ -8202,7 +8222,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'JADLILLKE','Markham Orbital',1075,'?','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' 'JAFNHAU','Battuta Port',302,'?','L','Y','Y','2015-04-05 23:25:30','Y','Y','Y','Y' 'JAFNHAU','Oppenheimer Hub',419,'?','M','Y','N','2015-04-05 23:25:11','N','N','Y','N' -'JAITIC','Nakaya Legacy',0,'?','?','Y','?','2015-03-15 14:44:00','?','?','?','?' +'JAITIC','Nakaya Legacy',745,'Y','M','Y','N','2015-04-26 07:17:07','Y','Y','Y','N' 'JAITU','Novitski Refinery',14,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'JAITU','Wetherbee Hanger',6,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'JAITYATA','Lorenz Horizons',10734,'N','M','Y','N','2015-04-14 04:23:00','N','N','Y','Y' @@ -8234,6 +8254,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'JARADHARRE','Szebehely Hub',526178,'Y','L','?','?','2015-02-23 23:54:35','?','?','?','?' 'JARALLAND','Efremov Prospect',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'JARALLAND','Petaja Settlement',0,'?','?','Y','?','2015-03-08 07:24:00','?','?','?','?' +'JARDONNERE','Kovalevskaya Prospect',0,'?','?','Y','?','2015-04-26 22:14:00','?','?','?','?' 'JARDOVICI','Shepherd Orbital',507,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'JARILDEKALD','Elvstrom Platform',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'JARILDEKALD','Reed Stop',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -8722,7 +8743,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'KATURI','Pook Hub',12810,'Y','M','N','N','2015-03-18 01:01:37','N','Y','Y','Y' 'KATURI','Priest City',1651,'N','M','Y','N','2015-03-18 01:01:37','N','Y','Y','Y' 'KATURI','Rubruck Hub',1652,'Y','M','Y','N','2015-03-18 01:01:37','Y','Y','Y','N' -'KATURI','Shiras Port',293,'N','L','Y','Y','2015-03-18 01:01:37','Y','Y','Y','Y' +'KATURI','Shiras Port',297,'N','L','Y','Y','2015-04-26 20:57:14','Y','Y','Y','Y' 'KATURI','Stjepan Seljan Port',397,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'KAUKAMAL','Dingle Port',407,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' 'KAUKAMAL','Wigura Vision',408,'Y','M','?','?','2015-02-23 23:54:35','?','?','?','?' @@ -8897,7 +8918,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'KHUN','Alexandrov Dock',331,'?','M','Y','?','2015-04-12 07:54:35','?','?','?','?' 'KHUN','Cremona Prospect',188,'?','M','N','?','2015-04-16 12:44:38','?','?','?','?' 'KHUZWANGPO','Bursch Landing',0,'?','?','Y','?','2015-04-11 14:04:33','?','?','?','?' -'KI','Binet Port',194,'?','L','Y','Y','2015-04-17 13:25:23','Y','Y','Y','Y' +'KI','Binet Port',194,'N','L','Y','Y','2015-04-26 10:30:33','Y','Y','Y','Y' 'KI','Hammond Vision',2504,'N','L','Y','N','2015-04-23 02:55:09','Y','Y','Y','Y' 'KI','Horowitz Orbital',541,'?','L','Y','Y','2015-04-18 07:40:24','Y','Y','Y','Y' 'KI','Mcbride Vision',1502,'N','L','Y','Y','2015-04-23 01:40:26','Y','Y','Y','Y' @@ -8983,13 +9004,16 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'KOJIN','Harness Depot',0,'?','?','?','N','2015-04-14 04:19:34','N','?','Y','Y' 'KOJINBAIA','Phillips Landing',40,'?','M','N','N','2015-03-13 21:48:28','Y','?','Y','Y' 'KOJINBAIA','Theodor Winnecke Orbital',23,'N','M','?','N','2015-04-14 04:19:34','N','?','Y','Y' +'KOKARA','Haller Port',0,'?','?','Y','?','2015-04-27 19:22:00','?','?','?','?' 'KOKARWANG','Sturckow Port',99,'Y','L','Y','Y','2015-03-18 20:33:10','Y','?','?','?' 'KOKARY','Cori Gateway',1757,'N','M','Y','N','2015-02-23 23:54:35','N','Y','Y','Y' 'KOKARY','Faraday Enterprise',95,'N','L','Y','Y','2015-02-25 01:32:00','Y','Y','Y','Y' 'KOKARY','Gidzenko Terminal',52,'Y','L','Y','Y','2015-02-23 23:54:35','Y','Y','Y','Y' 'KOKIPIK','Clifford Refinery',77761,'?','M','N','N','2015-04-24 11:59:07','N','Y','Y','Y' 'KOKIPIK','Laveykin Plant',77897,'?','M','Y','N','2015-04-24 11:58:20','Y','Y','Y','N' -'KOKOBII','Bauman Station',0,'?','L','?','Y','2015-04-14 04:19:34','Y','?','?','?' +'KOKOBII','Anderson Hub',2949,'N','M','?','N','2015-04-27 01:34:18','Y','Y','Y','Y' +'KOKOBII','Bauman Station',69,'N','L','?','Y','2015-04-27 01:12:42','Y','Y','Y','Y' +'KOKOBII','Kranz Gateway',259473,'Y','M','?','N','2015-04-27 01:53:00','N','Y','Y','N' 'KOKOI','Chun Stop',1136,'N','M','Y','N','2015-04-18 16:48:14','Y','Y','Y','Y' 'KOKOIMUDJI','Quinn Orbital',24,'N','M','Y','N','2015-04-12 09:17:11','Y','N','Y','Y' 'KOKOIMUDJI','Siodmak Station',10,'N','L','Y','Y','2015-04-12 09:16:40','Y','Y','Y','Y' @@ -9008,6 +9032,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'KOKOMINI','Anthony Station',476355,'?','M','?','?','2015-04-14 04:19:34','Y','?','?','?' 'KOKOMINI','Elder Port',476355,'?','M','?','?','2015-04-14 04:19:34','?','?','?','?' 'KOKONDA','Sandage Landing',0,'?','?','Y','?','2015-04-14 03:51:17','?','?','?','?' +'KOKOPATJI','Keeler Horizons',0,'?','?','Y','?','2015-04-27 22:24:00','?','?','?','?' 'KOKOTO','Herrington City',0,'?','?','Y','?','2015-03-29 03:23:36','?','?','?','?' 'KOKOTO','Pogue Hub',4061,'Y','L','Y','?','2015-03-16 01:28:01','?','?','?','?' 'KOKYAMBI','MacDonald Outpost',0,'?','?','Y','?','2015-04-07 21:42:00','?','?','?','?' @@ -9266,7 +9291,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'KUO ZHI','Swainson Dock',480,'Y','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' 'KUPALITES','Silverberg Hub',0,'?','?','Y','?','2015-03-28 04:02:19','?','?','?','?' 'KUPAN','Penrose Orbital',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'KUPARILDA','O''Neill Port',1841,'N','L','?','Y','2015-04-14 04:19:34','Y','?','Y','Y' +'KUPARILDA','O''Neill Port',1841,'N','L','Y','Y','2015-04-27 00:34:00','Y','?','Y','Y' 'KUPARILDA','Oshima Hub',2568,'Y','M','?','N','2015-04-14 04:19:34','Y','?','N','N' 'KUPOL BUMBA','Rennie Hub',108,'?','L','Y','Y','2015-04-06 14:43:25','Y','Y','Y','Y' 'KURED','Kuchner Vision',6,'N','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' @@ -9428,6 +9453,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LAGUNNOSSO','Wilkls Survey',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' 'LAGUVII','Barbosa Dock',630,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'LAHASIM','Beaufoy Reach',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'LAHU','Klein''s Exile',0,'?','?','Y','?','2015-04-27 13:06:00','?','?','?','?' 'LAHUA','Lorenz Works',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LAHUA','Sanger Horizons',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LAIAWA','Camarda Dock',286,'?','L','Y','?','2015-04-13 17:46:20','?','?','?','?' @@ -9502,7 +9528,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LALANDE 30699','Filipchenko Gateway',14546,'?','L','Y','Y','2015-03-16 03:11:14','Y','Y','Y','Y' 'LALANDE 30699','Walker Horizons',3333,'Y','M','Y','N','2015-03-18 06:51:17','N','Y','Y','N' 'LALANDE 31528','Derleth Dock',1402,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'LALANDE 37120','Voss Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'LALANDE 37120','Voss Dock',631,'Y','L','Y','Y','2015-04-27 02:00:47','Y','Y','Y','Y' 'LALANDE 37923','Keyes City',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' 'LALANDE 38451','Savery Plant',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LALANDE 38451','Underwood Platform',71,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' @@ -9561,8 +9587,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LAN DISK','Tall Orbital',0,'?','?','Y','?','2015-03-02 04:46:01','?','?','?','?' 'LAN SAMBA','Cook Base',1548,'?','M','Y','?','2015-04-11 14:04:16','?','?','?','?' 'LAN SAMBA','Meyrink Settlement',1250,'?','M','Y','?','2015-02-23 23:54:35','?','?','?','?' -'LAN TZAK','Jacobi Platform',0,'N','M','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'LAN TZAK','Reynolds Landing',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'LAN TZAK','Hamilton Holdings',1939,'N','M','?','N','2015-04-27 01:38:08','N','Y','Y','Y' +'LAN TZAK','Jacobi Platform',1417,'Y','M','Y','Y','2015-04-27 00:48:15','Y','Y','Y','Y' +'LAN TZAK','Reynolds Landing',1394,'N','M','Y','N','2015-04-27 01:22:29','Y','Y','Y','Y' 'LAN WANG','Fung Orbital',0,'?','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'LAN WANG','Hoffman Enterprise',0,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'LAN WANG','Teng-Hui Ring',0,'?','M','?','N','2015-04-14 04:19:34','Y','Y','Y','Y' @@ -9593,7 +9620,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LAO ZI','Van Vogt City',741,'N','L','Y','Y','2015-04-25 10:32:34','Y','Y','Y','Y' 'LAO ZI','Wafer City',23400,'N','M','Y','N','2015-03-18 20:33:12','Y','?','?','?' 'LARAIS','Burbank Orbital',375,'N','M','Y','N','2015-04-22 18:55:18','N','N','Y','Y' -'LARAIS','Volta Landing',884,'N','M','Y','N','2015-04-22 18:55:34','N','N','Y','Y' +'LARAIS','Volta Landing',737,'N','M','Y','N','2015-04-26 07:23:06','N','N','Y','Y' 'LARDHAMPT','Gresley Terminal',0,'?','?','Y','?','2015-03-29 14:40:00','?','?','?','?' 'LARGAM','Napier Terminal',535,'N','M','Y','N','2015-04-07 02:55:22','N','N','Y','Y' 'LARGARAYU','Mills Enterprise',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -10251,9 +10278,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LHS 3356','Pytheas Orbital',58,'?','L','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LHS 336','Klimuk Station',357,'Y','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' 'LHS 336','Payette Gateway',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'LHS 3384','Avdeyev Platform',1424,'Y','M','Y','N','2015-04-13 10:46:35','N','N','N','N' -'LHS 3384','Cavendish Mines',1424,'Y','M','?','?','2015-02-23 23:54:35','?','?','?','?' -'LHS 3384','Michelson Gateway',1422,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' +'LHS 3384','Avdeyev Platform',1922,'Y','M','Y','N','2015-04-26 05:53:04','N','N','N','N' +'LHS 3384','Cavendish Mines',1955,'Y','M','?','N','2015-04-26 05:38:36','N','N','Y','Y' +'LHS 3384','Michelson Gateway',1424,'Y','L','Y','Y','2015-04-26 05:37:29','Y','Y','Y','Y' 'LHS 3385','Alvarado Ring',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LHS 3385','Rasch Plant',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LHS 3385','Scalzi Station',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -10381,8 +10408,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LHS 4019','Buffett Works',2082,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'LHS 4019','Leibniz Mines',859,'N','M','Y','?','2015-04-09 11:44:00','?','?','?','?' 'LHS 4032','Asher Hub',1114,'Y','L','Y','Y','2015-04-09 01:17:06','Y','Y','Y','Y' -'LHS 4046','Klein Station',1673,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' -'LHS 4046','Malchiodi Port',1010,'N','L','Y','Y','2015-03-23 09:54:39','Y','Y','Y','Y' +'LHS 4046','Klein Station',1738,'?','M','Y','N','2015-04-27 16:56:23','N','N','Y','N' +'LHS 4046','Malchiodi Port',1011,'N','L','Y','Y','2015-04-27 16:56:05','Y','Y','Y','Y' 'LHS 4047','Barba Orbital',0,'?','L','Y','?','2015-03-21 01:14:00','?','?','?','?' 'LHS 4047','Waltz Terminal',0,'?','L','Y','?','2015-03-20 13:53:07','?','?','?','?' 'LHS 4047','Walz Terminal',0,'?','L','Y','?','2015-03-21 01:14:00','?','?','?','?' @@ -10522,6 +10549,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LIU HUANG','McDivitt Dock',11,'?','L','Y','?','2015-03-18 06:51:17','?','?','?','?' 'LIU LINKS','Stevin Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LIU PEI','Smith Outpost',14,'Y','M','?','?','2015-02-23 23:54:35','?','?','?','?' +'LIU XINGGA','Ashton Station',0,'?','?','Y','?','2015-04-27 16:14:00','?','?','?','?' +'LIU XINGGA','Maclean Hub',0,'?','?','Y','?','2015-04-27 16:52:00','?','?','?','?' +'LIU XINGGA','Pournelle Enterprise',0,'?','?','Y','?','2015-04-27 16:42:00','?','?','?','?' +'LIU XINGGA','Scalzi Port',0,'?','?','Y','?','2015-04-27 16:30:00','?','?','?','?' +'LIU XINGGA','Sharp Port',0,'?','?','Y','?','2015-04-27 17:04:00','?','?','?','?' 'LIU YANEC','Haber Dock',806,'Y','?','?','?','2015-02-23 23:54:35','?','?','?','?' 'LIU YANEC','Kurland Dock',21,'Y','L','Y','?','2015-04-11 14:04:35','?','?','?','?' 'LIU YINES','Baraniecki Orbital',0,'?','?','Y','?','2015-04-09 00:30:00','?','?','?','?' @@ -10548,7 +10580,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LOKIPI','Reed Installation',463,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'LOKITAKA MU','Forstchen Landing',306,'N','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','Y' 'LOKITAKA MU','Maclean Dock',224,'Y','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' -'LOKITES','Rawat Retreat',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'LOKITES','Rawat Retreat',1483,'Y','M','Y','N','2015-04-26 21:09:40','Y','Y','Y','Y' 'LOKO O','Illy Dock',1938,'?','M','?','N','2015-04-14 04:19:34','Y','Y','Y','Y' 'LOKO O','Savitskaya Hub',1939,'N','M','Y','N','2015-04-04 10:31:14','N','N','Y','N' 'LOKO OH','Al Sufi Port',1448,'?','M','N','?','2015-04-16 12:44:40','?','?','?','?' @@ -10811,7 +10843,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LP 685-43','Metz Vision',4265,'N','M','N','N','2015-03-14 04:11:30','N','N','Y','N' 'LP 69-457','Carrier Hub',0,'?','?','Y','?','2015-02-25 01:31:53','?','?','?','?' 'LP 69-457','Liska Platform',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' -'LP 694-16','Chapman Terminal',1824,'Y','L','Y','Y','2015-03-22 10:50:29','Y','Y','Y','Y' +'LP 694-16','Chapman Terminal',1806,'Y','L','Y','Y','2015-04-26 04:05:38','Y','Y','Y','Y' 'LP 7-226','Strzelecki Gateway',1589,'?','L','Y','?','2015-03-24 08:12:20','?','?','?','?' 'LP 701-7','Coulomb Station',28,'?','L','Y','Y','2015-04-05 13:59:33','Y','Y','Y','Y' 'LP 701-7','Creighton Hub',13,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','N' @@ -11120,6 +11152,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LTT 16741','Yegorov City',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' 'LTT 16764','Smith Orbital',0,'?','?','Y','?','2015-04-05 08:06:00','?','?','?','?' 'LTT 16764','Virtanen Ring',0,'?','?','Y','Y','2015-03-12 09:40:00','?','?','?','?' +'LTT 16910','Cayley Gateway',0,'?','?','Y','?','2015-04-27 01:30:00','?','?','?','?' +'LTT 16910','Mendez Ring',0,'?','?','Y','?','2015-04-27 01:14:00','?','?','?','?' 'LTT 16979','Adamson Platform',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LTT 16979','Bohm Settlement',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'LTT 17102','Velazquez Ring',637,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' @@ -11321,7 +11355,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LTT 7453','Clervoy Port',57,'Y','L','Y','Y','2015-04-17 04:31:25','Y','Y','Y','Y' 'LTT 7453','England Terminal',414,'?','L','Y','Y','2015-04-17 04:34:40','Y','Y','Y','Y' 'LTT 7453','Gidzenko Ring',258,'Y','L','Y','Y','2015-04-17 04:33:24','Y','Y','Y','Y' -'LTT 7453','Porsche Hub',747,'?','L','Y','Y','2015-04-17 04:36:05','Y','Y','Y','Y' +'LTT 7453','Porsche Hub',747,'N','L','Y','Y','2015-04-26 19:53:38','Y','Y','Y','Y' 'LTT 7488','Gutierrez Orbital',3044,'N','M','Y','N','2015-03-27 05:30:42','N','N','N','Y' 'LTT 7488','Merritt Hub',887,'N','M','Y','N','2015-04-03 21:28:52','Y','Y','Y','Y' 'LTT 7488','Rubin Vision',467,'N','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' @@ -11331,12 +11365,13 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'LTT 7509','Thoreau Horizons',13620,'N','M','Y','N','2015-03-13 21:48:28','N','?','?','?' 'LTT 7548','Alexandria Ring',1655,'N','M','Y','N','2015-04-17 04:16:09','Y','Y','Y','Y' 'LTT 7548','Boltzman In Gateway',0,'?','?','Y','?','2015-04-11 12:00:00','?','?','?','?' -'LTT 7548','Boltzmann Gateway',1001,'N','L','Y','Y','2015-04-05 20:33:00','Y','Y','Y','Y' +'LTT 7548','Boltzmann Gatbay',0,'?','?','Y','?','2015-04-27 17:08:00','?','?','?','?' +'LTT 7548','Boltzmann Gateway',1004,'N','L','Y','Y','2015-04-26 10:40:26','Y','Y','Y','Y' 'LTT 7548','Hutton City',1323,'N','M','N','N','2015-04-18 02:00:19','N','N','Y','N' 'LTT 7669','Hooke Station',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'LTT 7786','Foreman Dock',1001,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' -'LTT 7786','Kwolek Hub',1931,'Y','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'LTT 7786','Parise Gateway',213,'Y','L','Y','?','2015-03-08 07:58:00','?','?','?','?' +'LTT 7786','Foreman Dock',991,'N','M','Y','?','2015-04-26 10:33:01','?','Y','Y','Y' +'LTT 7786','Kwolek Hub',1848,'Y','M','Y','?','2015-04-26 10:34:57','Y','Y','Y','?' +'LTT 7786','Parise Gateway',213,'Y','L','Y','Y','2015-04-26 10:29:55','Y','Y','N','Y' 'LTT 779','Melroy Terminal',0,'?','?','Y','?','2015-02-24 08:15:19','?','?','?','?' 'LTT 7857','Velazquez Dock',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' 'LTT 7903','Allen Orbital',937,'N','L','Y','Y','2015-03-22 11:04:47','Y','Y','Y','Y' @@ -11985,12 +12020,12 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'MBUKURAVI','Musgrave Relay',957,'Y','M','N','N','2015-04-23 03:27:34','Y','Y','Y','Y' 'MBUKUSHU','He Penal Colony',1714,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'MBUTAS','Burkin Orbital',266,'N','L','Y','Y','2015-03-21 10:28:03','Y','Y','Y','Y' -'MBUTAS','Converse Gateway',16689,'N','M','Y','N','2015-03-21 10:23:53','N','N','Y','N' -'MBUTAS','Darlton Port',447,'Y','L','Y','Y','2015-03-21 10:47:36','Y','Y','Y','Y' +'MBUTAS','Converse Gateway',20205,'N','M','Y','N','2015-04-26 16:14:05','N','N','Y','N' +'MBUTAS','Darlton Port',445,'Y','L','Y','Y','2015-04-26 16:15:31','Y','Y','Y','Y' 'MBUTAS','Dozois Terminal',802,'?','L','Y','Y','2015-03-21 10:29:44','Y','Y','Y','Y' -'MBUTAS','Fernao Do Po Enterprise',1416,'N','M','Y','N','2015-03-21 10:26:59','N','N','Y','Y' -'MBUTAS','Goulart Port',1417,'Y','M','Y','N','2015-03-21 10:49:20','Y','Y','Y','Y' -'MBUTAS','McDevitt Orbital',2632,'N','M','Y','N','2015-03-21 10:24:57','Y','Y','Y','Y' +'MBUTAS','Fernao Do Po Enterprise',1418,'N','M','Y','N','2015-04-26 16:19:36','N','N','Y','Y' +'MBUTAS','Goulart Port',1416,'Y','M','Y','N','2015-04-26 16:21:12','Y','Y','Y','Y' +'MBUTAS','McDevitt Orbital',2638,'N','M','Y','N','2015-04-26 16:22:59','Y','Y','Y','Y' 'MBUTSI','Andrews Landing',0,'?','L','Y','Y','2015-03-27 13:20:04','Y','Y','Y','Y' 'MBUTSI','Erikson Vision',1330,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'MBUTSI','Scortia Dock',3081,'N','M','Y','N','2015-03-27 13:18:30','N','Y','Y','Y' @@ -12019,7 +12054,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'MEBEKRE','West Mines',0,'?','M','Y','?','2015-03-13 21:48:28','?','?','?','?' 'MEBES','Herbig Dock',0,'?','?','Y','?','2015-04-07 01:26:00','?','?','?','?' 'MEBES','Kohoutek Gateway',0,'?','?','Y','?','2015-02-28 01:36:00','?','?','?','?' -'MECHE','Rontgen Enterprise',0,'?','?','Y','?','2015-03-03 13:24:00','?','?','?','?' +'MECHE','Cooper Relay',186,'?','M','?','N','2015-04-26 08:01:04','N','Y','Y','Y' +'MECHE','Rontgen Enterprise',186,'N','M','Y','N','2015-04-26 07:53:53','Y','N','Y','Y' 'MECHELKANU','Leckie Arena',0,'?','?','Y','?','2015-04-11 14:04:48','?','?','?','?' 'MECHET','Crown Ring',2309,'N','M','Y','N','2015-03-14 04:11:30','N','N','Y','Y' 'MECHET','Robson Port',1225,'Y','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' @@ -12061,7 +12097,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'MEHIME','Dingle Survey',88,'?','M','N','?','2015-04-16 12:44:39','?','?','?','?' 'MEHIME','Sugie Landing',115,'?','M','?','?','2015-04-14 04:19:34','?','?','?','?' 'MEHINN','Kirtley Sanctuary',0,'?','?','Y','?','2015-02-25 13:36:00','?','?','?','?' -'MEHITA','Heyerdahl Depot',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'MEHITA','Heyerdahl Depot',371,'N','L','Y','N','2015-04-26 21:49:16','N','N','Y','Y' 'MEHUA','Bennett Port',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' 'MEHUDI','Reisman Station',0,'?','?','Y','?','2015-02-26 21:58:00','?','?','?','?' 'MEHUDTI','Pawelczyk Station',15888,'?','?','Y','?','2015-04-19 20:37:48','?','?','?','?' @@ -12342,7 +12378,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'MOROWARI','Moorcock Depot',2,'Y','M','N','N','2015-03-13 21:48:28','Y','?','?','?' 'MORRINA','Barjavel Vision',30,'N','L','Y','Y','2015-03-27 02:11:41','Y','Y','Y','Y' 'MORRINA','Beaumont Dock',130,'N','L','Y','Y','2015-04-09 20:50:14','Y','Y','Y','Y' -'MORRINA','Penn Orbital',17,'?','L','Y','?','2015-03-27 15:48:32','?','?','?','?' +'MORRINA','Penn Orbital',17,'N','L','Y','Y','2015-04-26 21:29:35','Y','Y','Y','Y' 'MORRONII','Wheelock Terminal',0,'?','?','Y','?','2015-03-17 20:54:00','?','?','?','?' 'MORTA','Franke Freeport',1243,'?','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' 'MORTEN','Murdoch Orbital',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -12501,6 +12537,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'MZ URSAE MAJORIS','Collins Settlement',1522,'N','M','Y','N','2015-03-13 21:48:28','N','N','Y','Y' 'MZ URSAE MAJORIS','Tenn Landing',1463,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'NA CHEM','Rorschach Horizons',0,'?','?','Y','?','2015-03-28 08:20:00','?','?','?','?' +'NA CHUN DI','Schouten Gateway',78,'N','L','?','Y','2015-04-26 21:20:29','Y','Y','Y','Y' 'NA ZHA','Rose Ring',1981,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'NABATEAN','Vishweswarayya Orbital',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'NADUNINDA','Dyr Enterprise',58,'N','M','Y','?','2015-03-13 21:48:28','Y','?','Y','Y' @@ -13274,9 +13311,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'OBAMBIVAS','Clebsch Terminal',593,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'OBAMBIVAS','Galouye Terminal',431,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'OBAMBIVAS','Kennan Orbital',431,'Y','L','Y','Y','2015-03-22 21:19:44','Y','Y','Y','Y' -'OBAMBOJAS','Meitner Hub',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'OBAMBOJAS','Melvill Gateway',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'OBAMBOJAS','Wheeler Hub',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'OBAMBOJAS','Meitner Hub',106,'?','M','Y','N','2015-04-26 21:14:47','N','N','Y','Y' +'OBAMBOJAS','Melvill Gateway',79,'?','M','Y','N','2015-04-26 21:12:46','N','N','Y','Y' +'OBAMBOJAS','Wheeler Hub',55,'N','L','Y','Y','2015-04-26 21:11:21','Y','Y','Y','Y' 'OBASTINI','Jahn Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'OBATO','Cseszneky Ring',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'OBATO','Dzhanibekov Terminal',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -13342,8 +13379,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'OGUNDA','Swainson Orbital',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'OGUNINKSMII','Anderson Platform',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' 'OGUNINKSMII','Carlisle Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' -'OHO BAJO','Coke Landing',1674,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' -'OHO BAJO','Herrington Colony',2515,'N','M','Y','?','2015-02-23 23:54:35','?','?','?','?' +'OHO BAJO','Coke Landing',1673,'Y','M','Y','N','2015-04-26 20:47:25','Y','Y','Y','Y' +'OHO BAJO','Herrington Colony',2512,'N','M','Y','N','2015-04-26 20:39:45','N','N','Y','Y' 'OICOAN','Gromov Camp',991,'?','M','?','?','2015-04-14 04:19:34','Y','?','?','?' 'OICORIO','Wilson Port',1006,'N','M','Y','N','2015-03-13 21:48:28','Y','N','Y','Y' 'OISI','Sheckley Station',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' @@ -13523,7 +13560,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'OTHE','Abnett Dock',0,'?','?','Y','?','2015-03-13 02:18:00','?','?','?','?' 'OTHE','Rustah Platform',0,'?','?','Y','?','2015-03-13 02:24:00','?','?','?','?' 'OTHEL','Anderson Colony',70,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' -'OTHEL','Ernst Refinery',37,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' +'OTHEL','Ernst Refinery',37,'?','M','Y','?','2015-04-27 15:14:00','?','?','?','?' 'OTHEL','Valz Installation',23,'N','L','Y','Y','2015-04-20 19:32:08','Y','Y','Y','Y' 'OTHERNI','Ryazanski Enterprise',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' 'OTHET','Hausdorff Port',56,'?','M','N','N','2015-03-22 13:04:49','N','N','Y','Y' @@ -13592,6 +13629,10 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'PAESIA','McCormick Ring',1387,'?','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'PAESIA','Ramon City',1102,'Y','L','Y','Y','2015-02-23 23:54:35','?','?','?','?' 'PAESTAE','Stefansson Dock',0,'?','?','Y','?','2015-02-23 23:54:35','?','?','?','?' +'PAESTE','Error',0,'?','M','?','?','2015-04-26 23:32:40','?','?','?','?' +'PAESTE','Hodgkin Port',32950,'N','M','Y','N','2015-04-27 00:18:13','N','N','N','Y' +'PAESTE','Merbold Station',0,'?','?','Y','?','2015-04-26 23:30:00','?','?','?','?' +'PAESTE','Vishweswarayya Dock',0,'?','?','Y','?','2015-04-26 23:14:02','?','?','?','?' 'PAI HULDR','Luther Installation',1590,'N','M','Y','N','2015-03-20 10:06:01','N','Y','Y','Y' 'PAI HULDR','Ryle Orbital',1556,'N','M','Y','N','2015-03-20 10:06:38','N','N','Y','N' 'PAI HULDR','Urkovic Station',1590,'N','L','Y','Y','2015-03-20 10:07:08','Y','Y','Y','Y' @@ -13790,15 +13831,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'PERADJARIU','Morris Dock',958,'N','M','?','?','2015-02-23 23:54:35','?','?','?','?' 'PERADJARIU','Vries Port',686,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'PERAESII','Brothers Vision',0,'?','?','?','?','2015-02-23 23:54:35','?','?','?','?' -'PERAESII','Charlier Terminal',53,'?','M','?','N','2015-04-14 04:19:34','N','Y','Y','Y' -'PERAESII','Danjon Port',1222,'N','L','Y','Y','2015-04-13 08:54:11','Y','Y','Y','Y' +'PERAESII','Charlier Terminal',54,'?','M','?','N','2015-04-26 22:23:29','N','Y','Y','Y' +'PERAESII','Danjon Port',1224,'N','L','Y','Y','2015-04-26 22:24:39','Y','Y','Y','Y' 'PERAESII','Deslandres Orbital',66,'?','L','Y','Y','2015-04-11 18:44:05','Y','Y','Y','Y' -'PERAESII','Elson Orbital',38,'?','M','Y','N','2015-04-11 18:42:01','Y','N','Y','Y' -'PERAESII','Espenak Port',559,'?','M','Y','N','2015-04-20 18:40:20','N','Y','Y','Y' +'PERAESII','Elson Orbital',38,'N','M','Y','N','2015-04-26 22:27:05','Y','N','Y','Y' +'PERAESII','Espenak Port',575,'?','M','Y','N','2015-04-26 22:27:38','N','Y','Y','Y' 'PERAESII','Giger Hub',12,'N','L','Y','Y','2015-04-11 18:35:55','Y','Y','Y','Y' -'PERAESII','Hickam Hub',83,'N','L','Y','Y','2015-04-14 10:01:37','Y','Y','Y','Y' +'PERAESII','Hickam Hub',84,'N','L','Y','Y','2015-04-26 22:28:52','Y','Y','Y','Y' 'PERAESII','Iben Dock',14,'?','M','Y','N','2015-04-11 18:40:35','Y','N','Y','Y' -'PERAESII','Trujillo Orbital',2456,'?','?','?','N','2015-04-20 18:44:07','Y','Y','Y','Y' +'PERAESII','Trujillo Orbital',2445,'?','M','?','N','2015-04-26 22:29:50','Y','Y','Y','Y' 'PERAGI','Babcock Hub',1394,'?','M','N','?','2015-04-16 12:44:47','?','?','?','?' 'PERAGI','Robert Dock',3870,'?','M','N','?','2015-04-16 12:44:47','?','?','?','?' 'PERAGI','Wafa Vision',1431,'?','L','Y','?','2015-04-14 08:16:43','?','?','?','?' @@ -13927,6 +13968,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'PIRANTAE','Dunlop Terminal',90,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'PIRANTAE','Parsons Dock',20,'?','M','N','N','2015-03-06 22:04:03','Y','Y','Y','Y' 'PIRAWOYN','Smith Refinery',956,'Y','M','Y','N','2015-04-07 02:00:22','Y','Y','Y','Y' +'PIRIGEN','Iben Dock',0,'?','?','Y','?','2015-04-27 06:16:00','?','?','?','?' 'PISAGI','Langley Mine',455,'N','M','?','N','2015-04-14 04:19:34','Y','?','?','?' 'PISALY','Bryusov Dock',14,'Y','L','Y','Y','2015-04-14 21:26:30','Y','Y','Y','Y' 'PISALY','Caryanda Dock',82,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' @@ -13989,6 +14031,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'POPOCASSA','Szameit Hub',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' 'POPOCATEPETL','Arago Refinery',13,'N','L','Y','Y','2015-04-12 15:43:47','Y','Y','Y','Y' 'POPOCATEPETL','Reinhold Port',3563,'?','M','Y','N','2015-04-12 15:44:31','N','N','Y','Y' +'POPONG O','Grandin Landing',0,'?','?','Y','?','2015-04-26 21:58:00','?','?','?','?' +'POPONG O','Grandin Langind',1810,'N','M','?','N','2015-04-26 21:55:30','N','N','Y','Y' +'POPONG O','Murray Works',0,'?','?','Y','?','2015-04-26 21:48:00','?','?','?','?' 'POPONNA','Ballard Ring',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'POPONNE','Abbot Port',100,'?','M','Y','N','2015-04-03 07:00:33','Y','N','Y','Y' 'POPONNE','Fan Port',57,'?','M','Y','N','2015-04-03 06:59:45','N','N','Y','N' @@ -14059,7 +14104,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'PSI CAPRICORNI','Shaw Holdings',4503,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' 'PSI OCTANTIS','Gernsback Settlement',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'PSI TAURI','Blackwell Station',0,'?','?','Y','?','2015-03-13 21:48:28','?','?','?','?' -'PSPF-LF 2','Geston Port',0,'?','?','Y','?','2015-03-12 11:04:00','?','?','?','?' +'PSPF-LF 2','Geston Port',1350,'Y','L','Y','Y','2015-04-26 12:49:27','Y','Y','Y','Y' 'PTAH','Barcelo Terminal',0,'?','?','Y','?','2015-02-25 01:38:00','?','?','?','?' 'PTHAA','Van de Sande Bakhuyzen Vision',0,'?','?','Y','?','2015-04-11 14:04:15','?','?','?','?' 'PUE ZHUA','Aitken Mine',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' @@ -14279,7 +14324,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'RAUTA','Giraud Station',505,'?','L','Y','?','2015-04-12 07:39:34','?','?','?','?' 'RAUTA','Herzog Hub',869,'?','M','Y','?','2015-04-12 07:39:53','?','?','?','?' 'RAUTAMA','Melroy Market',371,'Y','M','?','?','2015-04-14 04:19:34','Y','?','?','?' -'RAVANAHUTIS','Lounge Terminal',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' +'RAVANAHUTIS','Lounge Terminal',1390,'N','M','Y','N','2015-04-26 08:02:23','Y','Y','Y','Y' 'RBS 1843','Bernard Landing',40,'N','M','Y','N','2015-03-13 21:48:28','N','N','Y','N' 'RBS 1843','Nyberg Dock',24,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'RBS 1843','Scott Orbital',14,'Y','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' @@ -14347,7 +14392,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'RHO GEMINORUM','Khan City',11536,'Y','L','?','Y','2015-02-23 23:54:36','?','?','?','?' 'RHO GEMINORUM','Macquorn Rankine Gateway',11536,'Y','L','Y','Y','2015-02-23 23:54:36','?','?','?','?' 'RHO GEMINORUM','Wang Ring',10504,'N','M','?','?','2015-02-23 23:54:36','?','?','?','?' -'RHO GEMINORUM','Whitworth Station',11532,'Y','L','?','Y','2015-02-23 23:54:36','?','?','?','?' +'RHO GEMINORUM','Whitworth Station',11532,'Y','L','Y','Y','2015-04-27 09:26:35','Y','Y','Y','Y' 'RHO INDI','Erikson Retreat',7786,'N','M','Y','N','2015-03-13 21:48:28','N','?','?','?' 'RHO PUPPIS','Song Orbital',303,'N','M','?','?','2015-02-23 23:54:36','?','?','?','?' 'RHO TUCANAE','Lewis Survey',3508,'?','M','Y','?','2015-04-11 04:20:00','?','?','?','?' @@ -14383,7 +14428,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'RINGARDHA','Lagrange Gateway',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'RISH','Harbaugh Hub',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'RISH','Salk Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' -'RISHADI','Poncelet Outpost',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'RISHADI','Poncelet Outpost',13813,'N','M','Y','N','2015-04-26 10:47:20','Y','Y','Y','Y' 'RISHAIR','Lindblad Port',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'RISHALU','Pryor''s Claim',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'RISHATKWALI','Mouchez Gateway',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -14459,7 +14504,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ROSS 210','Fernandes de Queiros Dock',135,'N','M','Y','?','2015-02-23 23:54:36','?','?','?','?' 'ROSS 210','Fu City',255,'Y','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' 'ROSS 210','Lanier Orbital',2622,'N','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'ROSS 210','Lunan Dock',434,'N','M','?','?','2015-04-14 04:19:34','?','?','?','?' +'ROSS 210','Lunan Dock',434,'N','M','Y','?','2015-04-27 12:24:00','?','?','?','?' 'ROSS 210','Quinn Dock',2818,'N','M','Y','?','2015-03-13 21:48:28','?','?','?','?' 'ROSS 210','Swift Gateway',92,'N','M','Y','N','2015-03-13 21:48:28','N','Y','Y','Y' 'ROSS 210','Tokubei Ring',342,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' @@ -14611,7 +14656,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'ROSS 860','Mcdaniel Terminal',0,'?','?','Y','?','2015-02-26 23:44:00','?','?','?','?' 'ROSS 860','Sullivan Port',49,'Y','L','Y','Y','2015-03-14 04:11:30','?','?','?','?' 'ROSS 860','Wedge Hub',49,'Y','L','Y','?','2015-02-23 23:54:36','?','?','?','?' -'ROSS 878','Jakes Enterprise',303,'?','L','Y','?','2015-02-23 23:54:36','?','?','?','?' +'ROSS 878','Jakes Enterprise',303,'N','L','Y','Y','2015-04-27 10:17:27','Y','Y','Y','Y' 'ROSS 878','Wells High',116000,'?','M','?','?','2015-02-23 23:54:36','?','?','?','?' 'ROSS 878','Wells Ring',100892,'?','M','Y','?','2015-03-25 15:40:57','?','?','?','?' 'ROSS 89','Burnell Terminal',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' @@ -14799,7 +14844,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SANNA','Brahe Terminal',3856,'Y','M','N','N','2015-03-13 21:48:28','Y','?','?','?' 'SANNA','Godfrey''s Halt',207,'Y','L','Y','Y','2015-04-06 12:24:33','Y','Y','Y','Y' 'SANNA','Lamarck Dock',5065,'N','M','Y','N','2015-04-26 03:25:38','N','N','Y','Y' -'SANNA','Skyline High',207,'Y','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' +'SANNA','Skyline High',208,'N','L','Y','Y','2015-04-27 03:07:21','Y','Y','Y','Y' 'SANOPIJCHA','Maire City',0,'?','?','Y','?','2015-03-01 19:18:00','?','?','?','?' 'SANOPIJCHA','Ron Hubbard Orbital',0,'?','?','Y','?','2015-03-01 20:04:00','?','?','?','?' 'SANTA MUERTE','Clauss Port',0,'?','?','?','N','2015-04-14 04:19:34','N','N','Y','Y' @@ -14814,13 +14859,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SANUI','Leclerc Horizons',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SANUKU','Yamazaki Base',0,'?','?','Y','?','2015-03-01 22:24:00','?','?','?','?' 'SANUMA','Du Inyach Gateway',0,'?','?','Y','?','2015-03-14 20:18:00','?','?','?','?' -'SANUMA','Dunyach Gateway',6000,'N','M','Y','?','2015-03-14 04:11:30','?','?','?','?' +'SANUMA','Dunyach Gateway',6000,'N','M','Y','Y','2015-04-26 21:07:21','Y','Y','Y','Y' 'SAO 196806','Mastracchio Port',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SAO 196806','Reisman Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SAO 92746','Andree''s Pride',0,'?','M','N','N','2015-03-13 21:48:28','N','Y','Y','Y' 'SAO 92746','Szentmartony Station',0,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'SAONTIANA','Barjavel Port',12,'N','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'SAONTIANA','Kirtley Platform',0,'N','?','?','N','2015-04-14 04:19:34','N','N','Y','Y' +'SAPIETY','Skripochka Hub',0,'?','?','Y','?','2015-04-27 23:14:00','?','?','?','?' 'SAPII','Hadid Mines',0,'?','?','Y','?','2015-04-06 16:32:00','?','?','?','?' 'SAPITES','Fibonacci Prospect',1408,'?','M','Y','N','2015-03-25 06:23:41','N','N','Y','Y' 'SAPITES','Ingstad Platform',626,'?','M','Y','N','2015-03-25 06:23:22','N','Y','Y','Y' @@ -14848,7 +14894,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SAWADBHAKUI','Stiegler Landing',22,'N','M','?','N','2015-04-14 04:19:34','Y','N','Y','Y' 'SAWASIR','Bohnhoff Base',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SAWASIR','Tsunenaga Outpost',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' -'SAYA','Dzhanibekov Station',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' +'SAYA','Dzhanibekov Station',59,'Y','L','Y','N','2015-04-26 22:15:58','Y','Y','Y','N' +'SAYA','Hale Point',2382,'Y','L','Y','N','2015-04-27 01:20:56','Y','Y','Y','N' 'SAYANGO','Seamans Survey',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SCEPTRUM','Heceta Orbital',0,'?','?','Y','?','2015-04-11 14:04:50','?','?','?','?' 'SCIRTH','Bordage Hub',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -14908,6 +14955,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SEKHEMET','Vittori Gateway',1084,'N','M','Y','N','2015-04-16 19:43:03','Y','Y','Y','Y' 'SEKHENSES','Carver Station',259,'N','M','Y','N','2015-04-02 02:15:17','N','N','Y','N' 'SEKHENSES','Herzfeld Hub',192,'Y','L','Y','Y','2015-04-01 14:29:33','Y','Y','Y','Y' +'SEKHEREKE','Abetti Station',0,'?','?','Y','?','2015-04-28 01:22:00','?','?','?','?' +'SEKHEREKE','An Defison Station',0,'?','?','Y','?','2015-04-28 01:02:47','?','?','?','?' 'SEKHMETURES','Forfait Ring',455,'N','L','Y','Y','2015-04-03 17:04:32','Y','Y','Y','Y' 'SEKHMETURES','Lambert Horizons',11608,'N','M','Y','N','2015-04-03 17:40:44','N','N','Y','Y' 'SEKHMETURES','Williams Horizons',677,'N','M','Y','N','2015-04-03 17:19:11','N','N','Y','N' @@ -15206,6 +15255,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SIKI','Lee Vision',264,'N','M','Y','N','2015-04-19 17:23:25','N','N','Y','Y' 'SILINJA','Messerschmid Landing',1330,'N','M','Y','N','2015-03-14 04:11:30','N','?','?','?' 'SILINJA','Needham Horizons',834,'N','M','Y','?','2015-02-23 23:54:36','?','?','?','?' +'SILURION','Carstensz Port',2209,'N','L','Y','N','2015-04-26 21:11:11','N','N','Y','N' 'SILUROR','Abel Terminal',76,'Y','L','Y','Y','2015-04-07 06:15:54','Y','Y','Y','Y' 'SILUROR','Baxter Port',336,'?','M','?','?','2015-03-21 12:03:47','?','?','?','?' 'SILUROR','Burstein Terminal',2616,'?','M','?','?','2015-03-21 12:04:55','?','?','?','?' @@ -15326,7 +15376,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SOKARIANG','Penzias City',68,'?','L','Y','Y','2015-04-04 08:40:03','Y','Y','Y','Y' 'SOKARIANG','Rankin Hub',126,'?','L','Y','Y','2015-04-04 08:41:33','Y','Y','Y','Y' 'SOKATE','Behnisch Terminal',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' -'SOKATINES','Inoda Ring',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'SOKATINES','Inoda Ring',262,'N','L','Y','Y','2015-04-26 11:05:14','Y','Y','Y','Y' 'SOKN','Whitelaw Station',87420,'Y','L','?','Y','2015-04-14 04:19:34','Y','Y','Y','Y' 'SOKOBII','Dashiell Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'SOKOI','Kopal Survey',50580,'N','M','Y','N','2015-04-03 21:28:52','N','N','Y','N' @@ -15379,7 +15429,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'SOPONTET','Gernhardt Dock',40,'?','L','Y','?','2015-04-06 03:18:41','?','?','?','?' 'SOPONTET','McDivitt Port',655,'?','M','?','?','2015-04-06 03:19:32','?','?','?','?' 'SOPONTET','Parker City',47,'N','L','Y','Y','2015-04-26 01:56:00','Y','Y','Y','Y' -'SOPONTET','Thoreau Port',24,'?','L','Y','?','2015-04-12 10:52:00','?','?','?','?' +'SOPONTET','Thoreau Port',24,'Y','L','Y','Y','2015-04-26 02:11:15','Y','Y','Y','Y' 'SORBAGO','Carroll Survey',247,'N','M','Y','N','2015-03-13 21:48:28','Y','?','?','?' 'SORBAGO','Dalgarno Colony',247,'N','M','N','N','2015-03-13 21:48:28','N','?','?','?' 'SORBAGO','Hencke Orbital',247,'N','L','Y','Y','2015-03-13 21:48:28','Y','?','?','?' @@ -15742,7 +15792,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'TARTARUS','Foerster Vision',375,'N','M','Y','N','2015-03-13 21:48:28','N','N','Y','Y' 'TARUDE','Mendez Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'TARUP','Barbuy Survey',0,'?','?','?','?','2015-03-18 01:04:33','?','?','?','?' -'TARUTAALLI','Mayer City',0,'?','?','Y','Y','2015-04-19 20:07:48','Y','Y','Y','Y' +'TARUTAALLI','Mayer City',387,'Y','L','Y','Y','2015-04-26 07:42:18','Y','Y','Y','Y' 'TASO WANG','Nicollier Dock',0,'?','?','?','?','2015-02-23 23:54:36','?','?','?','?' 'TASO WANG','Thagard Gateway',0,'?','?','?','?','2015-02-23 23:54:36','?','?','?','?' 'TASO WANG','Velazquez Gateway',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -15898,7 +15948,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'TENG YEH','Vo Dock',50932,'?','M','Y','N','2015-03-25 12:21:23','N','N','Y','Y' 'TENG YEH','Whitworth City',50864,'?','M','Y','N','2015-03-25 12:22:52','Y','Y','Y','N' 'TENGRI','Guanine Quadruplex',799,'?','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' -'TENGRI','Vic Venables',1103,'?','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' +'TENGRI','Vic Venables',1103,'N','L','Y','Y','2015-04-27 01:20:51','Y','Y','Y','Y' 'TEORGE','Janszoon Station',907,'N','M','Y','N','2015-03-13 21:48:28','N','?','?','?' 'TEORGE','Sternberg Platform',1546,'N','M','Y','N','2015-03-13 21:48:28','Y','?','?','?' 'TEPECHUA','Miller Mines',2166,'N','M','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -15966,6 +16016,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'THANATOS','Condit''s Legacy',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'THARAMAMOR','Preuss Prospect',0,'?','?','Y','?','2015-04-19 09:36:00','?','?','?','?' 'THARI','Jones Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' +'THARUWA','Barnaby Point',929,'N','L','Y','N','2015-04-27 01:56:04','N','N','Y','Y' 'THARVIRI','Lovelace Orbital',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'THARWANGU','White Mines',1613,'?','M','?','N','2015-04-14 04:19:34','N','N','Y','Y' 'THATA','Berliner Plant',1844,'N','M','Y','N','2015-03-13 21:48:28','N','N','Y','Y' @@ -16095,6 +16146,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'TIMBO','Drake Reach',826,'Y','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','Y' 'TIMOCANI','Pennington Terminal',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'TIMOCANI','Seega Port',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' +'TINIA','Levi-Strauss Markbi',0,'?','?','Y','?','2015-04-26 23:30:01','?','?','?','?' +'TINIA','Levi-Strauss Market',0,'?','?','Y','?','2015-04-26 23:30:00','?','?','?','?' 'TIOLCE','Bennett Station',2597,'Y','M','Y','N','2015-03-14 04:11:30','Y','Y','Y','N' 'TIOLCE','Gordon Terminal',158,'Y','L','Y','Y','2015-03-14 04:11:30','Y','Y','Y','Y' 'TIOLCE','Grissom Dock',92,'Y','M','Y','N','2015-03-14 04:11:30','N','N','Y','Y' @@ -16344,7 +16397,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'TVASTYAS','Howard Terminal',0,'?','?','Y','?','2015-02-28 15:14:00','?','?','?','?' 'TVASUKI','Pullman Colony',0,'?','M','Y','?','2015-03-18 20:33:35','Y','?','?','?' 'TVASUKI','Thompson Installation',0,'?','M','Y','?','2015-03-18 20:33:35','Y','?','?','?' -'TVASUS','Potter Outpost',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'TVASUS','Potter Outpost',3437,'N','L','Y','N','2015-04-26 08:11:33','Y','N','Y','Y' 'TWO LADIES','Beekman Platform',7890,'Y','M','Y','N','2015-04-23 19:28:17','Y','Y','Y','N' 'TWO LADIES','Shinn Orbital',4359,'Y','M','Y','N','2015-04-23 19:26:48','Y','Y','Y','N' 'TXAMSEM','Ramsbotcom Works',0,'?','?','Y','?','2015-03-14 18:43:11','?','?','?','?' @@ -16442,7 +16495,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'UMED','Stafford Terminal',774,'?','L','Y','Y','2015-04-22 22:18:14','Y','Y','Y','Y' 'UMISTAN','Hilmers Installation',0,'?','?','?','?','2015-02-23 23:54:36','?','?','?','?' 'UMISTAN','Virts Colony',0,'?','?','?','?','2015-02-23 23:54:36','?','?','?','?' -'UMUTEI','Wedge Outpost',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' +'UMUTEI','Wedge Outpost',270,'?','?','Y','?','2015-04-26 09:05:00','?','?','?','?' 'UMVELIS','Svavarsson Arena',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'UN NAGAIT','Mattei Mines',4380,'?','M','Y','N','2015-03-20 21:25:28','N','N','Y','Y' 'UN NO MYOIN','Searfoss Refinery',2335,'N','M','Y','N','2015-03-18 01:01:37','N','Y','Y','Y' @@ -16548,8 +16601,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'V1688 AQUILAE','Littlewood Terminal',284,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'V1688 AQUILAE','Rangarajan Port',4869,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'V1688 AQUILAE','Thompson Terminal',386,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' -'V1703 AQUILAE','Bosch Settlement',245,'N','M','Y','N','2015-03-18 06:51:16','N','Y','Y','Y' -'V1703 AQUILAE','Houssay Plant',245,'N','M','Y','N','2015-03-16 18:56:21','N','Y','Y','Y' +'V1703 AQUILAE','Bosch Settlement',245,'N','M','Y','N','2015-04-26 14:25:00','N','N','Y','Y' +'V1703 AQUILAE','Houssay Plant',245,'N','M','Y','N','2015-04-26 14:06:41','N','N','Y','Y' 'V2151 CYGNI','Eyharts Hub',2830,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'V2160 CYGNI','Reynolds Dock',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'V2213 OPHIUCHII','De Andrade Dock',3286,'Y','L','Y','Y','2015-03-15 05:09:22','Y','Y','Y','Y' @@ -16633,8 +16686,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'VAIUNIA','Mattei Point',461,'?','M','N','N','2015-03-20 22:06:48','Y','Y','Y','Y' 'VAIUNIA','Schoenherr Terminal',323,'?','M','?','N','2015-04-14 04:19:34','Y','Y','Y','Y' 'VAK','Bothezat Horizons',420,'?','L','Y','?','2015-04-10 05:44:36','?','?','?','?' +'VAKA','Dufai Vision',773,'Y','M','?','N','2015-04-26 20:27:01','N','?','Y','?' 'VAKA','Dufay Vision',777,'?','M','?','N','2015-04-14 04:19:34','N','Y','Y','N' -'VAKA','Zenbei Orbital',723,'N','L','Y','Y','2015-04-11 02:00:26','Y','Y','Y','Y' +'VAKA','Zenbei Orbital',727,'N','L','Y','Y','2015-04-26 20:34:54','Y','Y','Y','Y' 'VALDA','Bohnhoff Hub',0,'?','M','Y','?','2015-02-23 23:54:36','?','?','?','?' 'VALDA','Clairaut Dock',1044,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'VALDA','Eilenberg Ring',0,'?','L','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -16707,7 +16761,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'VELABRI','Baade Port',0,'N','L','Y','Y','2015-04-17 16:04:26','Y','Y','Y','Y' 'VELAO','Wang Platform',0,'?','?','Y','?','2015-04-14 03:51:17','?','?','?','?' 'VELIM','Bunnell Port',12753,'Y','L','Y','Y','2015-04-11 06:40:54','Y','Y','Y','Y' -'VELINGAI','Hennen Stop',354,'N','M','Y','N','2015-03-13 21:48:28','N','N','Y','Y' +'VELINGAI','Hennen Stop',357,'N','M','Y','N','2015-04-26 20:15:26','N','N','Y','Y' 'VELLAMO','Conrad Terminal',0,'?','?','Y','?','2015-03-04 19:46:13','?','?','?','?' 'VELLIEP','Flammarion Installation',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'VELLIEP','Ikeya Plant',11,'N','L','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -16860,6 +16914,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'VOTAMA','Tarentum Mine',22,'?','M','N','N','2015-03-15 22:09:11','Y','N','Y','Y' 'VOTAMA','Williams Platform',13,'N','M','Y','Y','2015-03-18 01:01:38','Y','N','Y','Y' 'VOTAT','Oluwafemi Vision',649,'N','M','Y','?','2015-02-23 23:54:36','?','?','?','?' +'VOTATINI','Boyer Orbital',0,'?','?','Y','?','2015-04-26 21:52:00','?','?','?','?' 'VOTATINI','Valigursky Orbital',3809,'N','L','Y','Y','2015-04-05 16:11:24','Y','Y','Y','Y' 'VUCAB CAKIX','Riebe Reach',0,'?','?','Y','?','2015-03-02 08:16:00','?','?','?','?' 'VUCUB HUAN','Walter Prospect',355,'N','M','Y','N','2015-03-13 21:48:28','N','?','?','?' @@ -17020,9 +17075,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'WASENS','Hardy Terminal',4160,'N','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','Y' 'WASETAE','Babcock Mines',477,'N','M','Y','?','2015-02-23 23:54:36','?','?','?','?' 'WASETAE','Borman Colony',58648,'?','M','?','?','2015-03-13 21:48:28','?','?','?','?' -'WASHODIA','Norton Ring',480,'?','M','Y','N','2015-04-06 09:11:28','N','N','Y','N' -'WASHODIA','Ordway City',504,'?','M','Y','N','2015-04-06 09:12:12','N','N','Y','Y' -'WASHODIA','Rayhan Al-Biruni Port',490,'?','L','Y','Y','2015-04-06 09:10:49','Y','Y','Y','Y' +'WASHODIA','Norton Ring',637,'?','M','Y','N','2015-04-27 16:31:47','N','N','Y','N' +'WASHODIA','Ordway City',650,'?','M','Y','N','2015-04-27 16:32:30','N','N','Y','Y' +'WASHODIA','Rayhan Al-Biruni Port',628,'Y','L','Y','Y','2015-04-27 16:30:49','Y','Y','Y','Y' 'WAT YU','Cameron Gateway',83,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'WAT YU','Maclean Port',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'WAT YU','Musgrave Station',144,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -17084,7 +17139,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'WICHAIMI','Takamizawa Hub',146,'?','M','?','?','2015-03-24 07:22:03','?','?','?','?' 'WIDJABIHIKO','Hale Vision',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'WIDJABIHIKO','Watanabe Dock',0,'?','M','?','?','2015-02-23 23:54:36','?','?','?','?' -'WIDOW''S LIGHT','Pasteur Orbital',0,'Y','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' +'WIDOW''S LIGHT','Carter Hub',4169,'?','M','?','N','2015-04-26 08:30:23','N','N','Y','Y' +'WIDOW''S LIGHT','Fraley Gateway',4155,'?','M','?','N','2015-04-26 08:30:32','Y','Y','Y','N' +'WIDOW''S LIGHT','Pasteur Orbital',173,'Y','L','Y','Y','2015-04-26 08:25:07','Y','Y','Y','Y' 'WIKANAWAL','Schwann Hub',12186,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' 'WIKATABAR','Bunsen Gateway',0,'?','?','Y','?','2015-02-23 23:54:36','?','?','?','?' 'WIKE MANDJI','Card Dock',0,'?','?','Y','?','2015-04-03 21:28:52','?','?','?','?' @@ -17623,7 +17680,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'YEN TI','Samuda Plant',0,'?','M','?','?','2015-02-23 23:54:36','?','?','?','?' 'YENADA','Piccard Settlement',1153,'?','M','Y','?','2015-03-26 00:50:00','?','?','Y','Y' 'YENADA','Stafford Landing',1585,'?','M','?','?','2015-03-15 08:13:55','?','?','?','?' -'YENATES','Ashton Port',10882,'N','M','Y','N','2015-03-13 21:48:28','Y','Y','Y','N' +'YENATES','Ashton Port',10861,'N','M','Y','N','2015-04-26 07:17:09','Y','Y','Y','N' 'YENIC','Sylvester Dock',420,'Y','L','Y','?','2015-02-23 23:54:36','?','?','?','?' 'YENIC','Walters Dock',603,'Y','M','Y','?','2015-02-23 23:54:36','?','?','?','?' 'YENIKLIS','Bunch Prospect',34,'N','?','Y','?','2015-02-23 23:54:36','?','?','?','?' @@ -17642,7 +17699,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'YIMANBIN','Afanasyev Gateway',2032,'?','M','N','?','2015-04-16 12:44:46','?','?','?','?' 'YIMANBIN','Bridges Port',2040,'?','M','N','?','2015-04-16 12:44:46','?','?','?','?' 'YIMANBIN','Farkas Port',60,'?','L','N','?','2015-04-16 12:44:46','?','?','?','?' -'YIMANBIN','Hawley Dock',107,'?','L','Y','?','2015-04-14 08:07:03','?','?','?','?' +'YIMANBIN','Hawley Dock',107,'N','L','Y','Y','2015-04-26 09:48:18','Y','Y','Y','Y' 'YIMANBIN','Knight Gateway',2063,'?','M','N','?','2015-04-16 12:44:46','?','?','?','?' 'YIMANBIN','Lindsey Hub',2040,'?','L','N','?','2015-04-16 12:44:46','?','?','?','?' 'YIMANBIN','Mach City',176,'?','L','N','?','2015-04-16 12:44:46','?','?','?','?' @@ -17671,6 +17728,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'YOTANI','Godwin Landing',0,'?','?','Y','?','2015-04-14 03:51:17','?','?','?','?' 'YOUMING','Bierce Station',666,'N','M','Y','N','2015-04-05 13:40:08','N','N','Y','Y' 'YOUMING','Warner Mines',1140,'?','M','?','N','2015-04-14 04:19:34','Y','N','Y','Y' +'YS','Ashdown',0,'?','?','Y','?','2015-04-27 17:40:00','?','?','?','?' 'YU CH''IANG','Vesalius Survey',0,'?','?','Y','?','2015-04-11 14:04:23','?','?','?','?' 'YU CHUJ','Dyson Dock',0,'?','?','Y','?','2015-03-13 21:48:28','?','?','?','?' 'YU DI YI','Aksyonov Orbital',16,'Y','L','Y','Y','2015-03-13 21:48:28','Y','Y','Y','Y' @@ -17679,7 +17737,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size,market, 'YU HSIEN TU','Mackenzie Terminal',1231,'Y','L','Y','?','2015-02-23 23:54:36','?','?','?','?' 'YU HSIEN TU','Norgay Ring',484,'?','M','Y','?','2015-02-25 00:04:02','?','?','?','?' 'YU HSIEN TU','Szentmartony Orbital',1229,'N','L','Y','?','2015-02-23 23:54:36','?','?','?','?' -'YU HSINDA','Jenkins Camp',0,'?','?','Y','?','2015-04-26 19:55:49','?','?','?','?' +'YU HSINDA','Jenkins Camp',0,'?','M','Y','?','2015-04-26 18:15:23','?','?','?','?' 'YU SHANWEN','Lagadha Arena',0,'?','?','Y','?','2015-04-06 15:38:00','?','?','?','?' 'YU SHOU','Bahcall Refinery',0,'?','?','Y','?','2015-04-11 14:04:44','?','?','?','?' 'YU TIKU','McKee Station',9638,'N','L','Y','Y','2015-04-03 21:28:52','Y','Y','Y','Y' diff --git a/data/System.csv b/data/System.csv index 569db4d5..5d8f383d 100644 --- a/data/System.csv +++ b/data/System.csv @@ -295,6 +295,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '5 MU LEPORIS',99.40625,-88.4375,-129.9375,'Release 1.00-EDStar','2015-03-29 22:26:40' '5 PISCIS AUSTRINI',-56.375,-224.28125,204.3125,'Gamma','2014-11-27 11:33:44' '5 PUPPIS',71.625,11.5,-58.625,'Gamma','2014-11-27 11:33:44' +'50 BOOTIS',-113.4375,218.9375,88.46875,'Release 1.00-EDStar','2015-04-26 15:28:20' '50 OMEGA TAURI',-7.71875,-32.96875,-88.125,'Gamma','2014-11-27 11:33:44' '50 UPSILON-1 ERIDANI',73.09375,-83.625,-61.71875,'Gamma','2014-11-27 11:33:44' '51 AQUILAE',-43.4375,-28.9375,74.4375,'Gamma','2014-11-27 11:33:44' @@ -403,6 +404,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified '8 GAMMA CORONAE BOREALIS',-60.53125,114.1875,68.03125,'Gamma','2014-11-27 11:33:44' '8 KAPPA PISCIUM',-87.28125,-126.0625,7.4375,'Gamma','2014-11-27 11:33:44' '8 LYNCIS',-68.53125,65.09375,-141.0625,'Gamma','2014-11-27 11:33:44' +'8 PHI OPHIUCHI',-2.0,85.21875,228.15625,'Release 1.00-EDStar','2015-04-22 23:34:27' '8 PISCIS AUSTRINI',-50.875,-139.9375,119.03125,'Gamma','2014-11-27 11:33:44' '8 SERPENTIS',-4.3125,114.15625,121.4375,'Gamma','2014-11-27 11:33:44' '80 E PISCIUM',-48.09375,-97.84375,-42.96875,'Gamma','2014-11-27 11:33:44' @@ -875,6 +877,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALPHA FORNACIS',16.9375,-39.625,-17.3125,'Gamma','2014-11-27 11:33:44' 'ALPHA OCTANTIS',81.71875,-79.5,84.625,'Gamma','2014-11-27 11:33:44' 'ALPHA RETICULI',120.46875,-107.375,8.65625,'Gamma','2014-11-27 11:33:44' +'ALPHA SCUTI',-81.3125,-2.625,181.71875,'Release 1.00-EDStar','2015-04-21 20:35:45' 'ALPHA TUCANAE',65.875,-149.5,114.90625,'Gamma','2014-11-27 11:33:44' 'ALPHA VOLANTIS',118.59375,-28.28125,27.1875,'Gamma','2014-11-27 11:33:44' 'ALPHARD',138.84375,88.46875,-73.5,'Gamma-Inferred','2014-10-21 17:16:31' @@ -955,6 +958,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR IH-V B2-2',-71.71875,0.65625,62.875,'Release 1.00-EDStar','2015-01-09 07:51:47' 'ALRAI SECTOR IH-V B2-3',-78.5625,1.96875,65.125,'Release 1.00-EDStar','2015-01-09 08:05:54' 'ALRAI SECTOR IH-V B2-8',-65.1875,9.59375,63.65625,'Release 1.00-EDStar','2015-01-09 05:03:48' +'ALRAI SECTOR IM-V B2-0',-40.0625,29.9375,59.21875,'Release 1.00-EDStar','2015-03-23 20:54:23' 'ALRAI SECTOR IM-V B2-1',-38.9375,30.96875,63.625,'Release 1.00-EDStar','2015-03-24 07:58:12' 'ALRAI SECTOR IM-V B2-2',-41.34375,31.125,59.5,'Release 1.00-EDStar','2015-03-24 07:58:12' 'ALRAI SECTOR IM-V B2-6',-44.625,21.8125,61.96875,'Release 1.00-EDStar','2015-03-23 10:57:41' @@ -971,6 +975,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR JW-W B1-6',-22.84375,-10.4375,50.75,'Release 1.00-EDStar','2014-11-27 19:52:59' 'ALRAI SECTOR KC-V B2-3',-79.1875,-20.21875,59.71875,'Release 1.00-EDStar','2015-02-24 20:05:11' 'ALRAI SECTOR KC-V B2-6',-80.34375,-21.28125,73.96875,'Release 1.00-EDStar','2015-01-14 20:24:36' +'ALRAI SECTOR KC-V C2-15',-64.71875,30.3125,118.25,'Release 1.00-EDStar','2015-03-22 20:47:44' 'ALRAI SECTOR KH-M A7-0',-31.53125,-32.90625,79.4375,'Release 1.00-EDStar','2015-02-28 23:59:37' 'ALRAI SECTOR KH-V B2-1',-44.9375,-4.65625,60.8125,'Gamma-Inferred','2014-12-02 16:30:49' 'ALRAI SECTOR KH-V B2-2',-34.46875,-3.46875,58.84375,'Release 1.00-EDStar','2014-11-29 17:56:10' @@ -994,6 +999,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR MC-V B2-3',-35.0625,-8.9375,61.40625,'Release 1.00-EDStar','2014-11-27 23:51:38' 'ALRAI SECTOR MC-V B2-5',-28.40625,-15.5625,57.3125,'Release 1.00-EDStar','2015-01-22 02:58:05' 'ALRAI SECTOR MC-V B2-7',-38.4375,-8.1875,62.46875,'Release 1.00-EDStar','2014-11-27 23:51:38' +'ALRAI SECTOR MH-V B2-5',-2.34375,0.6875,57.0625,'Release 1.00-EDStar','2015-04-25 04:41:11' +'ALRAI SECTOR MI-S B4-0',-43.3125,59.0625,95.8125,'Release 1.00-EDStar','2015-04-22 23:08:10' 'ALRAI SECTOR MI-S B4-2',-38.21875,59.75,111.28125,'Release 1.00-EDStar','2015-01-30 03:30:12' 'ALRAI SECTOR MS-T B3-0',-36.125,32.65625,79.96875,'Release 1.00-EDStar','2015-03-31 18:53:10' 'ALRAI SECTOR MS-T B3-1',-36.03125,21.53125,92.71875,'Release 1.00-EDStar','2015-01-09 00:09:24' @@ -1002,6 +1009,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ALRAI SECTOR MS-T B3-7',-35.21875,29.125,88.625,'Release 1.00-EDStar','2015-03-22 02:58:16' 'ALRAI SECTOR NC-M A7-4',-22.40625,-40.65625,80.9375,'Release 1.00-EDStar','2015-04-08 19:08:15' 'ALRAI SECTOR NC-V B2-5',-15.84375,-20.5,66.4375,'Release 1.00-EDStar','2015-01-15 17:57:31' +'ALRAI SECTOR NC-V B2-6',-22.625,-20.53125,70.09375,'Release 1.00-EDStar','2014-12-20 18:00:01' 'ALRAI SECTOR NN-K A8-4',-43.84375,-30.1875,85.96875,'Release 1.00-EDStar','2015-04-08 19:03:13' 'ALRAI SECTOR NN-T B3-0',-62.28125,-1.0625,88.375,'Release 1.00-EDStar','2015-01-03 10:11:30' 'ALRAI SECTOR NN-T BS-7',-55.46875,6.1875,84.65625,'Release 1.00-EDStar','2014-12-31 18:35:33' @@ -1583,6 +1591,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARIETIS SECTOR AR-K A9-3',-47.34375,-44.6875,-120.1875,'Release 1.00-EDStar','2015-03-27 01:28:26' 'ARIETIS SECTOR BA-Z B0',-60.75,-83.46875,-200.3125,'Release 1.00-EDStar','2014-12-02 00:10:00' 'ARIETIS SECTOR BG-O B6-5',-63.4375,-94.625,-84.4375,'Release 1.00-EDStar','2015-04-07 15:46:01' +'ARIETIS SECTOR BL-X B1-0',-99.09375,-60.59375,-182.78125,'Release 1.00-EDStar','2014-12-10 11:40:53' 'ARIETIS SECTOR BQ-Y C10',-107.53125,-95.375,-155.40625,'Release 1.00-EDStar','2015-01-25 07:40:18' 'ARIETIS SECTOR BV-Y C11',-55.0,-37.875,-181.5625,'Release 1.00-EDStar','2015-03-27 02:22:17' 'ARIETIS SECTOR CC-J A10-1',-49.375,-30.625,-112.8125,'Release 1.00-EDStar','2015-03-27 02:55:46' @@ -1640,11 +1649,14 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'ARIETIS SECTOR LO-F A12-0',-43.6875,-33.5,-93.71875,'Release 1.00-EDStar','2015-03-27 01:18:55' 'ARIETIS SECTOR MD-Q A6-1',-50.0625,-30.09375,-147.21875,'Release 1.00-EDStar','2015-03-27 02:41:27' 'ARIETIS SECTOR MD-Q A6-4',-48.625,-26.75,-151.6875,'Release 1.00-EDStar','2015-03-27 02:39:15' +'ARIETIS SECTOR MH-V B2-1',-44.125,-99.3125,-160.28125,'Release 1.00-EDStar','2015-04-19 14:22:50' 'ARIETIS SECTOR MP-D A13-0',-88.375,-41.6875,-76.25,'Release 1.00-EDStar','2014-12-08 04:28:56' +'ARIETIS SECTOR NH-V B2-3',-21.78125,-102.875,-151.6875,'Release 1.00-EDStar','2015-04-19 14:25:55' 'ARIETIS SECTOR NN-S B4-5',-16.21875,-23.40625,-117.4375,'Release 1.00-EDStar','2015-04-12 03:15:13' 'ARIETIS SECTOR NN-T B3-3',-89.25,-87.6875,-140.0625,'Release 1.00-EDStar','2015-01-24 18:54:04' 'ARIETIS SECTOR NP-D A13-3',-79.21875,-42.4375,-79.71875,'Release 1.00-EDStar','2014-12-08 09:38:01' 'ARIETIS SECTOR NP-D A13-4',-78.84375,-43.875,-80.40625,'Release 1.00-EDStar','2014-12-08 09:41:26' +'ARIETIS SECTOR NU-D A13-3',-63.21875,-32.6875,-84.0625,'Release 1.00-EDStar','2015-03-15 02:42:12' 'ARIETIS SECTOR OP-D A13-0',-72.3125,-42.625,-84.0625,'Release 1.00-EDStar','2014-12-08 10:31:25' 'ARIETIS SECTOR OP-D A13-1',-73.78125,-44.4375,-82.5625,'Release 1.00-EDStar','2014-12-08 10:08:34' 'ARIETIS SECTOR OY-P A6-5',-47.65625,-44.40625,-153.09375,'Release 1.00-EDStar','2015-03-27 01:37:40' @@ -2555,6 +2567,8 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BD-17 6172',-29.0625,-41.90625,47.09375,'Gamma','2014-11-27 11:33:44' 'BD-18 3106',48.46875,36.875,2.0625,'Beta3','2014-11-01 06:36:37' 'BD-18 394',6.3125,-70.03125,-27.53125,'Gamma','2014-11-27 11:33:44' +'BD-18 4705',-343.65625,100.53125,1977.84375,'Release 1.00-EDStar','2015-04-23 21:42:04' +'BD-18 4710',-346.53125,99.9375,1987.53125,'Release 1.00-EDStar','2015-04-23 21:47:04' 'BD-19 3629A',54.21875,61.40625,41.8125,'Gamma','2014-11-27 11:33:44' 'BD-19 402',-104.4375,0.46875,14.625,'Gamma','2014-11-27 11:33:44' 'BD-20 2665',105.6875,27.5,-46.8125,'Gamma','2014-11-27 11:33:44' @@ -2970,6 +2984,7 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BLANCO 1 SECTOR KR-V C2-0',16.34375,-901.03125,18.40625,'Release 1.00-EDStar','2015-03-11 12:20:07' 'BLANCO 1 SECTOR KX-Q B6-0',40.59375,-759.96875,55.28125,'Release 1.00-EDStar','2015-03-12 13:27:07' 'BLANCO 1 SECTOR LM-T B4-0',15.75,-863.625,20.5625,'Release 1.00-EDStar','2015-03-11 12:08:59' +'BLANCO 1 SECTOR MG-V B3-0',120.875,-862.125,-2.84375,'Release 1.00-EDStar','2015-04-25 15:45:12' 'BLANCO 1 SECTOR MH-T B4-0',6.0625,-877.09375,34.15625,'Release 1.00-EDStar','2015-03-12 12:21:42' 'BLANCO 1 SECTOR MM-V C2-0',17.375,-942.5,16.53125,'Release 1.00-EDStar','2015-03-12 12:10:43' 'BLANCO 1 SECTOR MX-R B5-0',13.6875,-829.0,42.875,'Release 1.00-EDStar','2015-03-12 12:41:54' @@ -2996,6 +3011,40 @@ unq:name,pos_x,pos_y,pos_z,name@Added.added_id,modified 'BLATUCADRUS',161.5,-31.90625,31.96875,'Gamma','2014-11-27 11:33:44' 'BLATUNTINO',89.9375,-126.1875,-83.3125,'Gamma','2014-11-27 11:33:44' 'BLATZ',60.59375,-1.5,-47.59375,'Gamma','2014-11-27 11:33:44' +'BLEAE THUA AA-Z B1-2',-448.71875,248.96875,1540.03125,'Release 1.00-EDStar','2015-04-20 07:26:23' +'BLEAE THUA AU-A B1-0',-381.21875,247.84375,1521.5,'Release 1.00-EDStar','2015-04-20 07:12:59' +'BLEAE THUA BU-A B1-0',-362.53125,238.90625,1518.75,'Release 1.00-EDStar','2015-04-20 07:10:13' +'BLEAE THUA BX-V C2-4',-248.90625,252.34375,1625.53125,'Release 1.00-EDStar','2015-04-20 06:40:40' +'BLEAE THUA CK-Q B6-2',-252.03125,255.0,1649.9375,'Release 1.00-EDStar','2015-04-20 14:30:53' +'BLEAE THUA CU-A B1-0',-339.875,238.21875,1519.53125,'Release 1.00-EDStar','2015-04-20 07:06:03' +'BLEAE THUA ED-U C3-2',-275.46875,249.25,1686.78125,'Release 1.00-EDStar','2015-04-20 14:22:59' +'BLEAE THUA EP-A D22',-465.6875,253.53125,1564.40625,'Release 1.00-EDStar','2015-04-20 11:29:22' +'BLEAE THUA FC-L B9-0',-439.875,264.84375,1699.1875,'Release 1.00-EDStar','2015-04-20 13:32:34' +'BLEAE THUA FP-A D5',-433.5625,254.71875,1524.9375,'Release 1.00-EDStar','2015-04-20 07:23:26' +'BLEAE THUA GC-L B9-1',-411.9375,269.25,1711.875,'Release 1.00-EDStar','2015-04-20 13:34:48' +'BLEAE THUA GJ-S C4-0',-358.75,248.90625,1718.875,'Release 1.00-EDStar','2015-04-20 13:54:19' +'BLEAE THUA GP-A D7',-314.1875,242.21875,1543.40625,'Release 1.00-EDStar','2015-04-20 07:01:17' +'BLEAE THUA HJ-S C4-10',-309.75,232.15625,1708.40625,'Release 1.00-EDStar','2015-04-20 14:17:37' +'BLEAE THUA HM-V B3-2',-477.28125,237.8125,1588.28125,'Release 1.00-EDStar','2015-04-20 12:43:59' +'BLEAE THUA IL-O B7-0',-259.0625,254.46875,1669.96875,'Release 1.00-EDStar','2015-04-20 14:26:22' +'BLEAE THUA KS-T B4-0',-487.3125,246.4375,1610.15625,'Release 1.00-EDStar','2015-04-20 12:48:29' +'BLEAE THUA LE-B C14',-406.09375,242.5625,1525.25,'Release 1.00-EDStar','2015-04-20 07:19:41' +'BLEAE THUA LF-A D33',-251.09375,134.625,1556.4375,'Release 1.00-EDStar','2015-04-23 20:42:29' +'BLEAE THUA MD-S B5-1',-492.6875,258.5625,1634.125,'Release 1.00-EDStar','2015-04-20 13:19:25' +'BLEAE THUA MG-X B2-1',-288.40625,248.65625,1556.5,'Release 1.00-EDStar','2015-04-20 06:58:00' +'BLEAE THUA MX-K B9-1',-338.40625,243.875,1708.53125,'Release 1.00-EDStar','2015-04-20 14:15:09' +'BLEAE THUA NE-B C11',-324.3125,248.53125,1530.65625,'Release 1.00-EDStar','2015-04-20 07:03:27' +'BLEAE THUA OX-K B9-0',-292.59375,237.84375,1695.71875,'Release 1.00-EDStar','2015-04-20 14:19:53' +'BLEAE THUA OY-R B5-2',-503.8125,252.15625,1624.46875,'Release 1.00-EDStar','2015-04-20 13:05:47' +'BLEAE THUA TN-C B1',-442.3125,238.84375,1505.4375,'Release 1.00-EDStar','2015-04-20 05:31:44' +'BLEAE THUA UP-O B7-1',-488.9375,259.875,1656.40625,'Release 1.00-EDStar','2015-04-20 13:22:05' +'BLEAE THUA UT-A B1-1',-499.96875,238.75,1520.28125,'Release 1.00-EDStar','2015-04-20 05:19:04' +'BLEAE THUA WS-T B4-4',-264.1875,246.96875,1601.25,'Release 1.00-EDStar','2015-04-20 06:47:06' +'BLEAE THUA XH-U C3-5',-472.1875,260.53125,1675.9375,'Release 1.00-EDStar','2015-04-20 13:25:10' +'BLEIA DRYIAE IR-C D63',-468.46875,-123.65625,4067.03125,'Release 1.00-EDStar','2015-04-25 16:55:13' +'BLEIA DRYIAE MU-I C12-10',-509.78125,-87.21875,4614.03125,'Release 1.00-EDStar','2015-04-26 22:58:34' +'BLEIA DRYIAE MY-Z B33-9',-541.4375,-85.34375,4780.125,'Release 1.00-EDStar','2015-04-26 23:17:22' +'BLEIA DRYIAE OA-M B41-2',-577.5,-72.78125,4951.875,'Release 1.00-EDStar','2015-04-26 23:32:03' 'BLENDE',171.71875,46.0625,2.90625,'Gamma','2014-11-27 11:33:44' 'BLENU',65.9375,44.625,8.84375,'Beta3','2014-11-27 11:33:44' 'BLEST',6.0625,-17.75,-33.625,'Gamma','2014-11-27 11:33:44' diff --git a/tradecalc.py b/tradecalc.py index c156db7d..d7e336b0 100644 --- a/tradecalc.py +++ b/tradecalc.py @@ -836,25 +836,21 @@ def station_iterator(srcStation): if d.station in restrictStations ) if maxAge: - def age_check(): - for d in stations: - age = d.station.dataAge - if age and age <= maxAge: - yield d - stations = iter(age_check()) + inf = float("inf") + stations = ( + d for d in stations + if (d.station.dataAge or inf) <= maxAge + ) if goalSystem: - def goal_check(): - unique = bool(tdenv.unique) - for d in stations: - if unique and d.system is srcSystem: - continue - if d.system is not goalSystem: - # Ignore jumps longer than remaining distance - # to the goal system. - if d.distLy >= srcGoalDist: - continue - yield d - stations = iter(goal_check()) + unique = bool(tdenv.unique) + if bool(tdenv.unique): + stations = ( + d for d in stations if d.system is not SrcSystem + ) + stations = ( + d for d in stations + if d.system is goalSystem or d.distLy < srcGoalDist + ) if tdenv.debug >= 1: def annotate(): @@ -881,6 +877,7 @@ def annotate(): multiplier = 1.0 # Calculate total K-lightseconds supercruise time. # This will amortize for the start/end stations + dstSys = dest.system if goalSystem and dstSys is not goalSystem: dstGoalDist = goalDistTo(dstSys) # Biggest reward for shortening distance to goal From 4fbfb52adec03e0d97945f88d8f5ac7547060a4a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 27 Apr 2015 21:01:40 -0700 Subject: [PATCH 2/2] Reduced the cost of 'getTrades' --- CHANGES.txt | 1 + tradecalc.py | 37 ++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 92986eae..850ca034 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,7 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014 v6.18.6 Apr 27 2015 . (kfsone) Fixed #225 'Generator already running' +. (kfsone) Performance improvement: Reduced the cost of "getTrades" v6.18.5 Apr 26 2015 . (kfsone) Fixed #224 run -vv and above was raising an exception diff --git a/tradecalc.py b/tradecalc.py index d7e336b0..34c077ec 100644 --- a/tradecalc.py +++ b/tradecalc.py @@ -667,25 +667,24 @@ def getTrades(self, srcStation, dstStation, srcSelling=None): itemIdx = self.tdb.itemByID minGainCr = max(1, self.tdenv.minGainPerTon or 1) maxGainCr = max(minGainCr, self.tdenv.maxGainPerTon or sys.maxsize) - for buy in dstBuying: - buyItemID = buy[0] - for sell in srcSelling: - sellItemID = sell[0] - if sellItemID == buyItemID: - buyCr, sellCr = buy[1], sell[1] - if sellCr + minGainCr > buyCr: - continue - if sellCr + maxGainCr < buyCr: - continue - trading.append(Trade( - itemIdx[buyItemID], - buyItemID, - sellCr, buyCr - sellCr, - sell[2], sell[3], - buy[2], buy[3], - sell[4], buy[4], - )) - break # from srcSelling + buyIndex = {buy[0]: buy for buy in dstBuying} + getBuy = buyIndex.get + for sell in srcSelling: # should be the smaller list + itmID = sell[0] + buy = getBuy(itmID, None) + if buy: + buyCr, sellCr = buy[1], sell[1] + if sellCr + minGainCr > buyCr: + continue + if sellCr + maxGainCr < buyCr: + continue + trading.append(Trade( + itemIdx[itmID], itmID, + sellCr, buyCr - sellCr, + sell[2], sell[3], + buy[2], buy[3], + sell[4], buy[4], + )) # SORT BY profit DESC, cost # So if two items have the same profit, the cheapest will come first.