Merge branch 'teaconmc:dev' into dev

LocusAzzurro · Dec 29, 2024 · 91e0833 · 91e0833
2 parents 8020a76 + 510b41f
commit 91e0833
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/jiachen/assets/sign_up/textures/gui/map.png b/jiachen/assets/sign_up/textures/gui/map.png
diff --git a/jiachen/config/bchat-advanced.json b/jiachen/config/bchat-advanced.json
@@ -2,7 +2,7 @@
   "stopWords": [],
   "blockUsers": [],
   "regExp": [],
-  "chatRegCustomized": "^(?<sender>\\w{3,16})：(?<msg>.*$)",
-  "tellRegCustomized": "^(?<sender>\\w{3,16})悄悄地对你说：(?<msg>.*$)",
+  "chatRegCustomized": "^\\[(?:\\p{IsEmoji_Presentation}|\\p{IsEmoji}\\ufe0f|[0-9#*]\\ufe0f\\u20e3|\\p{IsEmoji_Modifier_Base}\\p{IsEmoji_Modifier})\\]\\<(?<sender>\\w{3,16})(?: \\u27a6 \\w{3,16})?\\> (?<msg>.*)$",
+  "tellRegCustomized": "^\\[(?:\\p{IsEmoji_Presentation}|\\p{IsEmoji}\\ufe0f|[0-9#*]\\ufe0f\\u20e3|\\p{IsEmoji_Modifier_Base}\\p{IsEmoji_Modifier})\\]\\<(?<sender>\\w{3,16})(?: \\u27a6 \\w{3,16})?\\> (?<msg>.*)$",
   "ignoredMsgReg": ""
-}
+}
diff --git a/jiachen/config/easy_npc/skin/humanoid_slim/ea.png b/jiachen/config/easy_npc/skin/humanoid_slim/ea.png
diff --git a/jiachen/config/easy_npc/skin/humanoid_slim/eb.png b/jiachen/config/easy_npc/skin/humanoid_slim/eb.png
diff --git a/jiachen/config/easy_npc/skin/humanoid_slim/ep.png b/jiachen/config/easy_npc/skin/humanoid_slim/ep.png
diff --git a/jiachen/config/easy_npc/skin/humanoid_slim/er.png b/jiachen/config/easy_npc/skin/humanoid_slim/er.png