Merge

2020-01-18 11:16:03 -05:00
parent b20e0967fd 95352e1729
commit f044f30829
236 changed files with 6310 additions and 6330 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -310,6 +310,7 @@ project(":annotations"){

    dependencies{
        compile 'com.squareup:javapoet:1.11.0'
+        compile "com.github.Anuken.Arc:arc-core:b77767039334b2658f44d69e72d1ef6bc84f95b0"
        compile files("${System.getProperty('java.home')}/../lib/tools.jar")
    }
 }