From b4ab401f98a0149d7657a8087ba33a1bcd285779 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Sat, 1 Oct 2016 23:53:45 +0200
Subject: [PATCH] Fixes dependencies and enables installation of JEI and Waila.

---
 build.gradle                       |  4 ++--
 gradle.properties                  |  4 ++--
 gradle/scripts/dependencies.gradle | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index dc96e2d6..392c0b8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,11 +42,11 @@ dependencies {
     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/autoinstallruntime.gradle'
 apply from: 'gradle/scripts/integration.gradle'
-//apply from: 'gradle/scripts/optional.gradle'
+apply from: 'gradle/scripts/optional.gradle'
 
 
 sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/gradle.properties b/gradle.properties
index 20617560..57247bda 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ forge_version=12.18.1.2094
 #########################################################
 # Installable                                           #
 #########################################################
-waila_version=1.6.0_B1
+waila_version=1.7.0-B3
 jabba_version=1.2.1a
 #enderstorage_version=1.4.7.36
 #translocator_version=1.1.2.15
@@ -33,7 +33,7 @@ invtweaks_version=1.59
 fmp_version=1.2.0.345
 code_chicken_lib_version=1.1.3.138
 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
 opencomputers_version=1.5.18.39
 pneumaticcraft_version=1.9.15-105
diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle
index 2c30bfe7..b006254a 100644
--- a/gradle/scripts/dependencies.gradle
+++ b/gradle/scripts/dependencies.gradle
@@ -61,6 +61,11 @@ repositories {
         url = "http://maven.k-4u.nl/"
     }
 
+    maven {
+        name = "JEI repo"
+        url "http://dvs1.progwml6.com/files/maven"
+    }
+
     ivy {
         name "BuildCraft"
         artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
@@ -94,7 +99,7 @@ configurations {
 
 dependencies {
     // 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 "codechicken:EnderStorage:${minecraft_version}-${enderstorage_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: '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"
 }