Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
This commit is contained in:
Him188moe 2019-09-01 19:16:54 +08:00
commit beb64dd436

View File

@ -3,7 +3,7 @@
一个以<b>TIM QQ协议</b>驱动的JAVA(+Kotlin) QQ机器人服务端核心 一个以<b>TIM QQ协议</b>驱动的JAVA(+Kotlin) QQ机器人服务端核心
我们坚持免费与开源 我们坚持免费与开源
项目处于快速开发阶段, 现在已经可以接受群聊/好友消息. 项目处于快速开发阶段, 现在已经可以接受和发送群聊/好友消息.
协议来自网络上开源项目 协议来自网络上开源项目
一切开发旨在学习, 请勿用于非法用途 一切开发旨在学习, 请勿用于非法用途
@ -25,12 +25,12 @@ Network部分使用 Kotlin 完成(因为kt有对 unsigned byte 的支持).
- [x] Network - Touch - [x] Network - Touch
- [X] Network - Login - [X] Network - Login
- [X] Network - Session - [X] Network - Session
- [ ] Network - Verification Code **(Low priority)** - [ ] Network - Verification Code (Low priority)
- [X] Network - Message Receiving - [X] Network - Message Receiving
- [ ] Network - Message Sending **(Working on)** - [X] Network - Message Sending
- [ ] Network - Events **(Working on)** - [ ] Network - Events **(Working on)**
- [ ] Robot - Friend/group list - [ ] Robot - Friend/group list
- [ ] Message Section - [ ] Message Section **(Working on)**
- [ ] Contact - [ ] Contact
<br> <br>