diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-05-21 20:29:08 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-05-21 20:29:08 +0800 |
| commit | a4884f1e31083a05b48ea238ce8792842e691444 (patch) | |
| tree | 5284d9cc68d5d21f74a6dc84f8004d42061c8831 /forge | |
| parent | e48b5b7a9eec72fcaf202d1ffe53765da6aad503 (diff) | |
| parent | 8589dfa9b7e382c2eff22bb1c5bea5d7759007d5 (diff) | |
| download | RoughlyEnoughItems-a4884f1e31083a05b48ea238ce8792842e691444.tar.gz RoughlyEnoughItems-a4884f1e31083a05b48ea238ce8792842e691444.tar.bz2 RoughlyEnoughItems-a4884f1e31083a05b48ea238ce8792842e691444.zip | |
Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19
# Conflicts:
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/SearchFilteringRule.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/FavoritesListWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/build.gradle | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index e6ea07751..260be545a 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -101,8 +101,8 @@ dependencies { // modRuntime("curse.maven:jer-240630:3575590") // modRuntime("curse.maven:jep-417645:3550303") // modRuntime("curse.maven:simple-storage-network-268495:3594529") - // modRuntime("curse.maven:create-328085:3536025") - // modRuntime("curse.maven:flywheel-486392:3535459") + modRuntime("curse.maven:create-328085:3737418") + modRuntime("curse.maven:flywheel-486392:3737402") // modRuntime("curse.maven:industrial-foregoing-266515:3446262") // modRuntime("curse.maven:titanium-287342:3346366") // modRuntime("curse.maven:extended-crafting-268387:3606681") @@ -129,11 +129,13 @@ dependencies { // modRuntime("curse.maven:natures-aura-306626:3587798") // modRuntime("curse.maven:integrated-dynamics-236307:3631804") // modRuntime("curse.maven:common-capabilities-247007:3614900") - // modRuntime("curse.maven:cyclops-core-236307:3614854") + modRuntime("curse.maven:evilcraft-74610:3795956") + modRuntime("curse.maven:cyclops-core-236307:3778682") // modRuntime("curse.maven:elemental-craft-395158:3593428") // modRuntime("curse.maven:datapack-anvil-432817:3569515") // modRuntime("curse.maven:assemblylinemachines-388282:3623609") // modRuntime("curse.maven:mystical-agriculture-246640:3645812") + modRuntime("curse.maven:oreberries-replanted-454062:3776180") } def modRuntime(str) { @@ -222,7 +224,7 @@ curseforge { addGameVersion "Java 17" addGameVersion "Forge" relations { - requiredDependency "architectury-forge" + requiredDependency "architectury-api" requiredDependency "cloth-config" requiredDependency "roughly-enough-items-hacks" } @@ -240,7 +242,7 @@ curseforge { addGameVersion "Java 17" addGameVersion "Forge" relations { - requiredDependency "architectury-forge" + requiredDependency "architectury-api" requiredDependency "cloth-config" } mainArtifact(tasks.getByName("serverOnlyJar")) { |