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
parent 46c6b2168c ef85d1d83e
commit b721d7a10f
109 changed files with 1495 additions and 1370 deletions
@@ -28,6 +28,7 @@ logs/
 /core/assets/locales
 /ios/src/io/anuke/mindustry/gen/
 /core/src/io/anuke/mindustry/gen/
+ios/robovm.properties
 *.gif

 version.properties