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

core/src/io/anuke/mindustry/ui/MenuButton.java

@@ -40,6 +40,7 @@ public class MenuButton extends Button{
 			scale = Unit.dp.scl(1f);
 		}
 		add(text, style, scale).color(hasInvalid ? Color.DARK_GRAY : Color.WHITE);
+
 		if(hasInvalid){
 			row();
 			add(text, style, scale).padTop(Unit.dp.scl(-Core.font.getData().lineHeight * scale * 2f - 4f)).color(Color.WHITE);

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

@@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Array;
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.Changelogs;
 import io.anuke.mindustry.io.Changelogs.VersionInfo;
 import io.anuke.mindustry.io.Version;
@@ -17,6 +18,10 @@ public class ChangelogDialog extends FloatingDialog{
     public ChangelogDialog(){
         super("$text.changelog.title");
 
+        addCloseButton();
+
+        content().add("$text.changelog.loading");
+
         Changelogs.getChangelog(result -> {
             versions = result;
             Gdx.app.postRunnable(this::setup);
@@ -30,12 +35,15 @@ public class ChangelogDialog extends FloatingDialog{
         Table table = new Table();
         ScrollPane pane = new ScrollPane(table, "clear");
 
+        content().clear();
         content().add(pane).grow();
 
-        addCloseButton();
-
         if(versions == null){
             table.add("$text.changelog.error");
+            if(Vars.android){
+                table.row();
+                table.add("$text.changelog.error.android").padTop(8);
+            }
         }else{
             for(VersionInfo info : versions){
                 Table in = new Table("clear");
@@ -45,7 +53,7 @@ public class ChangelogDialog extends FloatingDialog{
                 if(info.build == Version.build){
                     in.row();
                     in.add("$text.changelog.current");
-                }else if(info == versions.peek()){
+                }else if(info == versions.first()){
                     in.row();
                     in.add("$text.changelog.latest");
                 }

core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java

@@ -124,8 +124,7 @@ public class DebugFragment implements Fragment {
                 Net.client() ?
                 "chat.open: " + ui.chatfrag.chatOpen() + "\n" +
                 "chat.messages: " + ui.chatfrag.getMessagesSize() + "\n" +
-                "client.connecting: " + netClient.isConnecting() + "\n" +
-                "client.hasdata: " + netClient.hasData() : "",
+                "client.connecting: " + netClient.isConnecting() + "\n" : "",
                 "players: " + playerGroup.size(),
                 "enemies: " + enemyGroup.size(),
                 "tiles: " + tileGroup.size(),