diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-02-23 14:46:06 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-02-23 14:46:06 +0800 |
| commit | ac2a724b0575438357810fdc71b4c2fa6590665c (patch) | |
| tree | eec15bf1eaad9918e2d3ae4d22918a5a7e50b455 /forge/build.gradle | |
| parent | 792d6ee9325b0a14796de51e31c9f51876fcdf8f (diff) | |
| parent | a2309c47c447d217346147af5823e991feaf9dcd (diff) | |
| download | RoughlyEnoughItems-ac2a724b0575438357810fdc71b4c2fa6590665c.tar.gz RoughlyEnoughItems-ac2a724b0575438357810fdc71b4c2fa6590665c.tar.bz2 RoughlyEnoughItems-ac2a724b0575438357810fdc71b4c2fa6590665c.zip | |
Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2
# Conflicts:
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
Diffstat (limited to 'forge/build.gradle')
| -rw-r--r-- | forge/build.gradle | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index ff7bf5841..45bcac64a 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -95,7 +95,7 @@ dependencies { modRuntime("curse.maven:refined-storage-243076:3623324") modRuntime("appeng:appliedenergistics2:10.0.1") // modRuntime("curse.maven:tcon-74072:3273213") - // modRuntime("curse.maven:mantle-74924:3273201") + modRuntime("curse.maven:mantle-74924:3634761") modRuntime("curse.maven:jer-240630:3575590") modRuntime("curse.maven:jep-417645:3550303") modRuntime("curse.maven:simple-storage-network-268495:3594529") @@ -130,6 +130,7 @@ dependencies { modRuntime("curse.maven:cyclops-core-236307:3614854") modRuntime("curse.maven:elemental-craft-395158:3593428") modRuntime("curse.maven:datapack-anvil-432817:3569515") + modRuntime("curse.maven:assemblylinemachines-388282:3623609") } shadowJar { |