Merge branch '1.19.2' into 1.19.3

common/src/main/resources/assets/friendsandfoes/lang/zh_cn.json

@@ -23,10 +23,14 @@
 	"advancements.nether.kill_wildfire.description": "杀死野火",
 	"advancements.nether.obtain_wildfire_crown.title": "谁才是地狱的新统治者？",
 	"advancements.nether.obtain_wildfire_crown.description": "获得一个野火王冠",
+	"advancements.adventure.complete_hide_and_seek_game.title": "捉迷藏",
+	"advancements.adventure.complete_hide_and_seek_game.description": "在淘气鬼的小游戏中寻找到其三次",
 	"block.friendsandfoes.buttercup": "毛茛",
 	"block.minecraft.beehive": "橡木蜂箱",
 	"block.friendsandfoes.acacia_beehive": "金合欢木蜂箱",
+	"block.friendsandfoes.bamboo_beehive": "竹蜂箱",
 	"block.friendsandfoes.birch_beehive": "白桦木蜂箱",
+	"block.friendsandfoes.cherry_beehive": "樱花木蜂箱",
 	"block.friendsandfoes.crimson_beehive": "绯红木蜂箱",
 	"block.friendsandfoes.dark_oak_beehive": "深色橡木蜂箱",
 	"block.friendsandfoes.jungle_beehive": "从林木蜂箱",
@@ -55,16 +59,22 @@
 	"entity.friendsandfoes.glare": "怒目怪",
 	"entity.friendsandfoes.iceologer": "冰术师",
 	"entity.friendsandfoes.moobloom": "哞花",
+	"entity.friendsandfoes.rascal": "淘气鬼",
 	"entity.friendsandfoes.mauler": "大胃怪",
+	"entity.friendsandfoes.tuff_golem": "凝灰岩傀儡",
 	"entity.friendsandfoes.wildfire": "野火",
 	"item.friendsandfoes.buttercup": "毛茛",
 	"item.friendsandfoes.glare_spawn_egg": "怒目怪刷怪蛋",
 	"item.friendsandfoes.copper_golem_spawn_egg": "铜傀儡刷怪蛋",
 	"item.friendsandfoes.iceologer_spawn_egg": "冰术师刷怪蛋",
 	"item.friendsandfoes.illusioner_spawn_egg": "幻术师刷怪蛋",
-	"item.friendsandfoes.moobloom_spawn_egg": "哞花刷怪蛋",
 	"item.friendsandfoes.mauler_spawn_egg": "大胃怪刷怪蛋",
+	"item.friendsandfoes.moobloom_spawn_egg": "哞花刷怪蛋",
+	"item.friendsandfoes.rascal_spawn_egg": "淘气鬼刷怪蛋",
+	"item.friendsandfoes.tuff_golem_spawn_egg": "凝灰岩傀儡刷怪蛋",
 	"item.friendsandfoes.wildfire_spawn_egg": "野火刷怪蛋",
+	"item.friendsandfoes.totem_of_freezing": "冰冻图腾",
+	"item.friendsandfoes.totem_of_illusion": "幻象图腾",
 	"item.friendsandfoes.wildfire_crown": "野火王冠",
 	"item.friendsandfoes.wildfire_crown_fragment": "野火王冠碎片",
 	"subtitle.entity.friendsandfoes.glare.ambient": "怒目怪：游荡",
@@ -93,7 +103,23 @@
 	"subtitle.entity.friendsandfoes.mauler.growl": "大胃怪：低吼",
 	"subtitle.entity.friendsandfoes.mauler.hurt": "大胃怪：受伤",
 	"subtitle.entity.friendsandfoes.moobloom.convert": "哞花：转化",
+	"subtitle.entity.friendsandfoes.player.mirror_move": "玩家：替换",
+	"subtitle.entity.friendsandfoes.rascal.ambient": "淘气鬼：吵闹",
+	"subtitle.entity.friendsandfoes.rascal.disappear": "淘气鬼：消失",
+	"subtitle.entity.friendsandfoes.rascal.nod": "淘气鬼：点头",
+	"subtitle.entity.friendsandfoes.rascal.hurt": "淘气鬼：受伤",
+	"subtitle.entity.friendsandfoes.rascal.reappear": "淘气鬼：出现",
+	"subtitle.entity.friendsandfoes.rascal.reward": "淘气鬼：给予奖励",
+	"subtitle.entity.friendsandfoes.rascal.reward_bad": "淘气鬼：给予负面奖励",
 	"subtitle.entity.friendsandfoes.shield_debris.impact": "护盾残片反弹",
+	"subtitle.entity.friendsandfoes.tuff_golem.glue_on": "凝灰岩傀儡：涂胶",
+	"subtitle.entity.friendsandfoes.tuff_golem.glue_off": "凝灰岩傀儡：脱胶",
+	"subtitle.entity.friendsandfoes.tuff_golem.hurt": "凝灰岩傀儡：受伤",
+	"subtitle.entity.friendsandfoes.tuff_golem.move": "凝灰岩傀儡：移动",
+	"subtitle.entity.friendsandfoes.tuff_golem.repair": "凝灰岩傀儡：修复",
+	"subtitle.entity.friendsandfoes.tuff_golem.wake": "凝灰岩傀儡：苏醒",
+	"subtitle.entity.friendsandfoes.tuff_golem.sleep": "凝灰岩傀儡：睡觉",
+	"subtitle.entity.friendsandfoes.tuff_golem.step": "脚步声",
 	"subtitle.entity.friendsandfoes.wildfire.ambient": "野火：呼吸",
 	"subtitle.entity.friendsandfoes.wildfire.death": "野火：死亡",
 	"subtitle.entity.friendsandfoes.wildfire.hurt": "野火：受伤",