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

# Conflicts: # proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java
2019-01-27 03:44:01 +03:00
parent 64bac19696 0a833fb715
commit 3f0c2a782e
6 changed files with 60 additions and 32 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,8 @@ subprojects {
    }

    dependencies {
+        compile (group: 'org.jetbrains', name: 'annotations', version: '16.0.3')
+
        /* Logger */
        compile (group: 'org.slf4j', name: 'slf4j-api',      version: slf4j_version)
        compile (group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4j_version)