Merge branch 'cargorun' #3274

pioneerspacesim · May 9, 2015 · e69b93a · e69b93a
2 parents 6588c89 + fff4079
commit e69b93a
Show file tree

Hide file tree

Showing 6 changed files with 1,765 additions and 0 deletions.
diff --git a/.tx/config b/.tx/config
@@ -46,6 +46,11 @@ file_filter = data/lang/module-donatetocranks/<lang>.json
 source_file = data/lang/module-donatetocranks/en.json
 source_lang = en
 
+[pioneer.module-cargorun]
+file_filter = data/lang/module-cargorun/<lang>.json
+source_file = data/lang/module-cargorun/en.json
+source_lang = en
+
 [pioneer.module-crewcontracts]
 file_filter = data/lang/module-crewcontracts/<lang>.json
 source_file = data/lang/module-crewcontracts/en.json

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,7 @@
+May 2015
+   * New Features
+     * New mission: cargo run (#3274)
+
 April 2015
    * New Features
      * Confirm quit question added (#3374)

diff --git a/data/icons/bbs/haul.png b/data/icons/bbs/haul.png
diff --git a/data/icons/bbs/haul_fast.png b/data/icons/bbs/haul_fast.png