Merge branch '1.21.1'

* 1.21.1: Updated changelog Added wildfire crown to head_armor tag
Faboslav · Oct 13, 2024 · b5a7f62 · b5a7f62
2 parents d091671 + caa4846
commit b5a7f62
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Fixed crashes with mods like Caverns & Chasms, Unvoted & Shelved and Sinytra Connector
 - Fixed block flammability
 - Fixed white texture on buttercup
+- Fixed wildfire crown enchantability on newer minecraft versions (again)
 - Updated es_cl translations (Thanks to Ganbare-Lucifer)
 
 ## 3.0.3

diff --git a/...n/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesArmorMaterials.java b/...n/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesArmorMaterials.java
@@ -33,7 +33,7 @@ public class FriendsAndFoesArmorMaterials
 			enumMap.put(ArmorItem.Type.HELMET, 3);
 			enumMap.put(ArmorItem.Type.BODY, 11);
 		}),
-		15,
+		9,
 		SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE,
 		1.0F,
 		0.0F,

diff --git a/...aft/tags/item/enchantable/head_armor.json → .../data/minecraft/tags/item/head_armor.json b/...aft/tags/item/enchantable/head_armor.json → .../data/minecraft/tags/item/head_armor.json