Merge branch '1.11-dev' into 1.11.2-dev

2018-01-16 23:28:46 +01:00
parent 430a5044f5 e7ce03e85f
commit 06bebda557
37 changed files with 757 additions and 44 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ dependencies {

    shade 'org.aspectj:aspectjrt:1.8.2'

-    shade 'com.github.replaymod:ReplayStudio:a4a75b3'
+    shade 'com.github.replaymod:ReplayStudio:9605121'

    testCompile 'junit:junit:4.11'
 }