diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java index d489f34bc..9a352fbb0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java @@ -93,9 +93,9 @@ public class FilterSettings { } private static boolean areEqualEnough(ItemStack first, ItemStack second, boolean mod, boolean damage, boolean nbt) { - if (mod && checkMod(first, second) && checkDamage(first, second, damage)) { - return true; - } + if (mod) + return checkMod(first, second) && checkDamage(first, second, damage); + return checkItem(first, second, nbt) && checkDamage(first, second, damage); } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index cdcf0b3c9..4b6d9d05b 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -440,7 +440,7 @@ "tooltip.actuallyadditions.playerProbe.notice": "Look out! Someone tried to probe you and strap you to a Player Interface, but they failed!", "tooltip.actuallyadditions.battery.discharge": "Charging other items in inventory", "tooltip.actuallyadditions.battery.noDischarge": "Not charging other items in inventory", - "tooltip.actuallyadditions.battery.changeMode": "Sneak-right-click to toggle.", + "tooltip.actuallyadditions.battery.changeMode": "Sneak-right-click to toggle", "tooltip.actuallyadditions.previouslyDoubleFurnace": "Previously \"Double Furnace\"", "tooltip.actuallyadditions.previouslyBag": "Previously \"Bag\"", "tooltip.actuallyadditions.previouslyVoidBag": "Previously \"Void Bag\"", @@ -472,7 +472,7 @@ "info.actuallyadditions.gui.ignoreNBT": "Ignoring NBT Data", "info.actuallyadditions.gui.ignoreMod": "Mod Mode Off", "info.actuallyadditions.gui.respectMod": "Mod Mode On", - "info.actuallyadditions.gui.respectModInfo": "If this is enabled, the filter will compare the mods items come from §cinstead of comparing the items themselves§r. This can be useful for storage systems with mod-based chests. Can also be combined with the other options, but that normally isn't very useful.", + "info.actuallyadditions.gui.respectModInfo": "If this is enabled, the filter will compare the mods items come from §cinstead of comparing the items themselves§r. This can be useful for storage systems with mod-based chests. Can be combined with damage matching, but that normally isn't very useful.", "info.actuallyadditions.gui.autosplititems.on": "Auto-Split Items On", "info.actuallyadditions.gui.autosplititems.off": "Auto-Split Items Off", "info.actuallyadditions.gui.inbound": "INBOUND",