diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-24 11:53:57 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-24 11:59:18 +0800 |
| commit | 106896bce86f1984df7be0bda33aba93c8815c4a (patch) | |
| tree | 80467a55723325bbe30076f5ea616f060305567c /forge/src/main | |
| parent | 20317a973895ad237fb58adc2b2b1ece8a45cea4 (diff) | |
| parent | 91cc0c43de61b97b54477f90710a45bc71b744b9 (diff) | |
| download | RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.tar.gz RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.tar.bz2 RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.zip | |
Merge branch '12.x-1.20' into 14.x-1.20.4
# Conflicts:
# build.gradle
# gradle/wrapper/gradle-wrapper.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java
Diffstat (limited to 'forge/src/main')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java index e69855315..d4db2f068 100644 --- a/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java +++ b/forge/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.minecraftforge.api.distmarker.Dist; import net.minecraftforge.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 |