Anuken 2581353c5e Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config ...

# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java

2020-03-03 21:33:03 -05:00

..

assets

Added support for changing cached floor/terrain

2020-03-03 17:01:09 -05:00

assets-raw

Generation tweaks

2020-02-22 12:05:31 -05:00

src/mindustry

Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config

2020-03-03 21:33:03 -05:00

build.gradle

[formatting] add newline to file(s) (#1508)

2020-02-05 18:36:56 -05:00

convert_sounds.sh

Fixed truncated sounds

2019-08-15 14:16:41 -04:00