Merge branch '1.20.6' into 1.21.1

* 1.20.6: Fixed import
Faboslav · Nov 15, 2024 · a783dde · a783dde
2 parents 77c0f48 + e9825ee
commit a783dde
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesItems.java b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesItems.java
@@ -5,7 +5,6 @@
 import com.faboslav.friendsandfoes.common.init.registry.ResourcefulRegistries;
 import com.faboslav.friendsandfoes.common.init.registry.ResourcefulRegistry;
 import com.faboslav.friendsandfoes.common.item.DispenserAddedSpawnEgg;
-import com.faboslav.friendsandfoes.common.item.FriendsAndFoesArmorMaterials;
 import net.minecraft.block.ComposterBlock;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.ArmorItem;