diff --git a/CHANGELOG.md b/CHANGELOG.md
index 482d462..f96ddca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added support for Minecraft 1.21.5
+
+  Added new block types and handling for changed sign text storage format.
+
 ## [2.5.0] - 2025-03-16
 
 ### Added
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index da556b8..044a153 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -1488,6 +1488,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"bush",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([119, 120, 119]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"cactus",
 		ConstBlockType {
@@ -1498,6 +1508,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"cactus_flower",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([209, 120, 135]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"cake",
 		ConstBlockType {
@@ -3808,6 +3828,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"firefly_bush",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([87, 83, 43]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"fletching_table",
 		ConstBlockType {
@@ -4878,6 +4908,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"leaf_litter",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"lectern",
 		ConstBlockType {
@@ -8698,6 +8738,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"short_dry_grass",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([187, 158, 108]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"short_grass",
 		ConstBlockType {
@@ -9638,6 +9688,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"tall_dry_grass",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([196, 171, 122]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"tall_grass",
 		ConstBlockType {
@@ -9678,6 +9738,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"test_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"test_instance_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"tinted_glass",
 		ConstBlockType {
@@ -10828,6 +10908,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"wildflowers",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"wither_rose",
 		ConstBlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index a409abb..caf6f8a 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -316,9 +316,13 @@
 	"bubble_coral_fan": null,
 	"bubble_coral_wall_fan": null,
 	"budding_amethyst": {},
+	"bush": {
+		"grass": true
+	},
 	"cactus": {
 		"texture": "cactus_top"
 	},
+	"cactus_flower": {},
 	"cake": {
 		"texture": "cake_top"
 	},
@@ -778,6 +782,7 @@
 	"fire_coral_block": {},
 	"fire_coral_fan": null,
 	"fire_coral_wall_fan": null,
+	"firefly_bush": {},
 	"fletching_table": {
 		"texture": "fletching_table_top"
 	},
@@ -987,6 +992,7 @@
 	"lava_cauldron": {
 		"texture": "cauldron_top"
 	},
+	"leaf_litter": null,
 	"lectern": {
 		"texture": "lectern_top"
 	},
@@ -1782,6 +1788,7 @@
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": {},
+	"short_dry_grass": {},
 	"short_grass": null,
 	"shroomlight": {},
 	"shulker_box": {},
@@ -2013,6 +2020,7 @@
 	"sweet_berry_bush": {
 		"texture": "sweet_berry_bush_stage3"
 	},
+	"tall_dry_grass": {},
 	"tall_grass": {
 		"grass": true,
 		"texture": "tall_grass_top"
@@ -2024,6 +2032,8 @@
 		"texture": "target_top"
 	},
 	"terracotta": {},
+	"test_block": null,
+	"test_instance_block": null,
 	"tinted_glass": {},
 	"tnt": {
 		"texture": "tnt_top"
@@ -2288,6 +2298,7 @@
 	"white_tulip": null,
 	"white_wall_banner": null,
 	"white_wool": {},
+	"wildflowers": null,
 	"wither_rose": null,
 	"wither_skeleton_skull": null,
 	"wither_skeleton_wall_skull": null,
diff --git a/src/core/common.rs b/src/core/common.rs
index 06a3277..d285f4c 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -26,7 +26,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(6);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(7);
 
 /// MinedMap map tile data version number
 ///
@@ -38,7 +38,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(4);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(5);
 
 /// MinedMap mipmap data version number
 ///