Merge remote-tracking branch 'upstream/master' into merge

This commit is contained in:
Jesse Boyd
2019-11-19 21:25:36 +00:00
parent 2c9f192baf
commit 5d8adbc10c
10 changed files with 54 additions and 61 deletions

View File

@@ -7,3 +7,7 @@ org.gradle.daemon=true
org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.caching=true
loom.version=0.2.5-20190906.190953-30
mixin.version=0.7.11.38