github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-04 08:59:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,036 Commits 68 Branches 330 Tags 107 MiB
f6155cc6a5
Commit Graph

2036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188
4e57eea779 Use kotlin rather that JDK9 2020-02-04 08:49:32 +08:00
Him188
6a605156e5 Error catching 2020-02-04 08:40:57 +08:00
Him188
a85b763f4e Fix group message 2020-02-04 08:34:39 +08:00
Him188
5739f694c9 Merge remote-tracking branch 'origin/master' 2020-02-04 08:28:00 +08:00
Him188
af08f52236 Fix toExternalImage 2020-02-04 08:27:45 +08:00
Him188
9f0169c622 Fix md5 2020-02-04 08:27:32 +08:00
Him188
ce2654ee60
Update README.md 2020-02-03 23:48:11 +08:00
jiahua.liu
3bf219d7d3 Merge remote-tracking branch 'origin/master' 2020-02-03 23:04:52 +08:00
jiahua.liu
7efe20ac8b Troop management - Mute member 2020-02-03 23:04:40 +08:00
Him188
c89076b4b9 Merge remote-tracking branch 'origin/master' 2020-02-03 23:03:44 +08:00
Him188
9c15287305 Fix missing file 2020-02-03 23:03:30 +08:00
jiahua.liu
a776b25b27 Merge remote-tracking branch 'origin/master' 2020-02-03 22:00:27 +08:00
jiahua.liu
df24d101bc Troop management - Mute member 2020-02-03 22:00:14 +08:00
Him188
b240370f20 Add common filepath 2020-02-03 21:42:14 +08:00
Him188
9c318601a7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
#	mirai-core-qqandroid/src/jvmTest/kotlin/test/ProtoBufDataClassGenerator.kt
 2020-02-03 21:40:00 +08:00
Him188
35dca403bf Image upload 2020-02-03 21:38:37 +08:00
Him188
4d192d975c
Merge pull request #33 from uebian/patch-1 
设置标准输入流
 2020-02-03 04:20:51 -06:00
uebian
397d376bff
设置标准输入流 2020-02-03 10:10:24 +00:00
jiahua.liu
3d8c60cbd4 Troop management 2020-02-03 17:11:36 +08:00
jiahua.liu
870234a007 Merge remote-tracking branch 'origin/master' 2020-02-03 17:00:17 +08:00
jiahua.liu
c69502a9ea Proto Bufs 2020-02-03 17:00:01 +08:00
Him188
8e54e71661 Fix group message 2020-02-03 16:58:23 +08:00
Him188
dc940ee0cc CustomFace support 2020-02-03 16:31:35 +08:00
Him188
c13109cf5b Merge remote-tracking branch 'origin/master' 2020-02-03 15:57:34 +08:00
Him188
c429a7cf3a Fix decrypt 2020-02-03 15:57:15 +08:00
jiahua.liu
584cdd7d6e to merge 2020-02-03 15:21:03 +08:00
jiahua.liu
455f408ece Merge remote-tracking branch 'origin/master' 2020-02-03 14:54:57 +08:00
jiahua.liu
f63a077e21 to merge 2020-02-03 14:54:13 +08:00
Him188
e2dd51e075 No add in getFriend 2020-02-03 14:52:40 +08:00
Him188
10e6c51948 Make inline 2020-02-03 14:51:28 +08:00
Him188
ce7c9f8c82 Remove getQQOrAdd 2020-02-03 14:51:23 +08:00
Him188
a113f0ed1e Remove val previous 2020-02-03 14:25:36 +08:00
Him188
d3d7e530a9 Rename getQQ to getFriend Add deprecation message 2020-02-03 14:25:19 +08:00
Him188
102da76a32 Async friendlist 2020-02-03 13:30:06 +08:00
Him188
8c69eefcde Use groupCode as primary key 2020-02-03 02:45:40 +08:00
Him188
d9e5805255 Improve performance 2020-02-03 01:59:41 +08:00
Him188
e38bfe30d8 Merge remote-tracking branch 'origin/master' 2020-02-03 01:36:19 +08:00
jiahua.liu
32e8e21b87 Group/Friend List finally complete 2020-02-03 01:34:17 +08:00
Him188
06e6819d25 Merge remote-tracking branch 'origin/master' 2020-02-03 01:30:06 +08:00
jiahua.liu
0f587cadc5 Group Permissions 2020-02-03 01:03:20 +08:00
jiahua.liu
826331c5b7 group UIN and Group code 2020-02-03 00:55:35 +08:00
Him188
719023826d Merge remote-tracking branch 'origin/master' 2020-02-03 00:54:12 +08:00
jiahua.liu
ccdeaba817 change ID to Groupcode for logging 2020-02-03 00:49:44 +08:00
jiahua.liu
9ebd716823 fix group related 2020-02-03 00:47:23 +08:00
jiahua.liu
6b698ef4d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
 2020-02-03 00:17:22 +08:00
jiahua.liu
4081c1b850 List complete 2020-02-03 00:15:27 +08:00
jiahua.liu
bfdcee1a1c List complete 2020-02-03 00:15:09 +08:00
Him188
ab4a0c82d6 this is now instance of GroupMessage for sentFrom 2020-02-02 23:30:37 +08:00
Him188
5d46d1c4be C2C message send support 2020-02-02 23:21:42 +08:00
Him188
6ac9acc640 Rewrite image 2020-02-02 23:21:26 +08:00