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

4216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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