Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source

# 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

...

This commit is contained in:

Anuken

2018-05-31 17:00:47 -04:00

parent 32201dda72 fcb74d4fba

commit a141df434c

13 changed files with 85 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

core/assets/sprites/icon.icns

BIN

Binary file not shown.

core/assets/sprites/icon@2x.icns

BIN

Binary file not shown.