Merge branch '1.8-dev' into 1.8.9-dev

2018-01-16 21:52:50 +01:00
parent 1ca91d7ee9 ea2427a73c
commit 604d33d846
37 changed files with 758 additions and 43 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ dependencies {

    shade 'org.aspectj:aspectjrt:1.8.2'

-    shade 'com.github.replaymod:ReplayStudio:2df8d8b'
+    shade 'com.github.replaymod:ReplayStudio:a2168ca'

    testCompile 'junit:junit:4.11'
 }