Merge branch 'master' into 1.13.2

2019-08-17 16:05:50 -07:00
parent a8226ba4c8 9046eb500b
commit 7c9b812a5b
20 changed files with 137 additions and 84 deletions
@@ -70,7 +70,7 @@ sourceSets {
    schematica_api {
        compileClasspath += main.compileClasspath
    }
-    
+
    main {
        compileClasspath += schematica_api.output
    }