Anuken 3ae51edf3a Merge branch '4.0' of https://github.com/Anuken/Mindustry ...

# Conflicts:
#	core/assets/bundles/bundle_ko.properties
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/UI.java

2018-07-14 09:32:55 -04:00

..

assets

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

2018-07-14 09:32:55 -04:00

assets-raw/sprites

Added requirement display / Text fixes / Better crash reports

2018-07-10 16:53:35 -04:00

src

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

2018-07-14 09:32:55 -04:00

build.gradle

Added texture generation system

2018-06-15 18:06:05 -04:00