Merge branch 'master' into valhalla

# Conflicts:
#	build.gradle

build.gradle

@@ -1,20 +1,20 @@
 buildscript {
-	repositories {
+    repositories {
-		jcenter()
+        jcenter()
-		maven {
+        maven {
-			name 'forge'
+            name 'forge'
-			url 'http://files.minecraftforge.net/maven'
+            url 'http://files.minecraftforge.net/maven'
-		}
+        }
-		maven {
+        maven {
-			name = 'sponge'
+            name = 'sponge'
-			url = 'https://repo.spongepowered.org/maven'
+            url = 'https://repo.spongepowered.org/maven'
-		}
+        }
-	}
+    }
-	dependencies {
+    dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-		classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
-		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-	}
+    }
 }
 
 apply plugin: 'net.minecraftforge.gradle.liteloader'
@@ -29,101 +29,106 @@ targetCompatibility = 1.8
 sourceCompatibility = 1.8
 
 minecraft {
-	version = "1.12.2"
+    version = "1.12.2"
-	mappings = 'snapshot_20170919'
+    mappings = 'snapshot_20170919'
-	runDir = 'run'
+    runDir = 'run'
-	replace '@VERSION@', project.version
+    replace '@VERSION@', project.version
 }
 
 sourceSets {
-	hdskins {
+    hdskins {
-		compileClasspath += main.compileClasspath
+        compileClasspath += main.compileClasspath
-		ext.refMap = 'hdskins.mixin.refmap.json'
+        ext.refMap = 'hdskins.mixin.refmap.json'
-	}
+    }
-	main {
+    main {
-		compileClasspath += hdskins.output
+        compileClasspath += hdskins.output
-		ext.refMap = 'minelp.mixin.refmap.json'
+        ext.refMap = 'minelp.mixin.refmap.json'
-	}
+    }
 }
 
 dependencies {
-	// use the same version as httpclient
+    // use the same version as httpclient
-	compile('org.apache.httpcomponents:httpmime:4.3.2'){
+    compile('org.apache.httpcomponents:httpmime:4.3.2') {
-		transitive = false
+        transitive = false
-	}
+    }
 }
 
-litemod.json {
+litemod {
-	mcversion = '1.12.r2'
+    doFirst {
-	author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
+        json {
-	description = 'Mine Little Pony turns players and mobs into ponies'
+            mcversion = '1.12.r2'
-	description.minelittlepony = '''\
+            author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
-		Mine Little Pony turns players and mobs into ponies
+            description = 'Mine Little Pony turns players and mobs into ponies'
-		Press F9 ingame to access settings'''.stripIndent()
+            description.minelittlepony = '''\
-	description.hdskinsmod = '''\
+				Mine Little Pony turns players and mobs into ponies
-		Separate skin server for Mine Little Pony that also supports HD skins.
+				Press F9 ingame to access settings'''
-		Access via button on the main menu.'''.stripIndent()
+            description.hdskinsmod = '''\
-
+				Separate skin server for Mine Little Pony that also supports HD skins.
-	mixinConfigs += [
+				Access via button on the main menu.'''
-		'minelp.mixin.json',
+            mixinConfigs += [
-		'hdskins.mixin.json'
+                    'minelp.mixin.json',
-	]
+                    'hdskins.mixin.json'
+            ]
+        }
+    }
 }
 
 jar {
-	from sourceSets.hdskins.output
+    from sourceSets.hdskins.output
-	from litemod
+    from litemod
-	classifier 'base'
+    classifier 'base'
-	extension 'jar'
+    extension 'jar'
 }
 shadowJar {
-	extension 'litemod'
+    extension 'litemod'
-	classifier "mc$minecraft.version"
+    classifier "mc$minecraft.version"
-	baseName "mod-${project.name.toLowerCase()}"
+    baseName "mod-${project.name.toLowerCase()}"
+
+    from sourceSets.hdskins.output
+    from litemod
+    dependencies {
+        exclude dependency('deobf.com.mumfrey:liteloader:')
+        exclude dependency('deobf.org.ow2.asm:')
+        exclude 'META-INF/**'
+    }
+    relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime'
+    exclude 'dummyThing'
 
-	from sourceSets.hdskins.output
-	from litemod
-	dependencies {
-		exclude dependency('deobf.com.mumfrey:liteloader:')
-		exclude dependency('deobf.org.ow2.asm:')
-		exclude 'META-INF/**'
-	}
-	relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime'
-	exclude 'dummyThing'
 }
 sourceJar {
-	// add hdskins sources
+    // add hdskins sources
-	from sourceSets.hdskins.allSource
+    from sourceSets.hdskins.allSource
 }
 task srgJar(type: Jar) {
-	from sourceSets.main.output
+    from sourceSets.main.output
-	from sourceSets.hdskins.output
+    from sourceSets.hdskins.output
-	from litemod
+    from litemod
-	classifier "mc$minecraft.version-srg"
+    classifier "mc$minecraft.version-srg"
-	baseName "mod-${project.name.toLowerCase()}"
+    baseName "mod-${project.name.toLowerCase()}"
 }
 task skinZip(type: Zip) {
-	from fileTree('skins')
+    from fileTree('skins')
-	baseName 'Pony Skin Resources'
+    baseName 'Pony Skin Resources'
-	version 'v1'
+    version 'v1'
 }
 
 artifacts {
-	archives shadowJar
+    archives shadowJar
 }
 
 reobf {
-	srgJar {
+    srgJar {
-		mappingType = 'SEARGE'
+        mappingType = 'SEARGE'
-	}
+    }
-	shadowJar{}
+    shadowJar {}
+
 }
 mixin {
-	defaultObfuscationEnv notch
+    defaultObfuscationEnv notch
 }
 
 // windows only
 task deploy(type: Copy, dependsOn: build) {
-	from jar.archivePath
+    from jar.archivePath
-	into file("$System.env.APPDATA/.minecraft/mods")
+    into file("$System.env.APPDATA/.minecraft/mods")
 }

build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Jun 11 22:03:32 CAT 2018
+#Sun Jul 08 18:54:44 EDT 2018
-build.number=499
+build.number=500