Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	core/assets/bundles/bundle_ja.properties

README.md

@@ -25,9 +25,9 @@ _Building:_ `gradlew desktop:dist`
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`
 
-#### For Server Builds...
+#### Server
 
-Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server' i.e. `gradlew server:dist`.
+Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
 
 ---
 

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -172,10 +172,10 @@ public class AndroidLauncher extends AndroidApplication{
                                 SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
                             }catch(IOException e){
-                                ui.showError(Core.bundle.format("text.save.import.fail", Strings.parseException(e, false)));
+                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false)));
                             }
                         }else{
-                            ui.showError("$text.save.import.invalid");
+                            ui.showError("$save.import.invalid");
                         }
                     }else if(map){ //open map
                         Core.app.post(() -> {

build.gradle

@@ -20,7 +20,7 @@ allprojects{
 
     ext{
         versionNumber = '4'
-        versionModifier = 'alpha'
+        versionModifier = 'beta'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.9'