diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-15 02:43:07 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-16 00:50:06 +0800 |
| commit | a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a (patch) | |
| tree | 8f35ef541a5bace21530db7e9ffeed9d1060facf /forge | |
| parent | c65b2a347b38724ccb777114f5353e7f18b978b5 (diff) | |
| download | RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.gz RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.bz2 RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.zip | |
Fix merge conflicts
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/build.gradle | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index 94be9b025..1accad167 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -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")) { 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 { |