diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-28 16:42:43 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-28 16:42:43 +0800 |
| commit | 0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd (patch) | |
| tree | 61d83b917987b9d2175e78ab08932aaba1eac880 /neoforge | |
| parent | 15a46dc3a91cf3f8fdb7a1ddf382ce05bfcf742e (diff) | |
| parent | 106896bce86f1984df7be0bda33aba93c8815c4a (diff) | |
| download | RoughlyEnoughItems-0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd.tar.gz RoughlyEnoughItems-0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd.tar.bz2 RoughlyEnoughItems-0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd.zip | |
Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
# Conflicts:
# gradle.properties
# gradle/wrapper/gradle-wrapper.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 3b2fb82a8..c185f5654 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 |