From 0133f94a36cd658fd34765034d89afd32b3f70e3 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sun, 9 May 2021 12:48:53 +0200
Subject: [PATCH] Fix upgrading of diamond armor

---
 mods/ITEMS/mcl_armor/api.lua      | 3 +--
 mods/ITEMS/mcl_armor/register.lua | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua
index fe2f85e22..8e295827c 100644
--- a/mods/ITEMS/mcl_armor/api.lua
+++ b/mods/ITEMS/mcl_armor/api.lua
@@ -111,7 +111,6 @@ function mcl_armor.register_set(def)
 		groups.mcl_armor_toughness = def.toughness
 		groups.mcl_armor_uses = (durabilities[name] or math.floor(def.durability * element.durability)) + 1
 		groups.enchantability = def.enchantability
-		groups._mcl_upgradable = def._mcl_upgradable
 
 		for k, v in pairs(element_groups) do
 			groups[k] = v
@@ -136,7 +135,7 @@ function mcl_armor.register_set(def)
 			_mcl_armor_element = name,
 			_mcl_armor_texture = textures[name] or modname .. "_" .. itemname .. ".png",
 			_mcl_armor_preview = previews[name] or modname .. "_" .. itemname .. "_preview.png",
-			_mcl_upgradable = def._mcl_upgradable
+			_mcl_upgradable = def.upgradable,
 		})
 
 		if def.craft_material then
diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua
index be9e75267..537c12870 100644
--- a/mods/ITEMS/mcl_armor/register.lua
+++ b/mods/ITEMS/mcl_armor/register.lua
@@ -79,7 +79,7 @@ mcl_armor.register_set({
 	},
 	toughness = 2,
 	craft_material = "mcl_core:diamond",
-	_mcl_upgradable = 1
+	upgradable = true,
 })
 
 mcl_armor.register_set({
@@ -94,7 +94,6 @@ mcl_armor.register_set({
 		feet = 3,
 	},
 	toughness = 3,
-	craft_material = "mcl_netherite:netherite_ingot",
 })
 
 mcl_armor.register_protection_enchantment({