Commit Graph

16 Commits

Author SHA1 Message Date
Him188
bd4dcec68e Fix copyright 2020-08-23 19:57:09 +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
2d83b69d06 Update copyright 2020-08-16 01:31:14 +08:00
Him188
87e76d4890 Update Kotlin version to 1.4 and relevant libraries 2020-07-31 16:29:25 +08:00
Him188
474e548137 Move MiraiCode from mirai-serialization to mirai-core 2020-07-30 00:52:36 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
caihongming
2337453d84 Fix #431 2020-07-11 21:19:56 +08:00
Him188
d6b85d40ce mirai code: Add tests for the message after last message element (#431) 2020-07-11 21:19:55 +08:00
caihongming
1d0c3c2e3c Fix #431 2020-07-11 21:16:30 +08:00
Him188
87eb212ab2 mirai code: Add tests for the message after last message element (#431) 2020-07-11 21:05:26 +08:00
Him188
ed6f82c19a Add mirai-serialization/README.md 2020-06-16 16:21:51 +08:00
Him188
751a3731b0 Remove common Message.toMiraiCode 2020-06-12 16:34:06 +08:00
Him188
7583172976 Remove parentheses in mirai code of VipFace 2020-06-12 16:02:09 +08:00
Him188
5941605a72 Rearrange mirai code implementations 2020-06-12 15:15:04 +08:00
Him188
a379ceb3b0 Fix parseMiraiCode 2020-06-07 18:55:07 +08:00
Him188
094bd72efb Add String.parserMiraiCode, close #264 2020-05-29 17:09:20 +08:00