github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 23:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
279 Commits 68 Branches 330 Tags 107 MiB
7666cd12b5
Commit Graph

279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188moe
7666cd12b5
Update README.md 2019-09-07 19:57:32 +08:00
Him188moe
2c108b17a2 Enhanced output 2019-09-07 19:55:55 +08:00
Him188moe
09495c0ca9 Enhanced output 2019-09-07 19:47:25 +08:00
Him188moe
c539313351 Merge remote-tracking branch 'origin/master' 2019-09-07 19:16:40 +08:00
Him188moe
74fff88a0c Captcha finished 2019-09-07 19:16:16 +08:00
liujiahua123123
5383194db1 Merge remote-tracking branch 'origin/master' 2019-09-07 15:23:56 +08:00
liujiahua123123
b6d8a7d07c thread-pool 2019-09-07 15:21:53 +08:00
Him188moe
36f1980a84 Merge remote-tracking branch 'origin/master' 2019-09-07 15:19:26 +08:00
Him188moe
2fb658be37 Updated verification code 2019-09-07 15:19:09 +08:00
liujiahua123123
3dd7936700 char image support 2019-09-07 15:14:51 +08:00
liujiahua123123
7682f2100c Merge branch 'master' of https://github.com/mamoe/mirai 2019-09-07 14:13:53 +08:00
Him188moe
f1b81120ca Updated verification code 2019-09-07 14:12:58 +08:00
Him188moe
cf4eed6d28 Updated verification code 2019-09-07 12:55:25 +08:00
liujiahua123123
93dc8e589e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/Robot.java
 2019-09-07 11:49:05 +08:00
liujiahua123123
5b07f09d3d changes 2019-09-07 11:48:52 +08:00
Him188
9a0092ffca Updated packets 2019-09-06 22:20:16 +08:00
Him188moe
70dc6cf63c Updated sth 2019-09-06 22:10:35 +08:00
Him188moe
305a7a6f73 Updated events and KDocs 2019-09-06 22:00:16 +08:00
Him188moe
402e8fbb32 Updated robot & network structure 2019-09-05 22:10:40 +08:00
Him188moe
1446618496 Merge remote-tracking branch 'origin/master' 2019-09-05 20:21:59 +08:00
Him188moe
e129719d4b Updated robot & network structure 2019-09-05 20:21:35 +08:00
Him188moe
6e0e38896d
Update README.md 2019-09-04 23:33:09 +08:00
Him188moe
c734431f64
Update README.md 2019-09-04 23:31:19 +08:00
Him188moe
c353e8e8f9 Updated robot & network structure 
sendPacket is not async now
 2019-09-04 22:57:46 +08:00
Him188moe
406b6c613a Merge remote-tracking branch 'origin/master' 2019-09-04 22:56:37 +08:00
Him188moe
e9ee57296d Updated robot & network structure 2019-09-04 22:56:18 +08:00
Him188moe
a445f5b523
Update README.md 2019-09-04 22:55:14 +08:00
Him188moe
7b8cd5d521 Updated robot & network structure 2019-09-04 22:40:18 +08:00
Him188
d0a9a9da34 Updated robot & network structure 2019-09-04 22:38:29 +08:00
Him188moe
1ba96b78aa Updated robot & network structure 2019-09-04 22:37:33 +08:00
Him188moe
99cf7e2f85 Updated robot & network structure 2019-09-04 22:29:47 +08:00
Him188moe
39330e4560 Updated robot & network structure 2019-09-04 22:20:19 +08:00
Him188moe
512d27b843 Updated robot & network structure 2019-09-04 22:18:36 +08:00
Him188moe
bde4610f7b Updated robot & network structure 2019-09-04 20:37:10 +08:00
Him188moe
b2ec40e195 Updated verification code processing 2019-09-03 19:25:48 +08:00
Him188moe
26c27f0740 Merge remote-tracking branch 'origin/master' 2019-09-02 22:34:35 +08:00
Him188moe
7ca62bb0c8 Updated verification code processing 2019-09-02 22:33:23 +08:00
liujiahua123123
1c8e5679a1 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/Robot.java
 2019-09-02 10:55:25 +08:00
liujiahua123123
5da8e1c9a7 robot data system 2019-09-02 10:55:11 +08:00
Him188moe
e2c9dfa2a3
Update README.md 2019-09-01 22:48:42 +08:00
Him188moe
beb64dd436 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
 2019-09-01 19:16:54 +08:00
Him188moe
3bf1d3a84c update 2019-09-01 19:15:24 +08:00
liujiahua123123
4a8f7255ec Merge remote-tracking branch 'origin/master' 2019-09-01 18:50:37 +08:00
liujiahua123123
c2dea1d7f0 merge 2019-09-01 18:50:22 +08:00
Him188moe
c8fd31f4ae
Update README.md 2019-09-01 17:34:47 +08:00
Him188moe
04823b3557 update 2019-09-01 17:02:57 +08:00
Him188moe
801d727629 update 2019-09-01 16:18:11 +08:00
Him188moe
a7d3e62fa6 Merge remote-tracking branch 'origin/master' 2019-09-01 15:46:47 +08:00
Him188moe
ff732162c4 update 2019-09-01 15:45:51 +08:00
Him188moe
ba494e181b
Update README.md 2019-09-01 02:10:48 +08:00