Anuken b721d7a10f Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations ...

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java

2018-11-26 13:23:38 -05:00

..

res

…

src/io/anuke/mindustry

Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations

2018-11-26 13:23:38 -05:00

AndroidManifest.xml

…

build.gradle

…

ic_launcher-web.png

…

proguard-project.txt

…

project.properties

…