Commit Graph

8 Commits

Author SHA1 Message Date
student_2333
f38e544815 style: reformat 2024-04-30 11:24:33 +08:00
linyuchen
ed48a76c33 Merge branch 'v3.4.0' into dev
# Conflicts:
#	src/common/utils.ts
#	src/global.d.ts
#	src/main/ipcsend.ts
#	src/main/main.ts
#	src/ntqqapi/hook.ts
#	src/onebot11/action/SendMsg.ts
#	src/onebot11/action/TestForwdMsg.ts
#	src/onebot11/action/types.ts
#	src/onebot11/server.ts
#	src/preload.ts
2024-02-20 16:09:15 +08:00
linyuchen
1938eef746 fix: send multi forward msg 2024-02-19 21:48:50 +08:00
Disy
9b0f2d0983 chore: Conflict resolution 2024-02-19 13:31:57 +08:00
linyuchen
8d2353a524 refactor: pre-release 2024-02-11 19:57:20 +08:00
linyuchen
d08601505b refactor 2024-02-11 02:58:34 +08:00
zhangzemeng
1b04cd4843 fix: preload.ts sendSendMsgResult 安全问题 2024-02-07 10:44:42 +08:00
linyuchen
7fd37fe137 重构接受消息hook 2024-02-06 13:47:11 +08:00