github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 07:30:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,148 Commits 68 Branches 330 Tags 107 MiB
d1d5435e99
Commit Graph

4148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188
45eea16fd5 Update license 2020-08-16 01:49:30 +08:00
Him188
2d83b69d06 Update copyright 2020-08-16 01:31:14 +08:00
Him188
a93472c337 Update link 2020-08-16 00:18:36 +08:00
Him188
3dcf28592c Update licences and README 2020-08-16 00:15:46 +08:00
Him188
8b421ec45c Remove improper inline functions 2020-08-01 22:10:56 +08:00
Him188
43407aa427 Fix #470: Network Protocol: java.lang.IllegalStateException: returnCode = -10008 2020-07-31 22:49:07 +08:00
Him188
9a9ff4a58e Add supertype GroupEvent for GroupMessageEvent 2020-07-31 22:34:41 +08:00
Him188
8c4855a10e Fix build 2020-07-31 22:32:22 +08:00
Him188
1d07650d52 Merge remote-tracking branch 'origin/dev' into dev 2020-07-31 21:51:40 +08:00
Him188
0f9ababd46 Add icon 2020-07-31 21:51:16 +08:00
Him188
f5eefae7ec
Merge pull request #466 from Chenwe-i-lin/patch-4 
Update README.md
 2020-07-31 20:29:09 +08:00
Him188
928c91a05e
Merge pull request #477 from Mrs4s/dev 
fix mamoe/mirai#472: group.quit() not working
 2020-07-31 20:28:52 +08:00
Him188
30e20da40f Merge remote-tracking branch 'origin/dev' into dev 2020-07-31 20:22:54 +08:00
Him188
1d0b42df73 Cleanup 2020-07-31 16:33:12 +08:00
Him188
01e887fff5 Fix clashed Jvm classname 2020-07-31 16:32:23 +08:00
Him188
741d8f9eca Fix friend message history syncing 2020-07-31 16:31:37 +08:00
Him188
87e76d4890 Update Kotlin version to 1.4 and relevant libraries 2020-07-31 16:29:25 +08:00
Him188
2b09cdaa12 Add JDK bindings 2020-07-31 16:26:22 +08:00
Mrs4s
97d335bc55 fix mamoe/mirai#472 2020-07-31 12:28:40 +08:00
Him188
6abc8c17e4
Merge pull request #471 from Mrs4s/dev 
fix issue of multi msg cannot view on phone.
 2020-07-31 00:07:54 +08:00
CHMing
fe306c4aaa
修复成员进群后第一次发言触发改名事件 (#475) 
* 解决最后一个mirai码之后的消息无法解析的问题

* 修复成员进群后第一次发言触发改名事件

Co-authored-by: caihongming <caihongming@iboxpay.com>
 2020-07-30 14:15:03 +08:00
Him188
6e7c20856c Merge remote-tracking branch 'origin/dev' into dev 2020-07-30 01:58:26 +08:00
Him188
80c477b42e Improve documents 2020-07-30 01:12:40 +08:00
Him188
5607301244 Close #450: add BotConfiguration.loadDeviceInfoJson 2020-07-30 01:12:05 +08:00
Him188
ac91e77b5f Fix #427: documentation issue on syncFromEvent 2020-07-30 01:02:18 +08:00
Him188
d51678fa29 Misc improvements 2020-07-30 00:53:03 +08:00
Him188
474e548137 Move MiraiCode from mirai-serialization to mirai-core 2020-07-30 00:52:36 +08:00
Him188
22b9868f13 Use Kotlin language level 1.4 2020-07-30 00:51:48 +08:00
Him188
35336a0ae7 Fix buildscript 2020-07-30 00:28:09 +08:00
Him188
90185490df Implementations rearrangement 2020-07-30 00:26:55 +08:00
Him188
2b0165d850 Bump Kotlin version to 1.4.0-rc, mirai version to 1.2.0 2020-07-30 00:17:15 +08:00
Him188
f1efa0016b Remove Suppress 'WRONG_MODIFIER_CONTAINING_DECLARATION' 2020-07-30 00:16:09 +08:00
Him188
dd35cc62d5 Fix #444: FriendMessageEvent is not a subclass of FriendEvent 2020-07-30 00:15:57 +08:00
Him188
c1d54f2fdf Specify @file:JvmName("BotEventsKt") for types.kt 2020-07-30 00:14:49 +08:00
Him188
1a81fbd794 Merge remote-tracking branch 'origin/explicit-api' into dev 
# Conflicts:
#	gradle.properties
 2020-07-29 23:59:19 +08:00
mzdluo123
3d773342a6
Revert "try to fix #249 again" 
This reverts commit b320d2ca
 2020-07-29 14:26:25 +08:00
Him188
0f0dee4acd Merge remote-tracking branch 'origin/dev' into dev 2020-07-29 13:55:24 +08:00
mzdluo123
ab501e01bc
Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
 2020-07-28 15:01:31 +08:00
mzdluo123
3eef29af80
fix #389 2020-07-28 14:59:55 +08:00
mzdluo123
a8841ef772
fix #389 2020-07-28 14:58:58 +08:00
mzdluo123
b320d2caed
try to fix #249 again 2020-07-28 14:55:14 +08:00
Mrs4s
65b8d4e808 fix issue of multi msg cannot view on phone. 2020-07-28 03:18:22 +08:00
Him188
35477f8cab Enable parallel gradle tasks 2020-07-27 14:11:30 +08:00
Him188
4425cef822
Update README-eng.md 2020-07-26 15:11:12 +08:00
Him188
9b01940662
Update README-eng.md 2020-07-26 15:06:07 +08:00
Him188
5cff084471
Update README-eng.md 2020-07-26 15:04:28 +08:00
mzdluo123
2ec431489e
try to fix #249 2020-07-25 19:37:39 +08:00
Him188
d39f3c3c72
Merge pull request #464 from ac682/master 
yet another .net sdk added to list
 2020-07-25 19:17:16 +08:00
undefined
5702f8fdcf
Update README.md 
给 python-mirai 盖上棺材板
 2020-07-25 17:23:20 +08:00
ac682
2f2758a1f3 yet another .net sdk added to list 2020-07-25 04:33:05 +08:00