添加默认小电视旗和更多村民交易

src/main/generated/.cache/3513c90cf19585ba85dce4bb4961dfc418764cbe

@@ -1,2 +1,2 @@
-// 1.21	2024-07-09T10:56:19.8912914	Vanilla Addition/Language (zh_hk)
+// 1.21	2024-07-15T16:12:29.6970132	Vanilla Addition/Language (zh_hk)
 7c05a897ad599fc33f003abf3b6a6f1513d08a34 assets\vanilla-addition\lang\zh_hk.json

src/main/generated/.cache/4455c36134312040c3981d1a65d87410e591c38c

@@ -1,2 +1,2 @@
-// 1.21	2024-07-09T10:56:19.9042606	Vanilla Addition/Language (zh_cn)
+// 1.21	2024-07-15T16:12:29.7185787	Vanilla Addition/Language (zh_cn)
 c6fd0be82ab6409a94a365cf89adfecefe84af47 assets\vanilla-addition\lang\zh_cn.json

src/main/generated/.cache/46608147a03287dfdb8e0fa4f9102c4e2889225f

@@ -1,7 +1,7 @@
-// 1.21	2024-07-09T10:56:19.8903192	Vanilla Addition/Tags for minecraft:block
+// 1.21	2024-07-15T16:12:29.6950144	Vanilla Addition/Tags for minecraft:block
 ff6f92a3e9ef8e4d51485509dae9a528c14c76a0 data\vanilla-addition\tags\block\nether_bricks.json
-34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\beacon_base_blocks.json
 96122621230a2112253efc3723f65deb6ee0fb48 data\vanilla-addition\tags\block\obsidian.json
+34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\beacon_base_blocks.json
 46c914fc5a9a16aba22d45e84efb29a9a0ba17f7 data\minecraft\tags\block\walls.json
 df61f73843a6cfb476f990e97e6d5dbcd2741125 data\vanilla-addition\tags\block\fairy_wand_replaceable.json
 6e36c43445339b5f766dae865cbb05a81b449af5 data\minecraft\tags\block\needs_diamond_tool.json

src/main/generated/.cache/4f22e9d501004ea65aac67eb84f633ec54fdd9e2

@@ -1,4 +1,4 @@
-// 1.21	2024-07-09T10:56:19.8864248	Vanilla Addition/Block Loot Tables
+// 1.21	2024-07-15T16:12:29.6900139	Vanilla Addition/Block Loot Tables
 65582469a7435f6364ca0c189e06cc7497e76075 data\vanilla-addition\loot_table\blocks\ice_stairs.json
 1a98f88a25643465c0404911c7ed52ac7b4c2d05 data\vanilla-addition\loot_table\blocks\magenta_concrete_stairs.json
 8b11a61582f4250ff65fd05bb8861fa422d474c1 data\vanilla-addition\loot_table\blocks\packed_ice_slab.json

src/main/generated/.cache/52b837f51544eeb314a89d0baa50276126ed9e15

@@ -1,2 +1,2 @@
-// 1.21	2024-07-09T10:56:19.8912914	Vanilla Addition/Language (en_us)
+// 1.21	2024-07-15T16:12:29.6970132	Vanilla Addition/Language (en_us)
 e101008fe0091cc141f1a6694b853de2f5a5c554 assets\vanilla-addition\lang\en_us.json

src/main/generated/.cache/cf36120aef76dfc9135b307737d1c5e76a54edb4

@@ -1,13 +1,17 @@
-// 1.21	2024-07-09T10:56:19.8903192	Vanilla Addition/Tags for minecraft:item
+// 1.21	2024-07-15T16:12:29.6960136	Vanilla Addition/Tags for minecraft:item
 fdab8ddd5529ae14b26bc1853b004131135318a4 data\vanilla-addition\tags\item\diamond_like_ingredients.json
 f7c5163386ca4f6f59c115f8a2488784b9f15ce3 data\minecraft\tags\item\axes.json
+8aa3f06d6014ada9ee223e82b5bd922b5de15818 data\minecraft\tags\item\chest_armor.json
 c8dff9260a0d1578661497e8fa33098aa108664b data\minecraft\tags\item\swords.json
 235f3bf8614616b6cd50b21268354ae7443870ea data\minecraft\tags\item\hoes.json
