Merge branch 'master' into valhalla

# Conflicts:
#	build.gradle

build.gradle

@@ -48,26 +48,29 @@ sourceSets {
 
 dependencies {
     // use the same version as httpclient
-	compile('org.apache.httpcomponents:httpmime:4.3.2'){
+    compile('org.apache.httpcomponents:httpmime:4.3.2') {
         transitive = false
     }
 }
 
-litemod.json {
+litemod {
+    doFirst {
+        json {
             mcversion = '1.12.r2'
             author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
             description = 'Mine Little Pony turns players and mobs into ponies'
             description.minelittlepony = '''\
 				Mine Little Pony turns players and mobs into ponies
-		Press F9 ingame to access settings'''.stripIndent()
+				Press F9 ingame to access settings'''
             description.hdskinsmod = '''\
 				Separate skin server for Mine Little Pony that also supports HD skins.
-		Access via button on the main menu.'''.stripIndent()
-
+				Access via button on the main menu.'''
             mixinConfigs += [
                     'minelp.mixin.json',
                     'hdskins.mixin.json'
             ]
+        }
+    }
 }
 
 jar {
@@ -90,6 +93,7 @@ shadowJar {
     }
     relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime'
     exclude 'dummyThing'
+
 }
 sourceJar {
     // add hdskins sources
@@ -116,7 +120,8 @@ reobf {
     srgJar {
         mappingType = 'SEARGE'
     }
-	shadowJar{}
+    shadowJar {}
+
 }
 mixin {
     defaultObfuscationEnv notch

build.number

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