From ff8c94bf449618050b606aedefdcc2a02aec2f71 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 3 Mar 2020 18:14:56 -0800
Subject: [PATCH] 2.1.121

---
 Changelog.txt                                               | 3 +++
 pom.xml                                                     | 2 +-
 .../gmail/nossr50/config/skills/repair/RepairConfig.java    | 5 +++++
 .../gmail/nossr50/config/skills/salvage/SalvageConfig.java  | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 2d91bee29..2baf285ac 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.121
+    Fixed a netherite related bug that prevented mcMMO from functioning correctly
+
 Version 2.1.120
     Fixed a bug involving the new netherite equipment
 
diff --git a/pom.xml b/pom.xml
index 55e343bcd..c6e5046bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.121-SNAPSHOT</version>
+    <version>2.1.121</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java
index 848ba8468..bd4a3a2cf 100644
--- a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java
@@ -48,6 +48,11 @@ public class RepairConfig extends ConfigLoader {
             Material itemMaterial = Material.matchMaterial(key);
 
             if (itemMaterial == null) {
+                if(key.toLowerCase().contains("nether")) {
+                    mcMMO.p.getLogger().info("No support for repair item "+key+ " in this version of Minecraft, skipping.");
+                    continue;
+                }
+
                 reason.add("Invalid material: " + key);
             }
 
diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
index 58483cc2e..d46a9af09 100644
--- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
@@ -45,6 +45,12 @@ public class SalvageConfig extends ConfigLoader {
             Material itemMaterial = Material.matchMaterial(key);
 
             if (itemMaterial == null) {
+
+                if(key.toLowerCase().contains("nether")) {
+                    mcMMO.p.getLogger().info("No support for salvage item "+key+ " in this version of Minecraft, skipping.");
+                    continue;
+                }
+
                 reason.add("Invalid material: " + key);
             }