Merge branch 'master' of https://github.com/Anuken/Mindustry into steam

android/build.gradle

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

core/src/io/anuke/mindustry/maps/Maps.java

@@ -215,7 +215,7 @@ public class Maps implements Disposable{
             return filters;
         }else{
             try{
-                return JsonIO.read(Array.class, str);
+                return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry"));
             }catch(Exception e){
                 e.printStackTrace();
                 return readFilters("");

core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java

@@ -17,7 +17,6 @@ public class MirrorFilter extends GenerateFilter{
 
     {
         options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45));
-        buffered = true;
     }
 
     @Override

core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java

@@ -106,7 +106,7 @@ public class PausedDialog extends FloatingDialog{
             return;
         }
 
-        if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || Net.client()){
+        if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || wasClient){
             state.set(State.menu);
             logic.reset();
             return;

desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java

@@ -39,7 +39,8 @@ public class DesktopPlatform extends Platform{
         if(useDiscord){
             try{
                 DiscordEventHandlers handlers = new DiscordEventHandlers();
-                DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "");
+                DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "1127400");
+                Log.info("Initialized Discord rich presence.");
 
                 Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown));
             }catch(Throwable t){
@@ -141,8 +142,8 @@ public class DesktopPlatform extends Platform{
 
     @Override
     public void updateRPC(){
-
         if(!useDiscord) return;
+        Log.info("Updating discord RPC status.");
 
         DiscordRichPresence presence = new DiscordRichPresence();