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
..
bundles	Update bundle_ko.properties	2018-05-31 20:53:38 +09:00
cursors	Added custom cursors	2018-03-16 12:34:35 -04:00
maps	Added IndexedRenderer rotation, map editor rotation	2018-05-21 23:00:40 -04:00
music	iOS plist fixes, re-added music	2018-05-16 11:06:15 -07:00
shaders	New shaders, remake of Android placement partially done	2018-05-29 22:03:43 -04:00
sounds	Changed OGGs to MP3s, fixed desktop version being unable to start	2018-04-27 22:44:21 -04:00
sprites	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-05-31 17:00:47 -04:00
ui	Changed map edit menu, added map info dialog	2018-05-22 14:16:12 -04:00