diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-10-23 21:54:28 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-10-23 21:54:28 +0800 |
| commit | 120e6ea190a342e367e7c26b77d22b057091af84 (patch) | |
| tree | b214b8cf1d24b06ea32e925824af0ea4b7ea7954 /default-plugin/src/main | |
| parent | 67d12db3f28127232ffe8e02957076f210c5cc92 (diff) | |
| parent | 11278f48effaa9a7ccc212ce0a047e356d9c4859 (diff) | |
| download | RoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.tar.gz RoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.tar.bz2 RoughlyEnoughItems-120e6ea190a342e367e7c26b77d22b057091af84.zip | |
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java
Diffstat (limited to 'default-plugin/src/main')
| -rw-r--r-- | default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java index 963717e45..3f91ad76b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java @@ -95,7 +95,7 @@ public class DefaultCraftingCategory implements DisplayCategory<DefaultCraftingD @Override public boolean canMerge(DefaultCraftingDisplay<?> first, DefaultCraftingDisplay<?> second) { if (!first.getCategoryIdentifier().equals(second.getCategoryIdentifier())) return false; - if (!equals(first.getOrganisedInputEntries(3, 3), second.getInputEntries())) return false; + if (!equals(first.getOrganisedInputEntries(3, 3), second.getOrganisedInputEntries(3, 3))) return false; if (!equals(first.getOutputEntries(), second.getOutputEntries())) return false; if (first.isShapeless() != second.isShapeless()) return false; if (first.getWidth() != second.getWidth()) return false; |