Merge branch '1.10.2-dev' into 1.11-dev

2018-01-16 23:15:31 +01:00
parent bab1d3463e 2dce4eb54a
commit e7ce03e85f
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:a5618f7'
+    shade 'com.github.ReplayMod:ReplayStudio:2b063ec'

    testCompile 'junit:junit:4.11'
 }