Anuken 1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ...

# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java

2018-04-21 18:47:43 -04:00

..

res

Add drop shadow to icon

2017-12-20 00:46:01 -05:00

src/io/anuke/mindustry

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

2018-04-21 18:47:43 -04:00

AndroidManifest.xml

Fixed some admin bugs

2018-02-26 22:05:07 -05:00

build.gradle

Completely borked liquid/power/inventory system

2018-03-07 22:54:12 -05:00

ic_launcher-web.png

Add drop shadow to icon

2017-12-20 00:46:01 -05:00

proguard-project.txt

Implemented Android support

2017-06-29 00:54:10 -04:00

project.properties

Implemented Android support

2017-06-29 00:54:10 -04:00