Merge branch 'proto_1.12.2' into world-loader-anvil

2018-10-11 00:38:23 +03:00
parent 13c423c004 78b5be88e7
commit 75389cfdb1
100 changed files with 2427 additions and 969 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,8 @@
 rootProject.name = 'mc-server'

 include('core') // Core
-include('flat_world')
+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.)