Merged kfsone/tradedangerous into master

CHANGES.txt

@@ -3,9 +3,11 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
 v6.1.9 [wip]
-. (kfsone) Big documentation cleanup.
-. (mhuges) Added '--stations' to 'nav' to show a station count
-. (kfsone) Added '--ages' option to 'local' to show price data age
+. (gulasch) Stations and distances
+. (kfsone) Mineral and Microbial are now in the correct order,
+. (kfsone) Big documentation cleanup,
+. (mhuges) Added '--stations' to 'nav' to show a station count,
+. (kfsone) Added '--ages' option to 'local' to show price data age,
 
 v6.1.8 Dec 09 2014
 . (kfsone) Huge performance improvement to "nav",

data/Category.csv

@@ -8,6 +8,7 @@ unq:name
 'Medicines'
 'Metals'
 'Minerals'
+'Slaves'
 'Technology'
 'Textiles'
 'Waste'

data/Item.csv

@@ -28,8 +28,8 @@ unq:[email protected]_id,unq:name,ui_order
 'Machinery','Atmospheric Processors',1
 'Machinery','Crop Harvesters',2
 'Machinery','Marine Equipment',3
-'Machinery','Microbial Furnaces',5
-'Machinery','Mineral Extractors',4
+'Machinery','Microbial Furnaces',4
+'Machinery','Mineral Extractors',5
 'Machinery','Power Generators',6
 'Machinery','Water Purifiers',7
 'Medicines','Agri-Medicines',1
@@ -59,6 +59,7 @@ unq:[email protected]_id,unq:name,ui_order
 'Minerals','Lepidolite',6
 'Minerals','Rutile',7
 'Minerals','Uraninite',8
+'Slaves','Imperial Slaves',1
 'Technology','Advanced Catalysers',1
 'Technology','Animal Monitors',2
 'Technology','Aquaponic Systems',3

data/Station.csv

@@ -982,6 +982,8 @@ unq:[email protected]_id,unq:name,ls_from_star
 'Ross 705','Ejety City',0.0
 'Ross 709','Reisman Settlement',0.0
 'Ross 730','Pavlov Settlement',0.0
+'Ross 733','Forest Terminal',0.0
+'Ross 733','Schottky Station',0.0
 'Ross 733','Strekalov Gateway',0.0
 'Ross 765','Melroy Port',0.0
 'Ross 765','Pogue Platform',0.0