Merge remote-tracking branch 'origin/master' into dev/directories

# Conflicts:
#	build.gradle.kts
This commit is contained in:
dfsek
2021-04-11 18:57:33 -07:00
5 changed files with 37 additions and 20 deletions

View File

@@ -20,7 +20,8 @@ dependencies {
"shadedApi"("org.ow2.asm:asm:9.0")
"shadedApi"("commons-io:commons-io:2.6")
"compileOnly"("com.googlecode.json-simple:json-simple:1.1")
"shadedApi"("com.googlecode.json-simple:json-simple:1.1.1")
"shadedApi"("org.yaml:snakeyaml:1.27")
"compileOnly"("com.google.guava:guava:30.0-jre")