Mindustry/core/assets-raw/sprites/blocks
Patrick 'Quezler' Mounier 8a089ba3c9
Resolve conflicts
# 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
2019-11-12 08:44:26 +01:00
..
defense More sprite updates 2019-06-17 10:08:24 -04:00
distribution Added inverted sorter 2019-10-13 12:58:58 -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 Add files via upload 2019-10-19 10:58:34 +02:00
liquid Add a cap against leaking 2019-11-05 14:30:46 +01:00
mechs Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
power Cleaned up diode 2019-11-11 23:32:49 -05:00
production Bugfixes 2019-06-17 15:45:10 -04:00
storage Config drawing 2019-10-17 21:58:49 -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 🚧 Add insulator wall (#840) 2019-10-27 17:41:00 -04:00