+0a1bbfa3dbf3eb7b01f833c956293490a7c7496f data\minecraft\tags\item\foot_armor.json
 2829b3b7dd8fa4a1416f1dadb5b8763a96653ef3 data\vanilla-addition\tags\item\steel_tools.json
 8cda0614724ff2d3771cb9987e19759dd204f0a6 data\minecraft\tags\item\shovels.json
 58073e7c3793c0caede7bd20de47cc59975ae68f data\minecraft\tags\item\pickaxes.json
 0fc8f3412c4268133c259f539485ac33ae528ab5 data\vanilla-addition\tags\item\diamond_like_shards.json
 bda7abbcd04b86a26a7215fff613bbe542d39f18 data\vanilla-addition\tags\item\shears.json
 877f533d26c14af5a05b6a1796a793825ec75b58 data\minecraft\tags\item\beacon_payment_items.json
 cf9cfe7cdb60b294c6438346aac9de5c1b3b0465 data\vanilla-addition\tags\item\quartz_block.json
-3d4defe8ac288035ece5b32020f1e3e606b0fb28 data\minecraft\tags\item\enchantable\durability.json
+afffedbfe1c369d27976e1b6f99618c5a6e2ae69 data\minecraft\tags\item\head_armor.json
+fdc7d20edf8f651cff035db202810f5b2777b2d7 data\minecraft\tags\item\leg_armor.json
+0da5cb7319d7dd28a8ef2167022fd35fae155a4d data\minecraft\tags\item\enchantable\durability.json

src/main/generated/.cache/e764169a5e6dc427a404f8b7f74fc0c7b162a4f2

@@ -1,4 +1,4 @@
-// 1.21	2024-07-09T10:56:19.8922651	Vanilla Addition/Model Definitions
+// 1.21	2024-07-15T16:12:29.6970132	Vanilla Addition/Model Definitions
 28b4faa5e5d0a06aca9d634390b7f4a68e33e10d assets\vanilla-addition\models\block\yellow_terracotta_wall_inventory.json
 b267da6f5f6a2c11266371de6e944af2d1b5cf0b assets\vanilla-addition\models\block\orange_terracotta_stairs.json
 7506a0f6edd24cc5b6b95a590d9a5ef5b1bbc82d assets\vanilla-addition\models\block\purple_terracotta_wall_inventory.json
@@ -91,8 +91,8 @@ af6ff37c2adac6997ed9d32d112e2b139747eff2 assets\vanilla-addition\models\item\ely
 035ac0f8801c05550d3ff3ca895e977f54931fa1 assets\vanilla-addition\models\item\lime_terracotta_slab.json
 9468c753d66678280dde49d5bd6773d3eeef8734 assets\vanilla-addition\models\block\green_terracotta_stairs_inner.json
 72f847f7a179cd36dc12a5875720372cd5f28c31 assets\vanilla-addition\models\block\light_gray_terracotta_stairs_outer.json
-bb7ab7343b4fe04c35aaba75aa01bda93f1eaf57 assets\vanilla-addition\models\item\burn_pottery_sherd_prototype.json
 052ba472a0428e8372dfc944f52953b7b5e8e8e1 assets\vanilla-addition\models\block\black_concrete_wall_side_tall.json
+bb7ab7343b4fe04c35aaba75aa01bda93f1eaf57 assets\vanilla-addition\models\item\burn_pottery_sherd_prototype.json
 d177f105092958ccb6ae3089b9eb2bf40b19e5bb assets\minecraft\blockstates\yellow_terracotta.json
 df10973f0b2cb0b68b7ba47718c380adfa7175e7 assets\vanilla-addition\models\item\blue_terracotta_wall.json
 c5d8b677a55c1ea1f3d7b1771e350c5de3ba87e9 assets\vanilla-addition\models\block\blue_ice_stairs.json
