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

core/assets/sprites/block_colors.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 815 B After Width:  |  Height:  |  Size: 815 B

core/assets/sprites/fallback/sprites.atlas

+6325 -6339

File diff suppressed because it is too large Load Diff

core/assets/sprites/fallback/sprites3.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 923 KiB After Width:  |  Height:  |  Size: 949 KiB

core/assets/sprites/fallback/sprites4.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 472 KiB After Width:  |  Height:  |  Size: 522 KiB

core/assets/sprites/fallback/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 MiB After Width:  |  Height:  |  Size: 186 KiB

core/assets/sprites/fallback/sprites7.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 407 KiB After Width:  |  Height:  |  Size: 425 KiB

core/assets/sprites/fallback/sprites8.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 KiB After Width:  |  Height:  |  Size: 1.4 MiB

core/assets/sprites/sprites.atlas

+7141 -7155

File diff suppressed because it is too large Load Diff

core/assets/sprites/sprites.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 MiB After Width:  |  Height:  |  Size: 2.9 MiB

core/assets/sprites/sprites2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 MiB After Width:  |  Height:  |  Size: 187 KiB

core/assets/sprites/sprites4.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 403 KiB After Width:  |  Height:  |  Size: 421 KiB

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 307 KiB After Width:  |  Height:  |  Size: 1.4 MiB