Merge branch '1.21'

* 1.21: Added missing bamboo beehive fixes
Faboslav · Jul 17, 2024 · ec46ed2 · ec46ed2
2 parents db0fcad + 226566f
commit ec46ed2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.15
+
+- Fixed pig spawning in the iceologer cabin structure
+- Fixed beehive states
+
 ## 2.0.14
 
 - Totem of Undying is now properly supported in the modded slots

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesBlockEntityTypes.java b/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesBlockEntityTypes.java
@@ -15,6 +15,7 @@ public final class FriendsAndFoesBlockEntityTypes
 {
 	private static final Set<Block> BEEHIVE_BLOCKS = ImmutableList.of(
 		FriendsAndFoesBlocks.ACACIA_BEEHIVE.get(),
+		FriendsAndFoesBlocks.BAMBOO_BEEHIVE.get(),
 		FriendsAndFoesBlocks.BIRCH_BEEHIVE.get(),
 		FriendsAndFoesBlocks.CHERRY_BEEHIVE.get(),
 		FriendsAndFoesBlocks.CRIMSON_BEEHIVE.get(),

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.caching=true
 # Mod
 mod_name=Friends&Foes
 mod_id=friendsandfoes
-mod_version=2.0.14
+mod_version=2.0.15
 mod_author=Faboslav
 mod_description=Adds outvoted and forgotten mobs from the mob votes in a believable vanilla plus style.
 maven_group=com.faboslav.friendsandfoes