Anuken a141df434c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # build.gradle # core/src/io/anuke/mindustry/Vars.java # core/src/io/anuke/mindustry/core/Control.java # core/src/io/anuke/mindustry/core/Platform.java # core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java # core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java # core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java # desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java		2018-05-31 17:00:47 -04:00
..
data	Updated icons again	2018-05-20 15:16:44 -04:00
src/io/anuke/mindustry	Added new screen for managing and viewing maps, many editor fixes	2018-05-23 21:40:59 -04:00
build.gradle
Info.plist.xml	Some more sharing revisions	2018-05-19 20:19:47 -07:00
robovm.properties	Changed bundle identifier script	2018-05-24 16:12:12 -04:00
robovm.xml