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

..

bundles

Updates bundle_fr_BE.properties (#358)

2018-11-26 12:34:01 -05:00

cursors

Bugfixes, cleanup, optimization

2018-06-02 21:45:07 -04:00

fonts

Bugfixes of various kinds

2018-11-13 09:13:53 -05:00

maps

Difficulty balance / Better map display / UI fixes

2018-11-07 18:51:27 -05:00

shaders

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

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

sprites

Consume icon fix / Liquid mixer fix

2018-11-23 08:32:56 -05:00

ui

Added all placement controls

2018-11-19 14:20:57 -05:00