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 committed Feb 25, 2015
2 parents c7f6ac1 + e88b7c5 commit 5f15fcc
Show file tree
Hide file tree
Showing 6 changed files with 259 additions and 214 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014

v6.12.0 Feb 23 2015
. (kfsone) Added "market", "shipyard" and "modified" values to Station table
. (kfsone) "submit-distances" now has proper argument parsing, see --help

v6.11.0 Feb 21 2015
. (kfsone) Added "market" command for viewing station buy/sell list
Expand Down
2 changes: 2 additions & 0 deletions corrections.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
"AMAHU/ALEDNDRIA GATEWAY": DELETED,
"LTT 7548/ALEDNDRIA RING": DELETED,
"DJINAJERI/MESSERSCHMID LANDING": DELETED,
"SAMBURITJA/PTEYN LANDING": DELETED,
"SAMBURITJA/RPTEYN LANDING": DELETED,
}

categories = {
Expand Down
6 changes: 2 additions & 4 deletions data/Station.csv
Original file line number Diff line number Diff line change
Expand Up @@ -9872,12 +9872,10 @@ unq:[email protected]_id,unq:name,ls_from_star,blackmarket,max_pad_size,market,
'SALLEDA','Gohar Vision',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMA','Junlong Platform',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBARE','Guest Dock',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Abasheli Station',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Abasheli Station',935,'N','L','Y','?','2015-02-24 12:00:00'
'SAMBURITJA','Arp Refinery',914,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Caidin Landing',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Caidin Landing',818,'Y','M','Y','?','2015-02-23 12:00:00'
'SAMBURITJA','Kapteyn Landing',934,'Y','L','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Pteyn Landing',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMBURITJA','Rpteyn Landing',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMEBITO','Vlaicu Settlement',0,'?','?','Y','?','2015-02-23 23:54:36'
'SAMEN','Peters Terminal',240,'N','L','Y','?','2015-02-23 23:54:36'
'SAMENI','Tarelkin Landing',0,'?','?','Y','?','2015-02-23 23:54:36'
Expand Down
2 changes: 1 addition & 1 deletion edscupdate.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import tradedb
import tradeenv

DEFAULT_DATE = "2015-02-01 00:00:00"
DEFAULT_DATE = "2015-02-11 00:00:00"


# Systems we know are bad.
Expand Down
Loading

0 comments on commit 5f15fcc

Please sign in to comment.