Skip to content

Commit

Permalink
Merged kfsone/tradedangerous into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@maddavo
maddavo committed Mar 18, 2015
2 parents 1522ef1 + ef55042 commit a5d0dba
Show file tree
Hide file tree
Showing 7 changed files with 981 additions and 328 deletions.
4 changes: 4 additions & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
==============================================================================

v6.14.3 Mar 17 2015
. (kfsone) Windows improvements to misc/madupload.py,
. (kfsone) EDDB v3 support,

v6.14.2 Mar 15 2015
. (kfsone) Minor tweaks
. (kfsone) Removed the "tradingWith" cache because its hit rate was so low
Expand Down
1 change: 1 addition & 0 deletions corrections.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"SAMBURITJA/RPTEYN LANDING": DELETED,
"CHICK EK/WH IEELOCK GATEWAY": DELETED,
"LHS 3006/WCM TRANSFER ORBITAL": "Leonard Nimoy Station",
"LALANDE 4141/4A5O4O": "4A5O4D",
}

categories = {
Expand Down
58 changes: 58 additions & 0 deletions data/ShipVendor.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'ANDERE','Malzberg Vision','Hauler','2015-03-04 19:50:35'
'ANDERE','Malzberg Vision','Sidewinder','2015-03-04 19:50:35'
'ANDERE','Malzberg Vision','Type 7','2015-03-04 19:50:35'
'ANDERE','Maury Terminal','Asp','2015-03-15 11:16:08'
'ANDERE','Maury Terminal','Eagle','2015-03-15 11:15:51'
'ANDERE','Maury Terminal','Hauler','2015-03-15 11:15:51'
'ANDERE','Maury Terminal','Sidewinder','2015-03-15 11:15:51'
'ANDERE','Maury Terminal','Type 7','2015-03-15 11:16:08'
'ANDHRIMI','Yurchikhin Station','Adder','2015-03-04 19:50:35'
'ANDHRIMI','Yurchikhin Station','Anaconda','2015-03-04 19:50:35'
'ANDHRIMI','Yurchikhin Station','Asp','2015-03-04 19:50:35'
Expand Down Expand Up @@ -281,6 +286,19 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'ETA DRACONIS','Swift Terminal','Sidewinder','2015-03-04 19:50:35'
'ETA DRACONIS','Swift Terminal','Type 6','2015-03-04 19:50:35'
'ETA DRACONIS','Swift Terminal','Type 9','2015-03-04 19:50:35'
'EZ AQUARII','Magnus Gateway','Adder','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Asp','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Cobra','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Dropship','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Hauler','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Orca','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Python','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Sidewinder','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Type 6','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Type 7','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Type 9','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Viper','2015-03-16 15:31:31'
'EZ AQUARII','Magnus Gateway','Vulture','2015-03-16 15:31:31'
'FACECE','Simpson Depot','Asp','2015-03-12 13:13:42'
'FACECE','Simpson Depot','Cobra','2015-03-12 13:13:43'
'FACECE','Simpson Depot','Eagle','2015-03-12 13:13:43'
Expand Down Expand Up @@ -500,6 +518,26 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'KHAN GUBII','Alpers City','Type 6','2015-03-04 19:50:35'
'KHAN GUBII','Alpers City','Type 7','2015-03-04 19:50:35'
'KHAN GUBII','Alpers City','Viper','2015-03-04 19:50:35'
'KOKARY','Faraday Enterprise','Adder','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Asp','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Cobra','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Dropship','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Eagle','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Hauler','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Sidewinder','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Type 6','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Type 7','2015-03-16 18:10:49'
'KOKARY','Faraday Enterprise','Vulture','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Adder','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Asp','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Dropship','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Eagle','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Hauler','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Sidewinder','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Type 7','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Type 9','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Viper','2015-03-16 18:10:49'
'KOKARY','Gidzenko Terminal','Vulture','2015-03-16 18:10:49'
'KRUGER 60','Kepler Gateway','Cobra','2015-03-04 19:50:35'
'KRUGER 60','Kepler Gateway','Dropship','2015-03-04 19:50:35'
'KRUGER 60','Kepler Gateway','Eagle','2015-03-04 19:50:35'
Expand Down Expand Up @@ -735,6 +773,10 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'LU VELORUM','Miletus Station','Type 7','2015-03-04 19:50:35'
'LU VELORUM','Miletus Station','Type 9','2015-03-04 19:50:35'
'LU VELORUM','Miletus Station','Viper','2015-03-04 19:50:35'
'LUNG','Hopkins Landing','Adder','2015-03-16 20:28:08'
'LUNG','Hopkins Landing','Cobra','2015-03-16 20:28:08'
'LUNG','Hopkins Landing','Hauler','2015-03-16 20:28:08'
'LUNG','Hopkins Landing','Type 6','2015-03-16 20:28:08'
'MEINJHALARA','Fremont Port','Adder','2015-03-04 19:50:35'
'MEINJHALARA','Fremont Port','Anaconda','2015-03-04 19:50:35'
'MEINJHALARA','Fremont Port','Asp','2015-03-04 19:50:35'
Expand Down Expand Up @@ -993,6 +1035,12 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'SOLATI','Solati Reach','Eagle','2015-03-04 19:50:35'
'SOLATI','Solati Reach','Hauler','2015-03-04 19:50:35'
'SOLATI','Solati Reach','Sidewinder','2015-03-04 19:50:35'
'TAU CETI','Gilmour Orbiter','Eagle','2015-03-16 15:31:29'
'TAU CETI','Gilmour Orbiter','Hauler','2015-03-16 15:31:29'
'TAU CETI','Graham Terminal','Sidewinder','2015-03-16 15:31:29'
'TAU CETI','Ortiz Moreno City','Eagle','2015-03-16 15:31:29'
'TAU CETI','Ortiz Moreno City','Hauler','2015-03-16 15:31:29'
'TAU CETI','Ortiz Moreno City','Sidewinder','2015-03-16 15:31:29'
'TAU-1 HYDRAE','Priestley Port','Adder','2015-03-04 19:50:35'
'TAU-1 HYDRAE','Priestley Port','Asp','2015-03-04 19:50:35'
'TAU-1 HYDRAE','Priestley Port','Dropship','2015-03-04 19:50:35'
Expand Down Expand Up @@ -1082,6 +1130,16 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'YAKABUGAI','Serebrov Station','Hauler','2015-03-04 19:50:35'
'YAKABUGAI','Serebrov Station','Sidewinder','2015-03-04 19:50:35'
'YAKABUGAI','Serebrov Station','Type 9','2015-03-04 19:50:35'
'YZ CETI','Clement Orbital','Asp','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Cobra','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Eagle','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Hauler','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Orca','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Python','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Sidewinder','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Type 9','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Viper','2015-03-16 13:56:03'
'YZ CETI','Clement Orbital','Vulture','2015-03-16 13:56:03'
'ZAONCE','Ridley Scott','Anaconda','2015-03-04 19:50:35'
'ZAONCE','Ridley Scott','Asp','2015-03-04 19:50:35'
'ZAONCE','Ridley Scott','Dropship','2015-03-04 19:50:35'
Expand Down
Loading

0 comments on commit a5d0dba

Please sign in to comment.