Merge remote-tracking branch 'origin/master'

2018-05-24 11:21:16 -04:00
parent 4c6ae83d4b b4088dcfbc
commit ba0c7907ca
3 changed files with 8 additions and 5 deletions
--- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
@@ -26,6 +26,10 @@ public class AboutDialog extends FloatingDialog {
        ScrollPane pane = new ScrollPane(in, "clear");

        for(LinkEntry link : Links.getLinks()){
+            if(ios && link.name.equals("google-play")){ //because Apple doesn't like me mentioning android
+                continue;
+            }
+
            Table table = new Table("button");
            table.margin(0);
            table.table(img -> {