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

707 Commits

Author SHA1 Message Date
Him188
0126e4ce67 Apply shadow plugin for future use 2020-03-08 22:25:00 +08:00
Him188
f2608d6956 Merge remote-tracking branch 'origin/master' 2020-03-08 22:22:26 +08:00
Him188
e51cf7ee71 Remove debugging logs 2020-03-08 22:16:04 +08:00
Him188
a64c061377 Support LightApp message 2020-03-08 22:14:59 +08:00
Him188
584b5e9822 xml and Json messages support 2020-03-08 22:05:08 +08:00
Him188
243b2ea731 Gather all platform-specified utilities into a MiraiPlatformUtils 2020-03-08 21:14:41 +08:00
Him188
a8a0d583ab Merge remote-tracking branch 'origin/master' 2020-03-08 20:15:14 +08:00
Him188
cf6b64ef0d Solve TODO 2020-03-08 18:45:23 +08:00
Him188
c69cb6f3de Fix Map entry tags, remove debugging logs 2020-03-08 17:44:34 +08:00
Him188
ce7af37ef4 Migrate to new Jce serializer 2020-03-08 17:13:33 +08:00
Him188
2acca0c2e6 Jce complex nesting support 2020-03-08 16:34:38 +08:00
Him188
e375d17f82 Support maps and nesting 2020-03-08 16:02:11 +08:00
Him188
7c3a2d8e13 Merge remote-tracking branch 'origin/master' 2020-03-08 14:12:29 +08:00
Him188
17b34b9d10 Simplify group quote 2020-03-08 13:27:23 +08:00
Him188
6731525e49 Improve structure 2020-03-08 00:57:29 +08:00
Him188
0a64654a4f Use kotlinx.io 2020-03-08 00:49:24 +08:00
Him188
c5d98cbefd Replace use of Experimental with OptIn 2020-03-08 00:47:12 +08:00
Him188
e39fe5a46f Merge branch 'master' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt
#	mirai-core/build.gradle.kts
#	mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/input.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
 2020-03-08 00:29:51 +08:00
Him188
200b8b98e7 Merge remote-tracking branch 'origin/master' 2020-03-08 00:25:31 +08:00
Him188
b1f36704c8 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-08 00:24:49 +08:00
Him188
1b1be6944c Merge remote-tracking branch 'origin/master' 2020-03-08 00:12:53 +08:00
Him188
3d9b598d57 Improve Heartbeat 2020-03-07 22:45:12 +08:00
Him188
e60a6bcf68 Revert "Use ktor.io than kotlinx.io" 2020-03-07 22:04:31 +08:00
Him188
6b54abe730 Revert "Use ktor.io than kotlinx.io" 
This reverts commit ffee2e26
 2020-03-07 18:49:59 +08:00
Him188
b3c4f24e33 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-07 18:48:07 +08:00
Him188
dba3cb5707 Simplify expression 2020-03-07 12:45:34 +08:00
Him188
e222465ded Make account internal 2020-03-07 00:24:37 +08:00
Him188
472da8d3f6 List support 2020-03-06 22:05:55 +08:00
Him188
92df108740 Support Lists 2020-03-06 19:09:34 +08:00
Him188
2260d331d4 Support ByteArray 2020-03-06 18:33:01 +08:00
Him188
d01c3c4675 Support optional elements 2020-03-06 17:51:48 +08:00
Him188
e52a394060 Add tests 2020-03-06 15:16:33 +08:00
Him188
19cc131247 Suppress false positive warnings 2020-03-06 15:15:39 +08:00
Him188
24983d8bbe Throws EOFException rather than IllegalStateException 2020-03-06 15:14:51 +08:00
Him188
115ccec9ed Rearrange classes 2020-03-06 14:41:15 +08:00
Him188
d8c64286e2 Use constant 2020-03-06 14:17:30 +08:00
Him188
4085ecbdd8 Fix warnings 2020-03-05 21:39:53 +08:00
Him188
3b16f0a226 Fix warnings 2020-03-05 21:36:46 +08:00
Him188
b0abd0df28 Skip field when preparing next head 2020-03-05 21:21:06 +08:00
Him188
bfcb8606a2 Merge branch 'master' into kotlin-1.3.70 2020-03-05 15:49:48 +08:00
Him188
cde198759c Rewrite Jce 2020-03-05 14:52:35 +08:00
Him188
8c48ca8136 Use new serialization 2020-03-05 14:52:12 +08:00
Him188
8777d583b0 Merge remote-tracking branch 'origin/kotlin-1.3.70' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
 2020-03-05 09:45:12 +08:00
Him188
9bff0f77ec Kotlin 1.3.70 2020-03-05 09:44:50 +08:00
Him188
33d562a296 Merge remote-tracking branch 'origin/kotlin-1.3.70' into kotlin-1.3.70 2020-03-04 21:50:49 +08:00
Him188
9a039e1602 Fix reference 
(cherry picked from commit 8dabeba40d)
 2020-03-04 21:50:17 +08:00
Him188
8dabeba40d Fix reference 2020-03-04 21:21:23 +08:00
Him188
c962bd2641 Revert "Adapt new kotlinx.serialization" 
This reverts commit 0a6b39e6
 2020-03-04 14:11:36 +08:00
Him188
60b6eab73e Revert "Update to Kotlin 1.3.70" 
This reverts commit 2e57e358
 2020-03-04 13:58:01 +08:00
Him188
b62151ea6e Fix dependency 2020-03-04 12:23:33 +08:00