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

Browse Source

 Conflicts:

	core/assets/icons/icons.properties

	core/assets/sprites/block_colors.png

	core/assets/sprites/fallback/sprites.atlas

	core/assets/sprites/fallback/sprites3.png

	core/assets/sprites/fallback/sprites4.png

	core/assets/sprites/fallback/sprites5.png

	core/assets/sprites/fallback/sprites7.png

	core/assets/sprites/fallback/sprites8.png

	core/assets/sprites/sprites.atlas

	core/assets/sprites/sprites.png

	core/assets/sprites/sprites2.png

	core/assets/sprites/sprites4.png

	core/assets/sprites/sprites5.png

	core/src/mindustry/content/Blocks.java

...

This commit is contained in:

slava0135

2020-09-30 09:48:18 +03:00

parent fb53abe593 3c3c15dcf4

commit d4402ee3bb

33 changed files with 13791 additions and 13571 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

BIN

core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png Normal file

Binary file not shown.

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

BIN

core/assets-raw/sprites/blocks/turrets/foreshadow.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB