Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties		2018-03-09 20:58:21 -05:00
..
background.png
icon.icns
icon.png
sprites.atlas	Added generic drill class, cleanup of other subclasses	2018-03-09 20:57:12 -05:00
sprites.png	Added generic drill class, cleanup of other subclasses	2018-03-09 20:57:12 -05:00