Merge remote-tracking branch 'refs/remotes/origin/main'

data/minecraft/loot_tables/chests/village/village_weaponsmith.json

@@ -96,22 +96,22 @@
 				},
 				{
 					"type": "minecraft:item",
-					"name": "minecraft:stone_chestplate",
+					"name": "minecraft:leather_chestplate",
 					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"name": "minecraft:stone_helmet",
+					"name": "minecraft:leather_helmet",
 					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"name": "minecraft:stone_leggings",
+					"name": "minecraft:leather_leggings",
 					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"name": "minecraft:stone_boots",
+					"name": "minecraft:leather_boots",
 					"weight": 5
 				},
 				{

data/minecraft/villager/professions/armorer.json

@@ -8,7 +8,7 @@
 			"trades": [
 				{
 					"sells": {"item": "emerald","count": 1},
-					"wants": [{"item": "tinkers_construct:cobalt_ingot","count":2}]
+					"wants": [{"item": "tconstruct:cobalt_ingot","count":2}]
 				},
 				{
 					"sells": {"item": "golden_helmet","functions":[{"function":"enchant_randomly"}],"count": 1},

data/minecraft/villager/professions/weaponsmith.json

@@ -7,7 +7,7 @@
 			},
 			"trades": [
 				{
-					"sells": {"item": "","count": 1},
+					"sells": {"item": "emerald","count": 1},
 					"wants": [{"item": "diamond","count":4}]
 				},
 				{