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
2,801 Commits 68 Branches 330 Tags 107 MiB
ef29345d71
Commit Graph

2801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188
ef29345d71 Use RequiresOptIn 2020-03-08 00:47:14 +08:00
Him188
c5d98cbefd Replace use of Experimental with OptIn 2020-03-08 00:47:12 +08:00
Him188
710379eb80 Specify actual type 2020-03-08 00:44:05 +08:00
Him188
1ef3eb471b Use custom Json configuration 2020-03-08 00:43:52 +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
1b8a87b4ce Fix build 2020-03-08 00:08:11 +08:00
Him188
c334321fe1 0.26.0 2020-03-08 00:02:10 +08:00
Him188
3d9b598d57 Improve Heartbeat 2020-03-07 22:45:12 +08:00
Him188
61ca490b5d Rearrange dependencies 2020-03-07 22:23:10 +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
92504fc313 Merge remote-tracking branch 'origin/master' 2020-03-07 11:29:23 +08:00
Him188
26210e7845 Generify functions 2020-03-07 11:29:04 +08:00
Him188
defe7ce054 Fix addSuppressed 2020-03-07 11:19:05 +08:00
Him188
fea2acbb85 Remove useless reference 2020-03-07 00:28:27 +08:00
Him188
92bd6b7f11 Merge remote-tracking branch 'origin/master' 2020-03-07 00:25:05 +08:00
Him188
e222465ded Make account internal 2020-03-07 00:24:37 +08:00
Him188
03f873276a Enhance flatten and asMessageChain 2020-03-07 00:24:22 +08:00
Him188
d97e7b7856
Delete shadow.yml 2020-03-06 22:35:19 +08:00
Him188
61debf93b0
Delete shadow-publish.yml 2020-03-06 22:35:10 +08:00
Him188
9518e2e5b4
Update main2.yml 2020-03-06 22:34:42 +08:00
Him188
ccf205dfaa
Update main2.yml 2020-03-06 22:33:48 +08:00
Him188
831593568c
Create main2.yml 2020-03-06 22:32:16 +08:00
Him188
e60f02a089
Create shadow-publish.yml 2020-03-06 22:31:28 +08:00
Him188
407f3cae3e
Create shadow.yml 2020-03-06 22:27:59 +08:00
Him188
709f854cc4 Merge remote-tracking branch 'origin/master' 2020-03-06 22:07:38 +08:00
Him188
27fe240630 Fix addSuppressed, close #116 2020-03-06 22:06:36 +08:00
Him188
472da8d3f6 List support 2020-03-06 22:05:55 +08:00
Him188
37344c19d6 Fix addSuppressed 2020-03-06 22:04:55 +08:00
Him188
e309f6389e 0.25.0 2020-03-06 20:07:13 +08:00
Him188
340dc40328 Merge remote-tracking branch 'origin/master' 2020-03-06 19:17:26 +08:00
Him188
e9d23bd91b 0.25.0 2020-03-06 19:17:09 +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
91df72981c Migrate to @RequiresOptIn 2020-03-06 17:51:58 +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
c8d1663639
Merge pull request #114 from PragmaTwice/master 
README.md: fix a broken link
 2020-03-05 20:49:37 -06:00
Twice
76c94020c3
README.md: fix a broken link 2020-03-06 10:44:26 +08:00
Him188
060098a5de No inlining because of Kotlin's stacktrace issue 2020-03-06 10:34:11 +08:00
Him188
db28915b8e Fix referneces 2020-03-06 10:28:37 +08:00