Merge branch '1.12-dev' into 1.12.1-dev

2018-01-17 19:55:23 +01:00
parent 3a2abf05cb 0f004537af
commit 638cc59097
37 changed files with 759 additions and 45 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ dependencies {

    shade 'org.aspectj:aspectjrt:1.8.2'

-    shade 'com.github.replaymod:ReplayStudio:77dc1d7'
+    shade 'com.github.replaymod:ReplayStudio:d4b2037'

    testCompile 'junit:junit:4.11'
 }