Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry

# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties

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

@@ -1,10 +1,10 @@
 package io.anuke.mindustry.ui.dialogs;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.maps.*;
@@ -15,7 +15,8 @@ import static io.anuke.mindustry.Vars.*;
 public class MapPlayDialog extends FloatingDialog{
     CustomRulesDialog dialog = new CustomRulesDialog();
     Rules rules;
-    @NonNull Gamemode selectedGamemode = Gamemode.survival;
+    @NonNull
+    Gamemode selectedGamemode = Gamemode.survival;
     Map lastMap;
 
     public MapPlayDialog(){

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

@@ -0,0 +1,88 @@
+package io.anuke.mindustry.ui.dialogs;
+
+import io.anuke.arc.*;
+import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.mod.Mods.*;
+import io.anuke.mindustry.ui.*;
+
+import java.io.*;
+
+import static io.anuke.mindustry.Vars.*;
+
+public class ModsDialog extends FloatingDialog{
+
+    public ModsDialog(){
+        super("$mods");
+        addCloseButton();
+        shown(this::setup);
+
+        hidden(() -> {
+            if(mods.requiresRestart()){
+                ui.showOkText("$mods", "$mod.requiresrestart", () -> {
+                    Core.app.exit();
+                });
+            }
+        });
+
+        shown(() -> Core.app.post(() -> {
+            Core.settings.getBoolOnce("modsalpha", () -> {
+                ui.showText("$mods", "$mods.alphainfo");
+            });
+        }));
+    }
+
+    void setup(){
+        cont.clear();
+        cont.defaults().width(520f).pad(4);
+        if(!mods.all().isEmpty()){
+            cont.pane(table -> {
+                table.margin(10f).top();
+                for(LoadedMod mod : mods.all()){
+                    table.table(Styles.black6, t -> {
+                        t.defaults().pad(2).left().top();
+                        t.margin(14f).left();
+                        t.table(title -> {
+                            title.left();
+                            title.add("[accent]" + mod.meta.name + "[lightgray] v" + mod.meta.version);
+                            title.add().growX();
+
+                            title.addImageButton(Icon.trash16Small, Styles.cleari, () -> ui.showConfirm("$confirm", "$mod.remove.confirm", () -> {
+                                mods.removeMod(mod);
+                                setup();
+                            })).size(50f);
+                        }).growX().left().padTop(-14f).padRight(-14f);
+
+                        t.row();
+                        if(mod.meta.author != null){
+                            t.add(Core.bundle.format("mod.author", mod.meta.author));
+                            t.row();
+                        }
+                        if(mod.meta.description != null){
+                            t.labelWrap("[lightgray]" + mod.meta.description).growX();
+                            t.row();
+                        }
+
+                    }).width(500f);
+                    table.row();
+                }
+            });
+
+        }else{
+            cont.table(Styles.black6, t -> t.add("$mods.none")).height(80f);
+        }
+
+        cont.row();
+
+        cont.addImageTextButton("$mod.import", Icon.add, () -> {
+            platform.showFileChooser(true, "zip", file -> {
+                try{
+                    mods.importMod(file);
+                    setup();
+                }catch(IOException e){
+                    ui.showException(e);
+                    e.printStackTrace();
+                }
+            });
+        }).margin(12f).width(500f);
+    }
+}

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

@@ -4,6 +4,7 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.input.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.*;

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

@@ -163,6 +163,7 @@ public class MenuFragment extends Fragment{
                 ),
                 new Buttoni("$editor", Icon.editorSmall, ui.maps::show),
                 steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null,
+                new Buttoni(Core.bundle.get("mods") + "\n" + Core.bundle.get("mods.alpha"), Icon.wikiSmall, ui.mods::show),
                 new Buttoni("$settings", Icon.toolsSmall, ui.settings::show),
                 new Buttoni("$about.button", Icon.infoSmall, ui.about::show),
                 new Buttoni("$quit", Icon.exitSmall, Core.app::exit)