Merge branch '6.0' into crater

Browse Source

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-04-16 17:13:18 +02:00

parent 5c28985ee6 a8f4df8030

commit a1d4804fae

17 changed files with 782 additions and 702 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

+638 -631

File diff suppressed because it is too large Load Diff