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

..

AndroidLauncher.java

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

2018-11-17 11:24:37 -05:00

DonationsActivity.java

Cleanup of TODOs

2018-11-24 08:21:22 -05:00

PatchedAndroidApplication.java

Minor cleanup

2018-07-28 12:50:11 -04:00