Merge branch 'develop' into anarok/loop-3-merge

# Conflicts: # build.gradle # settings.gradle
2018-08-05 00:11:17 +07:00
parent 581fad36c2 60a7ad1963
commit 9eaa9d7af0
85 changed files with 2520 additions and 287 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,5 +5,5 @@ include('flat_world')
 include('vanilla_commands')
 include('proto_1.12.2') // Protocol 1.12.2
 include('proto_1.12.2_netty') // Protocol 1.12.2 (Netty impl.)
-include('event-loop')
-
+include('generated_world')
+include('event-loop')