Merge remote-tracking branch 'origin/master' into profile-v2

# Conflicts:
#	resources/meta-gs/character/芙宁娜/icons/cons-3.webp
#	resources/meta-gs/character/芙宁娜/icons/cons-5.webp

resources/meta-gs/weapon/claymore/聊聊棒/data.json

@@ -3,7 +3,7 @@
   "name": "聊聊棒",
   "affixTitle": "「伶牙俐齿」",
   "star": 4,
-  "desc": "承受火元素附着后的10秒内，攻击力提升16%，每12秒至多触发一次；承受水元素、冰元素或雷元素附着后的10秒内，所有元素伤害加成提升12%，每12秒至多触发一次。",
+  "desc": "一柄沉重的镶有黑曜石的大棒，有很强的说服力。",
   "attr": {
     "atk": {
       "1": 43.73,