PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 08:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into valhalla

Browse source 
# Conflicts:
#	build.gradle
This commit is contained in:
Matthew Messinger 2018-07-08 19:02:24 -04:00
commit abf27e13e1
2 changed files with 88 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build.gradle
View file

@ -48,26 +48,29 @@ sourceSets {
dependencies { 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 {
doFirst {
json {
mcversion = '1.12.r2' mcversion = '1.12.r2'
author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
description = 'Mine Little Pony turns players and mobs into ponies' description = 'Mine Little Pony turns players and mobs into ponies'
description.minelittlepony = '''\ description.minelittlepony = '''\
Mine Little Pony turns players and mobs into ponies Mine Little Pony turns players and mobs into ponies
Press F9 ingame to access settings'''.stripIndent() Press F9 ingame to access settings'''
description.hdskinsmod = '''\ description.hdskinsmod = '''\
Separate skin server for Mine Little Pony that also supports HD skins. 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 += [ mixinConfigs += [
'minelp.mixin.json', 'minelp.mixin.json',
'hdskins.mixin.json' 'hdskins.mixin.json'
] ]
}
}
} }
jar { jar {
@ -90,6 +93,7 @@ shadowJar {
} }
relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime' relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime'
exclude 'dummyThing' exclude 'dummyThing'
} }
sourceJar { sourceJar {
// add hdskins sources // add hdskins sources
@ -116,7 +120,8 @@ reobf {
srgJar { srgJar {
mappingType = 'SEARGE' mappingType = 'SEARGE'
} }
shadowJar{} shadowJar {}
} }
mixin { mixin {
defaultObfuscationEnv notch defaultObfuscationEnv notch

4
build.number
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #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