@@ -105,17 +105,17 @@ ddc8c7f23e2d5ed7715379c0bdb24b4efc2e08e5 assets\vanilla-addition\blockstates\pin
 a82c3a22dc27324df7a342127b74721091a28422 assets\vanilla-addition\models\item\yellow_concrete_slab.json
 8c122a183c2cfd853640d5fb2b60cc25b7e98e89 assets\vanilla-addition\models\item\white_terracotta_stairs.json
 8d3f7c4dfa0e96f1ec2edd7cc79409c0cd5e02f2 assets\vanilla-addition\models\block\smooth_sandstone_wall_side.json
-a88794da1e5de9bd1bc68aded34b055587fecd7c assets\vanilla-addition\blockstates\gray_terracotta_slab.json
 d2db9cfc20c34b4afb99a37cc9001d54f8a3817d assets\minecraft\blockstates\purpur_block.json
+a88794da1e5de9bd1bc68aded34b055587fecd7c assets\vanilla-addition\blockstates\gray_terracotta_slab.json
 62899f50db4484d080af1a1269ef6e5895f9def0 assets\vanilla-addition\models\block\cyan_concrete_wall_post.json
 7ebfc4d1374507daa195c3bb72f8b2df0a79df49 assets\vanilla-addition\models\block\gray_concrete_slab.json
 12d4dbe12cd11e1aa806ed6e18a749d3450af00b assets\vanilla-addition\models\block\light_gray_concrete_wall_side_tall.json
 86e68183a4dd273b8a8c46fe1efd167f7034445b assets\vanilla-addition\models\item\friend_pottery_sherd_blueprint.json
 9b683701e9f77522615107a70ddfb92cd32b03eb assets\minecraft\models\block\amethyst_block.json
 c5a104296e1b93ff813651faaaf4bec3b735b795 assets\vanilla-addition\blockstates\mud_wall.json
 8cf2af51257067783da19eb1ae01ee2e70bed812 assets\vanilla-addition\models\item\light_blue_concrete_slab.json
-b720d86fa6810b4dda59b0adc049589088980ab2 assets\vanilla-addition\blockstates\red_terracotta_wall.json
 d83b4c3fa8a056096da464b23bd792c2bf91198b assets\vanilla-addition\blockstates\black_terracotta_stairs.json
+b720d86fa6810b4dda59b0adc049589088980ab2 assets\vanilla-addition\blockstates\red_terracotta_wall.json
 3fe72ddb22fa2a8550f2143fb6bb3913a0d42ff6 assets\vanilla-addition\models\item\terracotta_stairs.json
 64bb558cf01e78e42b28e2ef3c501f71ee830e6a assets\minecraft\models\block\dirt.json
 e62395f79bc036e1edfb8594142c4f8f8819ac32 assets\vanilla-addition\models\block\polished_andesite_wall_post.json
@@ -209,8 +209,8 @@ c0e411613d08f49967a09d82ac7499271823d340 assets\vanilla-addition\models\block\ma
 5fc40396999843148d1944c9e08919c68402c711 assets\vanilla-addition\models\item\diamond_upgraded_axe.json
 379fec45212dd09ca8bc3703bb4943380707feac assets\vanilla-addition\models\item\light_gray_slab.json
 971f9effc0d72a0c9ec3d2ee55e83eb003eba0cd assets\vanilla-addition\models\block\polished_diorite_wall_inventory.json
-80d39a1d91895445379dbb07ab16bcf4136603fa assets\vanilla-addition\blockstates\green_concrete_wall.json
 8c38d6df02596fb2006e793f649f3af93052a05d assets\vanilla-addition\blockstates\light_gray_terracotta_stairs.json
+80d39a1d91895445379dbb07ab16bcf4136603fa assets\vanilla-addition\blockstates\green_concrete_wall.json
 6e9d18adcb3401c8cf681fafae3467d19e58991a assets\vanilla-addition\models\item\glass_pickaxe.json
 0809079f37716853902a651c5ae1c4e90ea76ceb assets\vanilla-addition\models\block\gray_concrete_wall_post.json
 e66f874ee21bb21ec4c23dfb2dee3fa8787463f8 assets\vanilla-addition\models\item\glass_pickaxe_prototype.json
