Anuken 6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 ...

# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java

2018-03-03 18:06:57 -05:00

..

assets

Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0

2018-03-03 18:06:57 -05:00

assets-raw/sprites

Added canDump for vaults, better vault icon

2018-03-02 09:04:44 -05:00

src

Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0

2018-03-03 18:06:57 -05:00

build.gradle

Removed direct usage of texture packer, buildscript cleanup

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