Anuken 3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages ...

# 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/sprites5.png

2019-09-21 18:59:49 -04:00

..

defense

More sprite updates

2019-06-17 10:08:24 -04:00

distribution

Sprite updates

2019-06-23 12:36:13 -04:00

drills

Fixed connection not resetting on game load / Experimental click changes

2019-08-05 10:26:24 -04:00

environment

Random in-game music, untested

2019-08-10 18:56:20 -04:00

extra

message blocks

2019-09-03 16:11:01 -04:00

liquid

Fixed editor not showing after second view

2019-08-01 11:26:28 -04:00

mechs

Even more sprites cleaned up

2019-06-06 00:28:09 -04:00

power

Fixed tops of some generator blocks

2019-06-30 11:25:39 -04:00

production

Bugfixes

2019-06-17 15:45:10 -04:00

storage

Even more sprites cleaned up

2019-06-06 00:28:09 -04:00

turrets

New discord app ID / New testing sounds

2019-08-12 12:32:13 -04:00

units

Unit enemy spawnpoint camping

2019-09-20 23:09:11 -04:00

walls

Changed turret outlines / Wall block tweaks

2019-06-06 21:18:54 -04:00