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
..
background.png	Added tile background to background for large screens	2018-02-13 17:21:14 -05:00
icon.icns	Added native file chooser, fixed macOS prefs errors	2018-05-24 21:13:31 -04:00
icon.png	Changed application icon	2018-01-20 23:01:54 -05:00
icon@2x.icns	Added native file chooser, fixed macOS prefs errors	2018-05-24 21:13:31 -04:00
sprites.atlas	Implemented block breaking on Android	2018-05-31 16:27:30 -04:00
sprites.png	Implemented block breaking on Android	2018-05-31 16:27:30 -04:00