diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-28 16:44:15 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-28 16:44:15 +0800 |
| commit | eaf9236e3da2adafcea204778ecc0072e70d0aa5 (patch) | |
| tree | dc0038d60cbfe79043ffd267c1b8091cfb8e1003 /neoforge | |
| parent | 93d9bd52c81ece461414926b23950cf33d2475e5 (diff) | |
| parent | 0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd (diff) | |
| download | RoughlyEnoughItems-eaf9236e3da2adafcea204778ecc0072e70d0aa5.tar.gz RoughlyEnoughItems-eaf9236e3da2adafcea204778ecc0072e70d0aa5.tar.bz2 RoughlyEnoughItems-eaf9236e3da2adafcea204778ecc0072e70d0aa5.zip | |
Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21
# Conflicts:
# gradle.properties
Diffstat (limited to 'neoforge')
| -rw-r--r-- | neoforge/build.gradle | 4 | ||||
| -rw-r--r-- | neoforge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 44f81780c..23750177d 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -152,6 +152,10 @@ publishing { builtBy remapMojangSourcesJar classifier "sources" } + + // Hack to inherit the dependencies without inheriting the artifacts + publication.setArtifacts(publication.artifacts) + from components.java } } } diff --git a/neoforge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java b/neoforge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java index 01491ecb5..6174b100c 100644 --- a/neoforge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java +++ b/neoforge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.forge; -import me.shedaniel.rei.RoughlyEnoughItemsState; import me.shedaniel.rei.impl.init.PrimitivePlatformAdapter; import net.neoforged.api.distmarker.Dist; import net.neoforged.fml.ModList; @@ -39,9 +38,6 @@ public class PrimitivePlatformAdapterImpl implements PrimitivePlatformAdapter { @Override public void checkMods() { - if (ModList.get().isLoaded("moreoverlays")) { - RoughlyEnoughItemsState.error("REI is not compatible with MoreOverlays, and actually contains Builtin Inventory Highlighting, other features can be installed via different mods!"); - } } @Override |