github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 07:30: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
ryoii
5edcf410b6 [Fix conflict] ReNamed pb struct 2020-08-19 10:22:53 +08:00
Him188
31f688cdca Merge remote-tracking branch 'origin/dev' into dev 2020-08-19 10:22:23 +08:00
ryoii
2f5be83279 [Fix conflict] ReNamed pb struct 2020-08-19 10:21:02 +08:00
Him188
51ddc7e3c9 Fix doc 2020-08-19 10:13:07 +08:00
Him188
645bbdb231 Update CHANGELOG 2020-08-19 10:11:43 +08:00
ryoii
faa7c4189f Merge remote-tracking branch 'origin/dev' into dev 2020-08-19 10:10:11 +08:00
ryoii
08a2753fde Merge branch 'dev1.3' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt
 2020-08-19 10:09:03 +08:00
TheSnowfield
22d871c68a
update some unknown fields (#487) 
* update some unknown fields in Tlv.kt

* 1 to true
 2020-08-19 10:06:31 +08:00
Karlatemp
b42733ad15
Support Nick changed event (#507) 
* Support Nick change

* Fix up FriendInfo

* @JvmField

* Update friend.kt

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-08-19 10:04:59 +08:00
Him188
b78c771430 Ignore inherited stdlib from kotlinx-io 2020-08-19 09:32:56 +08:00
Him188
679d61a6b1 Replace deprecated String.toMessage 2020-08-19 09:32:28 +08:00
Him188
2bc36d7fea
Update -------.md 2020-08-19 08:12:53 +08:00
Him188
8572502a09
Update ----.md 2020-08-19 08:11:42 +08:00
Him188
fdede76f11 Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 22:59:42 +08:00
Him188
6235dd20ea Fix typo 2020-08-18 22:41:49 +08:00
Him188
91853acab0 Remove receiver type from nextEvent.filter 2020-08-18 22:38:48 +08:00
Him188
3340651998 Enhance nextEvent and nextEventOrNull: add filter 2020-08-18 22:37:26 +08:00
Him188
4703095f46 Use JvmBlockingBridge 2020-08-18 22:09:05 +08:00
Him188
329f18a0cb Deprecate String.toMessage for semantic issue with mirai code 2020-08-18 21:44:24 +08:00
Him188
419a8f84c4 Deprecate URL.toExternalImage, Input.toExternalImage and relevant APIs. 2020-08-18 21:21:21 +08:00
mzdluo123
bebe75271c
fix build 2020-08-18 20:33:35 +08:00
HelloWorld
e6e4c02586
Merge pull request #504 from sandtechnology/dev 2020-08-18 20:20:35 +08:00
HelloWorld
7d321ee206
Merge branch 'dev' into dev 2020-08-18 20:16:12 +08:00
Him188
c221bd9d82 Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 20:10:48 +08:00
Him188
de05757799 Fix function name after merging (from uploadGroupVoice to uploadVoice) 2020-08-18 20:10:07 +08:00
mzdluo123
596194cb10
Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 19:59:21 +08:00
mzdluo123
e840839557
try domain to connect server at first 2020-08-18 19:58:14 +08:00
Him188
6c21971ce0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
 2020-08-18 19:55:12 +08:00
ryoii
996063a58f Named pb struct 2020-08-18 15:48:45 +08:00
sandtechnology
293e4fb06f Format and annotation 2020-08-18 15:25:39 +08:00
申劭明
31773954ad
Update HyperLinkLabel.kt 
修改代码格式
 2020-08-18 13:09:01 +08:00
shenshaoming
8b22e922a0 添加internal访问限制 2020-08-18 12:23:18 +08:00
shenshaoming
df7779b88b 修改提示信息 2020-08-18 11:58:38 +08:00
mzdluo123
e6374c8849
custom codec 2020-08-18 11:50:52 +08:00
shenshaoming
9b53fb99ad 修改设备锁验证方式，改为通过点击超链接弹出页面 2020-08-18 10:54:57 +08:00
mzdluo123
f779ac08ac
fix typo 2020-08-18 10:39:01 +08:00
mzdluo123
2936ce4066
Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
 2020-08-18 10:37:41 +08:00
ryoii
0b290ba532 Fix #448 2020-08-18 10:37:21 +08:00
HelloWorld
eda8ad9318
Merge pull request #502 from yyuueexxiinngg/voice-silk-support 
Add send silk format voice support, fix typo.
 2020-08-18 10:36:50 +08:00
mzdluo123
ea8ed17844
add @SinceMirai("1.2.0") to voice upload api 2020-08-18 10:31:03 +08:00
Him188
ad74673e7f New MPP publishing (#489) 2020-08-18 09:24:44 +08:00
Him188
370e139221 Rename uploadGroupVoice to uploadVoice 2020-08-18 09:01:45 +08:00
Him188
80debd962a Migrate to new kotlinx-serialization-core; 
Embed JceKt as net.mamoe.mirai.qqandroid.utils.io.serialization.Tars (#489)
 2020-08-18 08:50:16 +08:00
Him188
13395bca98
Merge pull request #503 from yyuueexxiinngg/readme-add-cqhttp-mirai 
Add community plugin cqhttp-mirai as mirai-CQ-Adapter into README.md
 2020-08-18 07:16:09 +08:00
sandtechnology
410f371c74 Merge branch 'dev' of https://github.com/mamoe/mirai into dev 2020-08-18 02:28:11 +08:00
sandtechnology
a062ff9ed3 支持解析好友输入状态 2020-08-18 02:25:21 +08:00
yyuueexxiinngg
357414bd7e Add community plugin cqhttp-mirai as mirai-CQ-Adapter into README.md 2020-08-18 01:18:18 +08:00
yyuueexxiinngg
c848ab2146 Add send silk format voice support, fix typo. 2020-08-18 00:53:48 +08:00
mzdluo123
10a9a035e1
fix 2020-08-18 00:51:17 +08:00
mzdluo123
c6a92d978e
fix build ╮(╯-╰)╭ 2020-08-17 22:58:29 +08:00