Merge pull request #320 from teaSummer/master

modify & fix

modules/meme_resourcepack/assets/minecraft/lang/zh_meme.json

@@ -126,7 +126,7 @@
     "advancements.end.dragon_breath.description": "用安瓿瓶收集一些龙（nóng）痰",
     "advancements.end.dragon_breath.title": "你需要来点益达®",
     "advancements.end.dragon_egg.description": "获得昆图库塔卡提考特苏瓦西拉松蛋，尽管不能获得王浩然",
-    "advancements.end.dragon_egg.title空气弹": "欢乐一代接一代",
+    "advancements.end.dragon_egg.title": "欢乐一代接一代",
     "advancements.end.elytra.description": "阁下何不随风起，扶摇直上九万里",
     "advancements.end.elytra.title": "limx->∞=天",
     "advancements.end.enter_end_gateway.description": "逃离这个岛屿",
@@ -5077,7 +5077,7 @@
     "multiplayer.disconnect.expired_public_key": "你的玩家资料公钥过期啦，看看你的系统时间正确不正确，或者重开游戏吧",
     "multiplayer.disconnect.flying": "此服务器未启用滥权",
     "multiplayer.disconnect.generic": "喜报！连接中止",
-    "multiplayer.disconnect.idling": "别想挂机！",
+    "multiplayer.disconnect.idling": "别想解放双手！",
     "multiplayer.disconnect.illegal_characters": "你在干啥？",
     "multiplayer.disconnect.incompatible": "客户端不兼容！请使用%s",
     "multiplayer.disconnect.invalid_entity_attacked": "你把自己打晕了",
@@ -6580,7 +6580,7 @@
     "subtitles.entity.villager.work_shepherd": "放羊娃：搓牌",
     "subtitles.entity.villager.work_toolsmith": "工 具 人：锤锤板",
     "subtitles.entity.villager.work_weaponsmith": "军火商：磨刀",
-    "subtitles.entity.villager.yes": "奸商：我tm谢谢你！",
+    "subtitles.entity.villager.yes": "奸商：我特么谢谢宁！",
     "subtitles.entity.vindicator.ambient": "辩护者：哼哼！",
     "subtitles.entity.vindicator.celebrate": "辩护者：芜湖！",
     "subtitles.entity.vindicator.death": "辩护者：啊我死了",
@@ -6594,7 +6594,7 @@
     "subtitles.entity.wandering_trader.no": "流浪奸商：就这？",
     "subtitles.entity.wandering_trader.reappeared": "流浪奸商：现身",
     "subtitles.entity.wandering_trader.trade": "流浪奸商：交♂易",
-    "subtitles.entity.wandering_trader.yes": "流浪奸商：我tm谢谢你！",
+    "subtitles.entity.wandering_trader.yes": "流浪奸商：我特么谢谢宁！",
     "subtitles.entity.warden.agitated": "傻大个：哼哼",
     "subtitles.entity.warden.ambient": "傻大个：呻吟",
     "subtitles.entity.warden.angry": "傻大个：无能狂怒",
@@ -6692,9 +6692,9 @@
     "subtitles.item.brush.brushing.sand.complete": "鸡毛掸子：沙子子刷完了",
     "subtitles.item.bucket.empty": "铁桶：倒空",
     "subtitles.item.bucket.fill": "铁桶：装满",
-    "subtitles.item.bucket.fill_axolotl": "六角恐龙：我tm谢谢你！",
-    "subtitles.item.bucket.fill_fish": "鱼：我tm谢谢你！",
-    "subtitles.item.bucket.fill_tadpole": "蝌蚪：我tm谢谢你！",
+    "subtitles.item.bucket.fill_axolotl": "六角恐龙：我特么谢谢宁！",
+    "subtitles.item.bucket.fill_fish": "鱼：我特么谢谢宁！",
+    "subtitles.item.bucket.fill_tadpole": "蝌蚪：我特么谢谢宁！",
     "subtitles.item.bundle.drop_contents": "套娃用的袋子：吐光",
     "subtitles.item.bundle.insert": "物品：被喂给袋子",
     "subtitles.item.bundle.remove_one": "物品：被吐出袋子",
@@ -7059,7 +7059,7 @@
     "item.minecraft.purple_bundle": "紫色捆绑包",
     "item.minecraft.raiser_armor_trim_smithing_template.new": "牧民盔甲纹饰",
     "item.minecraft.red_bundle": "红色捆绑包",
-    "item.minecraft.resin_brick": "",
+    "item.minecraft.resin_brick": "松香砖",
     "item.minecraft.resin_clump": "松香团",
     "item.minecraft.rib_armor_trim_smithing_template.new": "肋骨盔甲纹饰",
     "item.minecraft.sentry_armor_trim_smithing_template.new": "哨兵盔甲纹饰",
@@ -7086,8 +7086,8 @@
     "options.accessibility.high_contrast_block_outline": "高对比度方块轮廓",
     "options.accessibility.high_contrast_block_outline.tooltip": "提高选中方块的轮廓对比度。",
     "options.inactivityFpsLimit": "降低帧率",
-    "options.inactivityFpsLimit.afk": "无操作时",
-    "options.inactivityFpsLimit.afk.tooltip": "若超过1分钟无操作，帧率将被限制至30。9分钟后进一步降至10。",
+    "options.inactivityFpsLimit.afk": "解放双手时",
+    "options.inactivityFpsLimit.afk.tooltip": "若解放双手超过1分钟，帧率将被限制至30。9分钟后进一步降至10。",
     "options.inactivityFpsLimit.minimized": "最小化时",
     "options.inactivityFpsLimit.minimized.tooltip": "仅在游戏窗口最小化时限制帧率。",
     "options.rotateWithMinecart": "同步矿车转动",
@@ -7168,7 +7168,7 @@
     "test.error.unexpected_item": "物品不应为类型%s",
     "test.error.unknown": "未知的内部错误：%s",
     "test.error.value_not_equal": "属性%s应为%s，实际为%s",
-    "test.error.wrong_block_entity": "错误的方块实体类型：%s",
+    "test.error.wrong_block_entity": "这方块实体类型不对吧：%s",
     "test_block.error.missing": "测一测结构缺少%s方块",
     "test_block.error.too_many": "%s方块过多",
     "test_block.invalid_timeout": "无效的时限（%s），刻数必须为正数",

modules/meme_splashes/assets/minecraft/texts/splashes.txt

@@ -444,4 +444,5 @@ Bug与issue齐飞，test共typo一色
 还有谁要讲故事？
 此事在Minecraft Wiki上亦有记载
 最低0.3元/天开通会员，查看完整内容。
-服务器繁忙，请稍后再试。
+服务器繁忙，请稍后再试。
+我没有感谢你