Merge remote-tracking branch 'origin/master'

2018-12-05 19:00:18 -05:00
parent 8d28976b0d 8a582f8872
commit 6caf0fc1cc
12 changed files with 35 additions and 29 deletions
@@ -20,7 +20,7 @@ allprojects {
    ext {
        versionNumber = '4'
        versionModifier = 'alpha'
-        versionType = 'official'
+        if (!project.hasProperty("versionType")) versionType = 'official'
        appName = 'Mindustry'
        gdxVersion = '1.9.9'
        roboVMVersion = '2.3.0'