Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alexander committed 2014-02-12 09:22:44 -05:00
commit ac1dc2b08a
9 files changed
+6 -6

No files matched your search

+3 -3
View File
@@ -36,8 +36,8 @@ repositories {
artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]"
}
maven {
name 'SlimeKnights Maven FS'
url 'http://aeon.sunstrike.io'
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'
}
maven {
name 'ForgeFS'
@@ -76,7 +76,7 @@ if (configFile2.exists()){
}
dependencies {
compile "mantle:Mantle:${config.mantle_version}:dev"
compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf"
//compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar'
//compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar'
//compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar'
+1 -1
View File
@@ -1,6 +1,6 @@
minecraft_version=1.7.2
forge_version=10.12.0.1027
mantle_version=ccabb5
mantle_version=98.cb9feb6
FMP_version=1.0.0.211
CCLIB_version=1.0.0.44
NEI_version=1.6.1.8
+2 -2
View File
@@ -25,7 +25,7 @@ type1ninja:https://dl.dropboxusercontent.com/s/0ufr1gtqktt1nl2/JeffCape.png
turbeauke:http://i.imgur.com/XdOIone.png
Nieue:http://i.imgur.com/8c5yUgX.png
starr274:https://github.com/SlimeKnights/TinkersConstruct/blob/master/capes/default_gray.png
zeflap:http://i.imgur.com/6OhKrVE.png
zeflap:https://dl.dropboxusercontent.com/s/j9dvs06z7cd16r3/tCape.png
kendfinger:https://dl.dropboxusercontent.com/u/48633261/cape.png
GameGeek1998:http://i.imgur.com/hiMFLXY.png
fumoffu616:https://dl.dropboxusercontent.com/s/f70j8xfwax1p0t5/myeah.png
@@ -46,6 +46,6 @@ the_j485:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png
dgdas12:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png
SatanicSanta:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png
GPuzzle:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png
ajloveslily14:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png
ajloveslily14:https://dl.dropboxusercontent.com/s/8yl77gjf4cygnzo/cape.png
multisofteis:http://i.imgur.com/AgGBsX8.png
----------------------------------------FINALISED - ONLY ALLOW REMOVAL OF CAPES----------------------------------------
Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 757 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 813 B