152 Commits

Author SHA1 Message Date
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
c1dd309b21 refactor: base server & setting ui 2024-02-20 03:25:16 +08:00