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

Browse Source

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java

...

This commit is contained in:

Anuken

2018-02-27 19:58:34 -05:00

parent 2518564f92 1195b6c541

commit d3ec50825e

59 changed files with 2419 additions and 1120 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-raw/sprites/ui/icons/icon-admin-small.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 163 B

core/assets-raw/sprites/ui/icons/icon-admin.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 257 B

core/assets-raw/sprites/ui/icons/icon-ban.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 276 B

core/assets-raw/sprites/ui/icons/icon-zoom-small.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 228 B