@@ -336,8 +336,8 @@ c08ee747ff604b366ee9f377e304ec5d8cfc1d9e assets\vanilla-addition\models\item\glo
 546bbf07e0536b08ff8e94716139b16c7547e6b9 assets\minecraft\models\block\purple_concrete.json
 6d0e7df98eadecb3ac920b41bd45290166cbe877 assets\vanilla-addition\blockstates\brown_concrete_slab.json
 9dda97d5846a8964bd66efc13c7f70c7dcefca56 assets\vanilla-addition\models\item\snort_pottery_sherd_blueprint.json
-ea949199d7644a66cd1af06153c98189c3913fa7 assets\vanilla-addition\models\item\prize_pottery_sherd_prototype.json
 7ae60c47d1630924244d03c069952cedc8aab950 assets\vanilla-addition\models\block\cyan_concrete_wall_side_tall.json
+ea949199d7644a66cd1af06153c98189c3913fa7 assets\vanilla-addition\models\item\prize_pottery_sherd_prototype.json
 b17ee2e5cc7f58855e9bb7eb3d28c04489c97ffc assets\minecraft\models\block\dark_prismarine.json
 af6b3c3b1eafa803722cc044ac68bbe50ef15059 assets\vanilla-addition\models\block\blue_ice_stairs_outer.json
 90b72de689b1fe7aa593c2940efb9d5328535f64 assets\vanilla-addition\models\block\smooth_stone_stairs_outer.json
@@ -349,8 +349,8 @@ af6b3c3b1eafa803722cc044ac68bbe50ef15059 assets\vanilla-addition\models\block\bl
 529839c6c99b72ee31ef73b945d35f0fc6e92c16 assets\vanilla-addition\blockstates\red_terracotta_slab.json
 9eda8233665c8520595b00f96fb9fdbc59446f66 assets\vanilla-addition\models\item\scrape_pottery_sherd_prototype.json
 07bed14c0ddf48ac02caba43b55cbde84e9a217e assets\vanilla-addition\models\item\smooth_red_sandstone_wall.json
-0b6d43f210446a333f36f2c8ea2e6c66e62b2bff assets\vanilla-addition\models\block\green_terracotta_stairs_outer.json
 17e07ff7944c936ae97b95b9b9c974501017eaa5 assets\vanilla-addition\models\item\brown_terracotta_slab.json
+0b6d43f210446a333f36f2c8ea2e6c66e62b2bff assets\vanilla-addition\models\block\green_terracotta_stairs_outer.json
 b793ef4d57318f5aeaeefbcdee92d97bf7b53360 assets\vanilla-addition\blockstates\yellow_concrete_stairs.json
 c7606bce3beeffc3118ca1352a128476f6d132a2 assets\vanilla-addition\models\item\howl_pottery_sherd_blueprint.json
 f949f998a4809c9d54b2da47a12e70885cdd3ab8 assets\vanilla-addition\models\block\blue_concrete_slab.json
@@ -389,8 +389,8 @@ d175739ef5b741f59d6447ba537e8e8eeecf6cb1 assets\vanilla-addition\blockstates\mag
 f74bd8d708ee9175be346176cbc033dec43acd80 assets\vanilla-addition\models\item\archer_pottery_sherd_blueprint.json
 66d142e5de1e49c1aa4886e5a531318a7db7ef69 assets\vanilla-addition\models\block\ice_slab_top.json
 081c981f0e7afef3a5778958e28dc831477a75c6 assets\vanilla-addition\models\block\lime_concrete_stairs_outer.json
-26aadf610835c14bd73c5894e06acac6a0d1653c assets\vanilla-addition\models\block\blue_ice_slab.json
 e6b8e7b3a83125b181dd410de368e63aa5050f0e assets\vanilla-addition\models\block\smooth_quartz_wall_side.json
+26aadf610835c14bd73c5894e06acac6a0d1653c assets\vanilla-addition\models\block\blue_ice_slab.json
 2669145b20e01c37993066d4c06db436381e4770 assets\vanilla-addition\models\item\steel_pickaxe.json
 44b306f3df1ced8e15dc1ea670085d5e313f2f67 assets\vanilla-addition\models\item\lime_concrete_wall.json
 f2eac06ad42f25894d8c1bd96f438420c14f50fa assets\vanilla-addition\models\block\obsidian_wall_side.json
