Merge branch '1.16' of https://github.com/KnightMiner/SimplyTea into …

…1.16

src/main/resources/assets/simplytea/lang/zh_cn.json

@@ -1,29 +1,30 @@
 {
-  "itemGroup.simplytea": "简单的茶！",
+  "itemGroup.simplytea": "简茶",
 
   "block.simplytea.tea_sapling": "茶树苗",
-  "block.simplytea.tea_trunk": "茶枝",
+  "block.simplytea.tea_trunk": "茶树干",
   "block.simplytea.tea_fence": "茶枝栅栏",
   "block.simplytea.tea_fence_gate": "茶枝栅栏门",
 
   "item.simplytea.tea_leaf": "茶叶",
-  "item.simplytea.tea_leaf.tooltip": "愉悦的馨香！",
+  "item.simplytea.tea_leaf.tooltip": "§8§o令人愉悦的清香§r",
   "item.simplytea.black_tea": "红茶",
-  "item.simplytea.black_tea.tooltip": "缓慢发酵！",
+  "item.simplytea.black_tea.tooltip": "§8§o「酵」§r",
   "item.simplytea.tea_stick": "茶枝",
-  "item.simplytea.tea_stick.tooltip": "芬芳的如同肉桂！",
+  "item.simplytea.tea_stick.tooltip": "§8§o散发着肉桂般的香气§r",
   "item.simplytea.chorus_petal": "紫颂花瓣",
-  "item.simplytea.chorus_petal.tooltip": "不可思议！",
+  "item.simplytea.chorus_petal.tooltip": "§8§o神秘之花§r",
 
+  "item.simplytea.unfired_cup": "未烧制的茶杯",
   "item.simplytea.cup": "茶杯",
-  "item.simplytea.cup_water": "一杯水",
-  "item.simplytea.cup_tea_green": "一杯绿茶",
-  "item.simplytea.cup_tea_black": "一杯红茶",
-  "item.simplytea.cup_tea_floral": "一杯蒲公英花茶",
-  "item.simplytea.cup_tea_chai": "一杯印度奶茶",
-  "item.simplytea.cup_tea_chamomile": "一杯黄春菊花茶",
-  "item.simplytea.cup_tea_chorus": "一杯紫颂花茶",
-  "item.simplytea.cup_cocoa": "一杯热可可",
+  "item.simplytea.cup_water": "清水",
+  "item.simplytea.cup_tea_green": "绿茶",
+  "item.simplytea.cup_tea_black": "红茶",
+  "item.simplytea.cup_tea_floral": "蒲公英花茶",
+  "item.simplytea.cup_tea_chai": "印度奶茶",
+  "item.simplytea.cup_tea_chamomile": "黄春菊花茶",
+  "item.simplytea.cup_tea_chorus": "紫颂花茶",
+  "item.simplytea.cup_cocoa": "热可可",
 
   "item.simplytea.teabag": "茶包",
   "item.simplytea.teabag_green": "绿茶包",
@@ -32,18 +33,19 @@
   "item.simplytea.teabag_chamomile": "黄春菊花茶包",
   "item.simplytea.teabag_chorus": "紫颂花茶包",
 
+  "item.simplytea.unfired_teapot": "未烧制的茶壶",
   "item.simplytea.teapot": "茶壶",
-  "item.simplytea.teapot.tooltip": "是空的！",
+  "item.simplytea.teapot.tooltip": "§8§o空§r",
   "item.simplytea.teapot_water": "茶壶",
-  "item.simplytea.teapot_water.tooltip": "充满了水！",
+  "item.simplytea.teapot_water.tooltip": "§8§o盛满：水§r",
   "item.simplytea.teapot_milk": "茶壶",
-  "item.simplytea.teapot_milk.tooltip": "盛满了牛奶！",
+  "item.simplytea.teapot_milk.tooltip": "§8§o盛满：牛奶§r",
   "item.simplytea.teapot_hot": "茶壶",
-  "item.simplytea.teapot_hot.tooltip": "沸腾！",
+  "item.simplytea.teapot_hot.tooltip": "§8§o小心烫伤！§r",
   "item.simplytea.teapot_frothed": "茶壶",
-  "item.simplytea.teapot_frothed.tooltip": "温热的奶泡！",
+  "item.simplytea.teapot_frothed.tooltip": "§8§o表层漂浮着温热的奶泡§r",
 
   "effect.simplytea.restful": "安宁",
-  "effect.simplytea.caffeinated": "咖啡因之舞",
-  "effect.simplytea.enderfalling": "末影之坠"
+  "effect.simplytea.caffeinated": "精力充沛",
+  "effect.simplytea.enderfalling": "末影护盾"
 }