Anuken 066a1d7591 Merge remote-tracking branch 'origin/4.0' into 4.0 ...

# Conflicts:
#	core/src/io/anuke/mindustry/Vars.java

2018-07-13 19:54:20 -04:00

..

io/anuke/mindustry

Merge remote-tracking branch 'origin/4.0' into 4.0

2018-07-13 19:54:20 -04:00

Mindustry.gwt.xml

Formatting

2018-07-12 20:37:15 -04:00