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.

Daniil 0ea5465518 Merge remote-tracking branch 'origin/develop' into anarok/merge/loop-3 ...

# Conflicts:
#	build.gradle
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
#	settings.gradle

2018-08-10 03:24:30 +07:00

..

java/mc/core

Merge remote-tracking branch 'origin/develop' into anarok/merge/loop-3

2018-08-10 03:24:30 +07:00

resources

default spring config

2018-06-29 22:58:42 +03:00