diff --git a/build.gradle b/build.gradle
index 0e44ead..8ef0da4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
+		classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
 	}
 }
@@ -53,16 +53,6 @@ processResources {
 
 repositories {
 	jcenter()
-	maven {
-		name "shadowfacts"
-		url "http://mvn.rx14.co.uk/shadowfacts/"
-	}
-	maven {
-		url "http://dvs1.progwml6.com/files/maven"
-	}
-	maven {
-		url "http://maven.epoxide.xyz"
-	}
 }
 
 dependencies {
@@ -111,3 +101,11 @@ reobf {
 }
 tasks.reobfShadowJar.mustRunAfter shadowJar
 tasks.build.dependsOn reobfShadowJar
+
+uploadArchives {
+	repositories.mavenDeployer {
+		repository(url: "http://archiva.shadowfacts.net/repository/local/") {
+			authentication(userName: project.hasProperty("mavenUser") ? project.mavenUser : System.getenv("mavenUser"), password: project.hasProperty("mavenPassword") ? project.mavenPassword : System.getenv("mavenPassword"))
+		}
+	}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index aa4fb43..be0e5e4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ group = net.shadowfacts
 archivesBaseName = Forgelin
 
 mc_version = 1.12
-mcp_mappings = snapshot_20170624
-forge_version = 14.21.0.2368
+mcp_mappings = snapshot_20170629
+forge_version = 14.21.1.2387
 
 kotlin_version = 1.1.3
 annotations_version = 15.0