Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8

# Conflicts:
#	build.gradle
This commit is contained in:
Modmuss50 2015-11-29 12:29:42 +00:00
commit 60d7b63d5b

View file

@ -108,7 +108,7 @@ dependencies {
// compile "com.github.azanor:baubles:1.0.1.10:deobf@jar" // compile "com.github.azanor:baubles:1.0.1.10:deobf@jar"
// deobfCompile name: "MineTweaker3", version: "1.8-3.0.10B", classifier: "Dev" // deobfCompile name: "MineTweaker3", version: "1.8-3.0.10B", classifier: "Dev"
// shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
compile 'RebornCore:RebornCore-1.8.8:1.0.0.+:dev' compile 'RebornCore:RebornCore-1.8.8:1.1.0.+:dev'
deobfCompile "mezz.jei:jei_1.8.8:2.0.5.6" deobfCompile "mezz.jei:jei_1.8.8:2.0.5.6"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'