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,184 Commits 68 Branches 330 Tags 107 MiB
6cfd602570
Commit Graph

4184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shenshaoming
df7779b88b 修改提示信息 2020-08-18 11:58:38 +08:00
mzdluo123
e6374c8849
custom codec 2020-08-18 11:50:52 +08:00
shenshaoming
9b53fb99ad 修改设备锁验证方式，改为通过点击超链接弹出页面 2020-08-18 10:54:57 +08:00
mzdluo123
f779ac08ac
fix typo 2020-08-18 10:39:01 +08:00
mzdluo123
2936ce4066
Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
 2020-08-18 10:37:41 +08:00
ryoii
0b290ba532 Fix #448 2020-08-18 10:37:21 +08:00
HelloWorld
eda8ad9318
Merge pull request #502 from yyuueexxiinngg/voice-silk-support 
Add send silk format voice support, fix typo.
 2020-08-18 10:36:50 +08:00
mzdluo123
ea8ed17844
add @SinceMirai("1.2.0") to voice upload api 2020-08-18 10:31:03 +08:00
Him188
ad74673e7f New MPP publishing (#489) 2020-08-18 09:24:44 +08:00
Him188
370e139221 Rename uploadGroupVoice to uploadVoice 2020-08-18 09:01:45 +08:00
Him188
80debd962a Migrate to new kotlinx-serialization-core; 
Embed JceKt as net.mamoe.mirai.qqandroid.utils.io.serialization.Tars (#489)
 2020-08-18 08:50:16 +08:00
Him188
13395bca98
Merge pull request #503 from yyuueexxiinngg/readme-add-cqhttp-mirai 
Add community plugin cqhttp-mirai as mirai-CQ-Adapter into README.md
 2020-08-18 07:16:09 +08:00
sandtechnology
410f371c74 Merge branch 'dev' of https://github.com/mamoe/mirai into dev 2020-08-18 02:28:11 +08:00
sandtechnology
a062ff9ed3 支持解析好友输入状态 2020-08-18 02:25:21 +08:00
yyuueexxiinngg
357414bd7e Add community plugin cqhttp-mirai as mirai-CQ-Adapter into README.md 2020-08-18 01:18:18 +08:00
yyuueexxiinngg
c848ab2146 Add send silk format voice support, fix typo. 2020-08-18 00:53:48 +08:00
mzdluo123
10a9a035e1
fix 2020-08-18 00:51:17 +08:00
mzdluo123
c6a92d978e
fix build ╮(╯-╰)╭ 2020-08-17 22:58:29 +08:00
mzdluo123
ecd00f8c55
Merge remote-tracking branch 'origin/dev' into dev 2020-08-17 22:43:47 +08:00
mzdluo123
f96c20767d
simple api for send group voice message #423 2020-08-17 22:43:22 +08:00
Karlatemp
39775c2fa0
日志系统可以重定向为log4j等jvm日志系统 (#498) 
* Close #395

* LoggerAdapters
 2020-08-17 22:21:53 +08:00
Karlatemp
2161b67775
Fix ListenerHost: inappropriate receiver for invoke for Java methods. (#499) 
* Fix the abnormal behavior of ListenerHost.

* Rename test unit name
 2020-08-17 21:18:37 +08:00
sandtechnology
f8eed41d62
Fix Method.registerEvent for Kotlin functions (#495) 
* Fix test error

* correct error message

* using none to instead exclamation mark
 2020-08-17 20:41:31 +08:00
sandtechnology
3a346686ed using none to instead exclamation mark 2020-08-17 19:39:46 +08:00
HelloWorld
7a22a42d07
Update README.md 2020-08-17 19:18:11 +08:00
sandtechnology
ccb8745b82 Merge branch 'dev' of https://github.com/sandtechnology/mirai into dev 2020-08-17 19:03:52 +08:00
sandtechnology
86cbe16b7c correct error message 2020-08-17 18:59:31 +08:00
Him188
89f5420154
Update bug---.md 2020-08-17 18:57:34 +08:00
sandtechnology
bf8d07f87b Fix test error 2020-08-17 18:53:51 +08:00
sandtechnology
2b98446c09
Merge pull request #1 from mamoe/dev 
Update
 2020-08-17 13:30:19 +08:00
Him188
236cf2540d Fix build 2020-08-16 23:54:37 +08:00
mzdluo123
7cc6241e45
some things about can't receive friend message 2020-08-16 20:12:28 +08:00
ryoii
d33e0d6b87 [Renaissance] Fix isMute 2020-08-16 10:35:55 +08:00
ryoii
fdbbe0b205 [Renaissance] Fix typo 2020-08-16 10:28:17 +08:00
Him188
9f4e24ca9e Fix imports 2020-08-16 02:09:42 +08:00
Him188
b175119f0f Merge branch 'master' into dev 
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
#	gradle.properties
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/LoginFailedException.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt
#	settings.gradle
 2020-08-16 01:57:07 +08:00
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