From f521f21f5ff5bf10f4852d1a75fbab7a894b73e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Wed, 17 Jul 2024 15:15:58 +0200 Subject: [PATCH 1/2] fixes --- CHANGELOG.md | 5 +++++ build.gradle | 1 - .../friendsandfoes/worldgen/structure/iceologer_cabin.json | 2 +- gradle.properties | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fde1f622..9e228f5f4 100644 --- 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/build.gradle b/build.gradle index 986d9664a..bc92e4eb8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,6 @@ allprojects { version = mod_version archivesBaseName = "${mod_id}-mc${minecraft_version}" - processResources { def expandProps = [ 'modId' : mod_id, diff --git a/common/src/main/resources/data/friendsandfoes/worldgen/structure/iceologer_cabin.json b/common/src/main/resources/data/friendsandfoes/worldgen/structure/iceologer_cabin.json index 1f3f287f4..66bb9ab8c 100644 --- a/common/src/main/resources/data/friendsandfoes/worldgen/structure/iceologer_cabin.json +++ b/common/src/main/resources/data/friendsandfoes/worldgen/structure/iceologer_cabin.json @@ -16,7 +16,7 @@ "bounding_box": "piece", "spawns": [ { - "type": "minecraft:iceologer", + "type": "friendsandfoes:iceologer", "weight": 1, "minCount": 1, "maxCount": 1 diff --git a/gradle.properties b/gradle.properties index fc8fd604e..5c278e06d 100644 --- 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 From 79cd00addf9ef7c2126c434913c11a2269be752b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Wed, 17 Jul 2024 15:23:10 +0200 Subject: [PATCH 2/2] Added missing bamboo beehive --- .../friendsandfoes/init/FriendsAndFoesBlockEntityTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesBlockEntityTypes.java b/common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesBlockEntityTypes.java index 8a3fbd5f3..a4b7eecfe 100644 --- 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 BEEHIVE_BLOCKS = ImmutableList.of( FriendsAndFoesBlocks.ACACIA_BEEHIVE.get(), + FriendsAndFoesBlocks.BAMBOO_BEEHIVE.get(), FriendsAndFoesBlocks.BIRCH_BEEHIVE.get(), FriendsAndFoesBlocks.CHERRY_BEEHIVE.get(), FriendsAndFoesBlocks.CRIMSON_BEEHIVE.get(),