Merge branch '1.11.2-dev' into 1.12-dev

gradle/reprod/patches/replaymod/0001-Replace-buildscript-dependencies-with-manually-built.patch

@@ -0,0 +1,44 @@
+From 493dbd8ed387d661eef3e33ee614c79d7487f1bd Mon Sep 17 00:00:00 2001
+From: Jonas Herzig <me@johni0702.de>
+Date: Mon, 7 Aug 2017 20:41:05 +0200
+Subject: [PATCH 1/5] Replace buildscript dependencies with manually built ones
+
+---
+ build.gradle | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index ee24828..42d0607 100755
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,24 +1,17 @@
+ import groovy.json.JsonOutput
+ 
+ buildscript {
+     repositories {
+         mavenCentral()
+-        maven {
+-            name = "forge"
+-            url = "http://files.minecraftforge.net/maven"
+-        }
+-        maven {
+-            name = "sponge"
+-            url = "https://repo.spongepowered.org/maven"
+-        }
+         maven {
+             name = "sonatype"
+             url = "https://oss.sonatype.org/content/repositories/snapshots/"
+         }
++        maven { url 'gradle/reprod/deps/repo' }
+     }
+     dependencies {
+-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+-        classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
++        classpath 'reprod:forgegradle:0'
++        classpath 'reprod:mixingradle:0'
+     }
+ }
+ 
+-- 
+2.5.5
+

gradle/reprod/patches/replaymod/0002-Replace-mixin-dep-with-manually-built-one.patch

@@ -0,0 +1,25 @@
+From 9e4e7ac3f8ee5508939cf71e731189e4c0e1c7b5 Mon Sep 17 00:00:00 2001
+From: Jonas Herzig <me@johni0702.de>
+Date: Tue, 8 Aug 2017 20:06:39 +0200
+Subject: [PATCH 2/5] Replace mixin dep with manually built one
+
+---
+ build.gradle | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 42d0607..bfa3914 100755
+--- a/build.gradle
++++ b/build.gradle
+@@ -44,7 +44,7 @@ configurations {
+ dependencies {
+     compile 'org.projectlombok:lombok:1.16.4'
+ 
+-    compile 'org.spongepowered:mixin:0.7.5-SNAPSHOT'
++    compile 'reprod:mixin:0'
+     shade 'com.googlecode.mp4parser:isoparser:1.1.7'
+     shade 'org.apache.commons:commons-exec:1.3'
+     shade 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0'
+-- 
+2.5.5
+