@@ -401,8 +401,8 @@ adba58479d55d83fabe979c27f49513eecd9d25b assets\vanilla-addition\models\block\bl
 e5fce8c96fcfcd921e75b936857c0360bc88a580 assets\vanilla-addition\blockstates\white_concrete_wall.json
 8dda3a0499623af7d3309aab03ee1af8394fa10f assets\vanilla-addition\models\block\green_concrete_stairs_inner.json
 96dbb100c88ef24361d1b1f1645200ebef48a58b assets\vanilla-addition\models\item\diamond_shards_upgrade_smithing_template.json
-05cc97624e7684425577e00148b71d27072ce458 assets\vanilla-addition\models\block\lime_concrete_slab_top.json
 4812be1eeaa538ca2c1d84419749b94e02429682 assets\vanilla-addition\blockstates\lime_terracotta_stairs.json
+05cc97624e7684425577e00148b71d27072ce458 assets\vanilla-addition\models\block\lime_concrete_slab_top.json
 94bc483522a8aae6cb3dcca7016338b40795673f assets\vanilla-addition\models\item\blue_concrete_slab.json
 3df7f6042c8aeb17e1e4317fd3f6d6edf3d08f8e assets\vanilla-addition\models\item\pink_terracotta_slab.json
 07553799207a4d040817738feae40b9172895182 assets\vanilla-addition\models\block\obsidian_stair.json
@@ -469,8 +469,8 @@ dfb44029766b0dc44106a5fbcac6a59a2bc663c8 assets\vanilla-addition\models\block\cr
 c4acb0e0f69d80b70d8b63d38dbf7a5ed15f77a0 assets\minecraft\models\block\purpur_block.json
 68adfe3d0b30d6ce92fd2dab0561bc4659accf51 assets\minecraft\blockstates\amethyst_block.json
 8cceedc7099b0cf1e5b67a70df6cb1511bca35bc assets\vanilla-addition\models\block\clay_slab_top.json
-2c6f34826fb31dd21f7bedecf3c0eb178e6b9604 assets\minecraft\blockstates\light_gray_concrete.json
 3c43a9c78d0e84eff2d483cc01a1b68438c10f6b assets\minecraft\blockstates\orange_concrete.json
+2c6f34826fb31dd21f7bedecf3c0eb178e6b9604 assets\minecraft\blockstates\light_gray_concrete.json
 836c73ecab7336a47e0640c9df5b8be912ae9189 assets\vanilla-addition\models\item\miner_pottery_sherd_prototype.json
 4f8cbefd7818402667b7cebe67867d8fd36d54fa assets\vanilla-addition\models\block\crying_obsidian_wall_side_tall.json
 a88cbe2a3ae38508b8f1d75d30b4a745d70cde2c assets\vanilla-addition\models\item\steel_hoe.json
@@ -605,8 +605,8 @@ a0728eaee824b51f937fca5caf79d7c5ba282b9f assets\vanilla-addition\models\block\gr
 b7f69fad8306e79ddaff7a795797ea135ee51b1d assets\vanilla-addition\models\block\smooth_quartz_wall_side_tall.json
 47d12c789398dded710e9586cac24eaf1862764b assets\minecraft\blockstates\pink_terracotta.json
 41455f4365443458c7040e2e30f2b094c8a285d5 assets\vanilla-addition\models\block\brown_concrete_slab_top.json
-263379795f30cf89a1c1431072c0a2469046390d assets\vanilla-addition\models\block\smooth_red_sandstone_wall_inventory.json
 790743ff5a9f06b2f3b62e993b0f7a5f504eb573 assets\vanilla-addition\blockstates\obsidian_stairs.json
+263379795f30cf89a1c1431072c0a2469046390d assets\vanilla-addition\models\block\smooth_red_sandstone_wall_inventory.json
 672b2ae74f36ee158ac7c0ecfebfe53490baa2b3 assets\vanilla-addition\blockstates\blue_concrete_stairs.json
 2b6e5b24eb8b6e937d54eafa4f3fbe50de0c8c30 assets\vanilla-addition\models\block\dirt_wall_side_tall.json
 247d3c25d48e7e3ad15ef3325290e909ad42732b assets\vanilla-addition\blockstates\dirt_stairs.json
