Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2019-06-09 12:04:49 -04:00
parent 444b5dbd97 a6d5bdd001
commit 5946aaa31f
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/editor/MapInfoDialog.java
View File

@@ -58,7 +58,7 @@ public class MapInfoDialog extends FloatingDialog{
cont.row();
cont.add("$editor.rules").padRight(8).left();
cont.addButton("$edit", () -> ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f);;
cont.addButton("$edit", () -> ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f);
cont.row();
cont.add("$editor.waves").padRight(8).left();

1
core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
View File

@@ -9,7 +9,6 @@ import io.anuke.arc.scene.event.InputListener;
import io.anuke.arc.scene.ui.layout.Unit;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.world;
public class MinimapDialog extends FloatingDialog{