Anuken aeae286273 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-04 08:38:36 -05:00

..

Administration.java

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

2020-03-04 08:38:36 -05:00

ArcNetProvider.java

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

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

BeControl.java

Various icon changes

2020-01-17 13:57:04 -05:00

CrashSender.java

c l e a n u p

2020-02-05 18:28:19 -05:00

Host.java

Added server descriptions

2020-01-18 10:05:18 -05:00

Interpolator.java

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

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

Net.java

it is done

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

NetConnection.java

Cleanup continues

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

NetworkIO.java

Better IO

2020-02-13 22:11:59 -05:00

Packet.java

it is done

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

Packets.java

Better IO

2020-02-13 22:11:59 -05:00

Registrator.java

it is done

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

Streamable.java

it is done

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

ValidateException.java

Cleanup continues

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