Merge branch '1.12.1-dev' into 1.12.2-dev

2018-01-17 20:46:34 +01:00
parent f6b4ea015d 638cc59097
commit 5f2366e49d
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:ecb6992'
+    shade 'com.github.replaymod:ReplayStudio:b040763'

    testCompile 'junit:junit:4.11'
 }