diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-28 21:32:59 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-28 21:34:16 +0800 |
| commit | f644c84c664c9bc64e08d100e799caee6750e796 (patch) | |
| tree | ce49adc1884259899dddae338449b1582476ddcb /forge | |
| parent | e82ab958bc7d13e556d7426b7a1862ec76e23eba (diff) | |
| parent | c16a70a0f43a96b6dd2afa86b4fe35f501530aa2 (diff) | |
| download | RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.tar.gz RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.tar.bz2 RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.zip | |
Merge remote-tracking branch 'origin/6.x' into 6.x-1.17
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DelegateScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/TransformingScreen.java
# settings.gradle
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/build.gradle | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index dd119678f..031a5db6f 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -39,10 +39,12 @@ dependencies { implementation(project(path: ":default-plugin")) { transitive = false } implementation(project(path: ":runtime")) { transitive = false } implementation(project(path: ":jei-compatibility-layer")) { transitive = false } + implementation(project(path: ":jei-internals-workaround")) { transitive = false } developmentForge(project(path: ":api")) { transitive = false } developmentForge(project(path: ":default-plugin")) { transitive = false } developmentForge(project(path: ":runtime")) { transitive = false } developmentForge(project(path: ":jei-compatibility-layer")) { transitive = false } + developmentForge(project(path: ":jei-internals-workaround")) { transitive = false } shadowCommon(project(path: ":api", configuration: "transformProductionForge")) { transitive = false } shadowCommon(project(path: ":default-plugin", configuration: "transformProductionForge")) { transitive = false } @@ -59,6 +61,7 @@ dependencies { modRuntime("curse.maven:mantle-74924:3273201") modRuntime("curse.maven:jer-240630:3066754") modRuntime("curse.maven:jep-417645:3198370") + modRuntime("curse.maven:simple-storage-network-268495:3257204") } shadowJar { |