diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java index cf9bdb81..20d9dea2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java @@ -59,6 +59,8 @@ public class VanillaEnchantments { keys.add(NamespacedKey.minecraft(split[i])); } + keys.removeIf(key -> key.getKey().equalsIgnoreCase("none")); + return keys; } )); diff --git a/eco-core/core-plugin/src/main/resources/vanillaenchants.yml b/eco-core/core-plugin/src/main/resources/vanillaenchants.yml index e4b30f13..731dfa3c 100644 --- a/eco-core/core-plugin/src/main/resources/vanillaenchants.yml +++ b/eco-core/core-plugin/src/main/resources/vanillaenchants.yml @@ -23,5 +23,9 @@ max-levels: [] # conflicts: # - "mending:efficiency:sharpness" # +# If you want to remove all conflicts, set the list to 'none': +# conflicts: +# - "mending:none" +# # Beware that this will *override* conflicts, not add to them. conflicts: [] \ No newline at end of file