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

..

blocks

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

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

editor

Cleanup

2019-06-04 23:30:07 -04:00

effects

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

items

Cleanup, main menu progress

2019-07-03 23:36:51 -04:00

mechs

Bugfixes

2019-07-10 09:55:31 -04:00

shapes

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

ui

Unit enemy spawnpoint camping

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

units

By popular demand, re-added command center

2019-08-24 15:39:01 -04:00

weapons

Updated sprites/UI colors

2019-07-07 14:11:57 -04:00

zones

Fixed map loading bugs

2019-09-01 10:46:44 -04:00

pack.json

Cleanup

2019-06-04 23:30:07 -04:00