Commit Graph

4019 Commits

Author SHA1 Message Date
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
Him188
dd35cc62d5 Fix #444: FriendMessageEvent is not a subclass of FriendEvent 2020-07-30 00:15:57 +08:00
Him188
c1d54f2fdf Specify @file:JvmName("BotEventsKt") for types.kt 2020-07-30 00:14:49 +08:00
Him188
1a81fbd794 Merge remote-tracking branch 'origin/explicit-api' into dev
# Conflicts:
#	gradle.properties
2020-07-29 23:59:19 +08:00
mzdluo123
3d773342a6
Revert "try to fix #249 again"
This reverts commit b320d2ca
2020-07-29 14:26:25 +08:00
Him188
0f0dee4acd Merge remote-tracking branch 'origin/dev' into dev 2020-07-29 13:55:24 +08:00
mzdluo123
ab501e01bc
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt
2020-07-28 15:01:31 +08:00
mzdluo123
3eef29af80
fix #389 2020-07-28 14:59:55 +08:00
mzdluo123
a8841ef772
fix #389 2020-07-28 14:58:58 +08:00
mzdluo123
b320d2caed
try to fix #249 again 2020-07-28 14:55:14 +08:00
Mrs4s
65b8d4e808 fix issue of multi msg cannot view on phone. 2020-07-28 03:18:22 +08:00
Him188
35477f8cab Enable parallel gradle tasks 2020-07-27 14:11:30 +08:00
Him188
4425cef822
Update README-eng.md 2020-07-26 15:11:12 +08:00
Him188
9b01940662
Update README-eng.md 2020-07-26 15:06:07 +08:00
Him188
5cff084471
Update README-eng.md 2020-07-26 15:04:28 +08:00
mzdluo123
2ec431489e
try to fix #249 2020-07-25 19:37:39 +08:00
Him188
d39f3c3c72
Merge pull request #464 from ac682/master
yet another .net sdk added to list
2020-07-25 19:17:16 +08:00
undefined
5702f8fdcf
Update README.md
给 python-mirai 盖上棺材板
2020-07-25 17:23:20 +08:00
ac682
2f2758a1f3 yet another .net sdk added to list 2020-07-25 04:33:05 +08:00
ryoii
d1bff8821e Update ISSUE TEMPLATE again 2020-07-24 18:53:50 +08:00
ryoii
b12d189b86 Update ISSUE TEMPLATE 2020-07-24 18:49:32 +08:00
Him188
caa73dc1c8
Update bug---.md 2020-07-21 12:00:44 +08:00
Him188
0a2c01e12b
Update README.md 2020-07-21 11:54:33 +08:00
Him188
4f86d15ef3 Simplify buildscript 2020-07-20 17:21:00 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
Him188
f304d7ea92
Update CHANGELOG.md 2020-07-17 21:19:04 +08:00
Him188
18002fff38
Update Versions.kt 2020-07-17 20:51:22 +08:00
Him188
31654ad2a1
Update CHANGELOG.md 2020-07-17 20:50:46 +08:00
Karlatemp
22550cafd2
Create java test. Fix #443 (#446)
* Create java test. Fix #443

* Typo

* gradle-kotlin-dsl
2020-07-17 20:43:26 +08:00
Him188
b71fc740ee 1.1.2 released 2020-07-16 22:30:33 +08:00
Him188
9ebfef2dd8 Add tests for #436 2020-07-16 22:24:14 +08:00
Him188
2e7370a0e7 Add notes to UnsupportedSMSLoginException 2020-07-16 22:11:43 +08:00
Him188
0a7ebffd95 Fix #428 2020-07-16 22:07:35 +08:00
Him188
45785adc09 Fix #436 2020-07-16 21:11:34 +08:00
Him188
58908d60b2 Merge remote-tracking branch 'origin/dev' into dev 2020-07-16 13:47:49 +08:00
Him188
d0377a360b Add implementation notes 2020-07-16 13:47:33 +08:00
ryoii
c95306c12e Fix BotJoinGroupEvent.Invite 2020-07-15 17:42:25 +08:00
ryoii
2f0ff513a2 Close #435, support FriendRecallEvent 2020-07-15 15:15:49 +08:00
Him188
438d5611be Enable org.gradle.parallel 2020-07-12 12:54:21 +08:00
ryoii
42716ab62d Fix #375, broadcast BotJoinGroupEvent when create new group from other client 2020-07-12 12:02:32 +08:00
ryoii
de484ecb9a Remove debug log 2020-07-12 11:42:21 +08:00
Him188
611642d667 1.1.1 published 2020-07-11 21:28:05 +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
Him188
5784ba1070 Merge branch 'master' into dev 2020-07-11 21:18:10 +08:00
Him188
522bcba33e Merge remote-tracking branch 'origin/dev' into dev 2020-07-11 21:16:45 +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