Anuken 938ea19b5e Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java

2018-02-05 20:57:44 -05:00

..

assets

Added 'block info' tool, fixed sorter corruptions

2018-02-03 21:49:43 -05:00

assets-raw/sprites

Fixed bugs with player list, rturret description and deserialization

2018-01-30 22:11:54 -05:00

src

Merge remote-tracking branch 'origin/master'

2018-02-05 20:57:44 -05:00

build.gradle

Removed direct usage of texture packer, buildscript cleanup

2018-01-26 15:09:13 -05:00