Merge branch 'dev/messages' into rc/1.13

# Conflicts: # build.gradle
2021-10-08 14:45:52 +03:00
parent b299807e1b ce2f302d2e
commit a12c0bd151
4 changed files with 191 additions and 27 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ dependencies {
    testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
    testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
    testImplementation('org.mockito:mockito-core:3.12.4')
+    testImplementation('org.jooq:joor-java-8:0.9.13')
    testImplementation("org.bukkit:bukkit:$bukkitVersion") {
        exclude(module: 'gson')
        exclude(module: 'json-simple')