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

..

Binding.java

it is done

2019-12-25 01:39:38 -05:00

DesktopInput.java

Improved controls / Re-added engine sprite

2020-02-16 13:16:18 -05:00

InputHandler.java

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

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

MobileInput.java

it launches

2020-02-05 22:08:57 -05:00

Placement.java

Cleanup continues

2020-02-04 18:00:32 -05:00

PlaceMode.java

it is done

2019-12-25 01:39:38 -05:00