Merge branch 'proto_1.12.2' into world

2018-10-08 12:23:52 +03:00
parent 24376c391e f5c8d93657
commit b21933b381
82 changed files with 1854 additions and 802 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@ rootProject.name = 'mc-server'

 include('core') // Core
 include('simple_world')
+include('h2_playermanager')
 include('vanilla_commands')
 include('proto_1.12.2') // Protocol 1.12.2
 include('proto_1.12.2_netty') // Protocol 1.12.2 (Netty impl.)