Fixes dependencies and enables installation of JEI and Waila.

This commit is contained in:
Sebastian Hartte 2016-10-01 23:53:45 +02:00
parent 84ac312ba9
commit b4ab401f98
3 changed files with 16 additions and 5 deletions

View file

@ -42,11 +42,11 @@ dependencies {
testCompile "junit:junit:4.12" testCompile "junit:junit:4.12"
} }
//apply from: 'gradle/scripts/dependencies.gradle' apply from: 'gradle/scripts/dependencies.gradle'
apply from: 'gradle/scripts/artifacts.gradle' apply from: 'gradle/scripts/artifacts.gradle'
//apply from: 'gradle/scripts/autoinstallruntime.gradle' //apply from: 'gradle/scripts/autoinstallruntime.gradle'
apply from: 'gradle/scripts/integration.gradle' apply from: 'gradle/scripts/integration.gradle'
//apply from: 'gradle/scripts/optional.gradle' apply from: 'gradle/scripts/optional.gradle'
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8

View file

@ -14,7 +14,7 @@ forge_version=12.18.1.2094
######################################################### #########################################################
# Installable # # Installable #
######################################################### #########################################################
waila_version=1.6.0_B1 waila_version=1.7.0-B3
jabba_version=1.2.1a jabba_version=1.2.1a
#enderstorage_version=1.4.7.36 #enderstorage_version=1.4.7.36
#translocator_version=1.1.2.15 #translocator_version=1.1.2.15
@ -33,7 +33,7 @@ invtweaks_version=1.59
fmp_version=1.2.0.345 fmp_version=1.2.0.345
code_chicken_lib_version=1.1.3.138 code_chicken_lib_version=1.1.3.138
code_chicken_core_version=1.0.7.47 code_chicken_core_version=1.0.7.47
nei_version=1.0.5.111 jei_version=3.12.2.291
bc_version=7.0.9 bc_version=7.0.9
opencomputers_version=1.5.18.39 opencomputers_version=1.5.18.39
pneumaticcraft_version=1.9.15-105 pneumaticcraft_version=1.9.15-105

View file

@ -61,6 +61,11 @@ repositories {
url = "http://maven.k-4u.nl/" url = "http://maven.k-4u.nl/"
} }
maven {
name = "JEI repo"
url "http://dvs1.progwml6.com/files/maven"
}
ivy { ivy {
name "BuildCraft" name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
@ -94,7 +99,7 @@ configurations {
dependencies { dependencies {
// installable // installable
// mods "mcp.mobius.waila:Waila:${waila_version}_1.8.1:dev" mods "mcp.mobius.waila:Waila:${waila_version}_1.9.4:dev"
// mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev" // mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev"
// mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev" // mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev"
// mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev" // mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev"
@ -135,5 +140,11 @@ dependencies {
// compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}") // compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
// compile(group: 'api', name: 'rf', version: "${api_rf_version}") // compile(group: 'api', name: 'rf', version: "${api_rf_version}")
// compile against the JEI API
compile "mezz.jei:jei_1.10.2:${jei_version}:api"
// at runtime, use the full JEI jar
runtime "mezz.jei:jei_1.10.2:${jei_version}"
testCompile "junit:junit:4.12" testCompile "junit:junit:4.12"
} }