@@ -638,8 +638,8 @@ e4fbb551b4440371c4e3d9f77382b096a404839f assets\vanilla-addition\models\item\anc
 309e5b520475828a723f0d16356c27bf3f1010e7 assets\minecraft\models\block\light_blue_terracotta.json
 307f7589a4a52a274a0e680a57ed6abadd5d1288 assets\vanilla-addition\blockstates\orange_concrete_slab.json
 b1b009320cdb991a295399fe791660b4d70a441f assets\vanilla-addition\blockstates\yellow_terracotta_wall.json
-f8121a6aa1cd8a0b174cef1978cf453f7b482ae1 assets\vanilla-addition\models\item\nether_smithing_template_pro.json
 119ce91689bc71c8f4c3992c55315e0906dd004a assets\vanilla-addition\models\block\smooth_basalt_slab.json
+f8121a6aa1cd8a0b174cef1978cf453f7b482ae1 assets\vanilla-addition\models\item\nether_smithing_template_pro.json
 287a34d7d5f0887270d2cd58ffd54a295c6c5793 assets\vanilla-addition\models\block\crying_obsidian_stairs_inner.json
 a31082ab16243020e00b35cea016a73013805522 assets\vanilla-addition\models\block\polished_diorite_wall_side_tall.json
 d3fa32f815da8e90c40de9faa98cb4ff72c991c6 assets\vanilla-addition\models\item\miner_pottery_sherd_blueprint.json
@@ -714,8 +714,8 @@ e97924fd8b2c587dddab3e7e40c89084a01a316b assets\vanilla-addition\models\item\smo
 9fe01a95ddd9a5eb0a1f19e004a15310604b8c0e assets\minecraft\blockstates\purple_terracotta.json
 50d3e81632941aa204915fb4f879401b1273906e assets\minecraft\blockstates\glowstone.json
 b6c586bb02ba8c9487bd5e9824f46ed2b4fb7eed assets\vanilla-addition\models\item\purpur_wall.json
-1ab12d8d5e28102dbcbf579781f7c490a075f886 assets\minecraft\blockstates\dark_prismarine.json
 3b32f6b1cd99fad2ab76042a70ae0992afa69702 assets\vanilla-addition\blockstates\blue_concrete_slab.json
+1ab12d8d5e28102dbcbf579781f7c490a075f886 assets\minecraft\blockstates\dark_prismarine.json
 dca36b38781fb8a04b6596cbc085686b8c39e09c assets\vanilla-addition\models\block\netherrack_stair.json
 dc519a9219b94a3087eb1a79146103af92c862fc assets\vanilla-addition\blockstates\polished_andesite_wall.json
 107b97bf8c70859ee14d00bd7fc2d27f83090f48 assets\vanilla-addition\models\item\diamond_upgraded_pickaxe.json
@@ -836,8 +836,8 @@ ab8fc9e7e5c2f4e2ba5704474d90ef370ca18706 assets\vanilla-addition\models\block\cy
 14f96b3b81db89a8572551e552f2701041ede3d5 assets\vanilla-addition\models\block\light_gray_terracotta_stairs_inner.json
 818a256292b5a28e34231664ecfd2b1dc9b2f1d9 assets\vanilla-addition\models\item\suspicious_prototype.json
 5a3b6e960dc48950cd453c970d1ebc5412a900d8 assets\vanilla-addition\models\block\lime_terracotta_wall_post.json
-076b0cc6948d5fdbd575f001c8cba29daed31b45 assets\vanilla-addition\blockstates\lime_concrete_stairs.json
 4bbcd09bc87b0980aef93ca2242d4980178cca5c assets\minecraft\blockstates\red_concrete.json
+076b0cc6948d5fdbd575f001c8cba29daed31b45 assets\vanilla-addition\blockstates\lime_concrete_stairs.json
 7f2f30e6d8f3000781578d3aba25690fcb3a32e3 assets\vanilla-addition\models\item\magenta_concrete_stairs.json
 41eb2774c0aea65baa0c7c8280fa83192932cf96 assets\vanilla-addition\models\item\light_gray_terracotta_wall.json
 bcb6708e30f1f24702d77c6c2ab0bbcd9fd31509 assets\vanilla-addition\models\block\light_blue_concrete_wall_side.json