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 Apr 28, 2015
2 parents 1547da1 + 4fbfb52 commit 9883a8d
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 147 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.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
. (kfsone) Fixed #223 "unrecognized system" errors
Expand Down
20 changes: 20 additions & 0 deletions data/ShipVendor.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down Expand Up @@ -2372,6 +2380,8 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down Expand Up @@ -2657,6 +2667,16 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_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'
Expand Down
Loading

0 comments on commit 9883a8d

Please sign in to comment.