Merge branch 'master' into crater

Browse Source

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-03-05 10:00:02 +01:00

parent 4bb9a93ff9 0534a4da45

commit e5e4884448

656 changed files with 3579 additions and 1832 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

+848 -834

File diff suppressed because it is too large Load Diff