Merge branch '1.9.4-dev' into 1.10.2-dev

2018-01-16 22:31:31 +01:00
parent 0ed9a5533e c148076a40
commit 2dce4eb54a
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:cc35b80'
+    shade 'com.github.replaymod:ReplayStudio:7d8c2f7'

    testCompile 'junit:junit:4.11'
 }