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

Browse Source

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties

...

This commit is contained in:

Anuken

2018-03-09 20:58:21 -05:00

parent 89ca9ad213 0310614392

commit 9c05ddbd7d

15 changed files with 2205 additions and 2237 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/sprites.atlas

+2041 -2188

File diff suppressed because it is too large Load Diff