This repository has been archived on 2022-03-24. You can view files and clone it, but cannot push or open issues or pull requests.

DmitriyMX 39996f9847 Merge branch 'dev/event-bus' into dev/network-api ...

# Conflicts:
#	protocol/build.gradle
#	protocol/src/main/java/mc/protocol/NettyServer.java
#	protocol/src/main/java/mc/protocol/PacketInboundHandler.java
#	protocol/src/main/java/mc/protocol/State.java
#	protocol/src/main/java/mc/protocol/di/ProtocolModule.java
#	server/src/main/java/mc/server/Main.java

2021-05-06 13:42:01 +03:00

..

src

Merge branch 'dev/event-bus' into dev/network-api

2021-05-06 13:42:01 +03:00

build.gradle

Merge branch 'dev/event-bus' into dev/network-api

2021-05-06 13:42:01 +03:00

gradle.properties

update version

2021-05-01 16:30:42 +03:00