From 7d1ba596b1a082f5ff9c8f77b82ae01052d05307 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 15 Oct 2021 02:43:07 +0800
Subject: Fix merge conflicts

---
 forge/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'forge')

diff --git a/forge/build.gradle b/forge/build.gradle
index 9b2f40ee4..cae50b1c7 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "5.0.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
 }
 
 architectury {
@@ -57,7 +57,7 @@ dependencies {
 
     common(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false }
     shadowCommon(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false }
-    common(project(path: ":jei-internals-workaround", configuration: "dev")) { transitive = false }
+    runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "dev")) { transitive = false }
 
     depProjects.forEach {
         common(project(path: it, configuration: "dev")) { transitive false }
@@ -82,6 +82,8 @@ dependencies {
     modRuntime("curse.maven:jep-417645:3198370")
     modRuntime("curse.maven:simple-storage-network-268495:3257204")
     modRuntime("curse.maven:create-328085:3278516")
+    modRuntime("curse.maven:industrial-foregoing-266515:3446262")
+    modRuntime("curse.maven:titanium-287342:3346366")
 }
 
 shadowJar {
-- 
cgit