Merge branch 'master' into citadel.1.0.2

2017-03-14 13:55:53 -04:00
parent a8565da849 6be091e40a
commit 1d2c3635fc
25 changed files with 7316 additions and 62974 deletions
@@ -5,6 +5,7 @@
 		#define MINETYPE "lavaland"

        #include "map_files\CitadelStation\CitadelStation-1.0.2.dmm"
+        
 #ifndef TRAVIS_MASS_MAP_BUILD
        #include "map_files\generic\z2.dmm"
        #include "map_files\generic\z3.dmm"