github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 18:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
489 Commits 68 Branches 330 Tags 107 MiB
3474c87faa
Commit Graph

377 Commits

Author SHA1 Message Date
Him188
23c060fb44 Fixed bugs 2019-09-29 21:13:52 +08:00
Him188
cc85ad3d5a Fixed bugs 2019-09-29 21:07:52 +08:00
Him188
7b0175e8c7 Inlined replies 2019-09-28 01:33:54 +08:00
Him188moe
61bbc82146 Improved message, demo 2019-09-28 00:11:59 +08:00
Him188moe
de48783976 Improved message, demo 2019-09-27 22:44:00 +08:00
Him188moe
d315dcbc71 Kotlin coroutine 2019-09-24 22:57:59 +08:00
Him188moe
f459891cf8 Kotlin coroutine 2019-09-24 22:56:13 +08:00
Him188moe
2d366d49a9 Kotlin coroutine 2019-09-24 22:42:49 +08:00
Him188moe
3ce6096e83 Kotlin coroutine 2019-09-22 20:07:18 +08:00
Him188moe
2b02121b66 Kotlin coroutine 2019-09-22 20:04:43 +08:00
Him188moe
b10e0104ae Kotlin coroutine 2019-09-19 22:14:02 +08:00
Him188moe
ef08b044c7 Merge remote-tracking branch 'origin/master' 2019-09-19 22:12:29 +08:00
Him188moe
4f4bc05da6 Kotlin coroutine 2019-09-19 22:11:57 +08:00
liujiahua123123
91aed96c93 Merge remote-tracking branch 'origin/master' 2019-09-19 12:34:23 +08:00
liujiahua123123
c8d92c4bef miraiAPI 2019-09-19 12:32:59 +08:00
Him188moe
4b96bf0ee8 updated 2019-09-15 12:48:41 +08:00
Him188moe
ad89a17680 Merge remote-tracking branch 'origin/master' 2019-09-15 12:20:47 +08:00
Him188moe
fbfbea59df updated 2019-09-15 12:20:14 +08:00
liujiahua123123
deeb8fa342 miraiAPI 2019-09-14 00:33:33 +08:00
liujiahua123123
eb64578ff3 mirai-api 2019-09-14 00:25:04 +08:00
Him188moe
b488bee0f4 updated 2019-09-14 00:23:25 +08:00
Him188moe
ff0acc87e3 send image 2019-09-13 18:59:05 +08:00
Him188moe
37fa8055b5 Updated network 2019-09-13 12:51:14 +08:00
Him188moe
96a9e6f386 Updated network 2019-09-13 12:41:26 +08:00
Him188moe
fcaadfdb24 Updated network 2019-09-13 12:35:59 +08:00
Him188moe
ef98f22d54 Updated network 2019-09-13 12:22:55 +08:00
Him188moe
4a319bf589 Updated network 2019-09-13 11:28:41 +08:00
Him188moe
d19216a65b Updated 2019-09-13 10:23:05 +08:00
Him188
e3c23b3510 Updated 2019-09-11 22:16:09 +08:00
Him188moe
88be6d7a68 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pom.xml
 2019-09-11 22:15:02 +08:00
Him188moe
05735776b7 Updated 2019-09-11 22:12:37 +08:00
liujiahua123123
72e4208df9 Merge remote-tracking branch 'origin/master' 2019-09-11 20:33:40 +08:00
liujiahua123123
c694161720 Image Network 2019-09-11 20:33:21 +08:00
Him188moe
f19ea39366 Merge remote-tracking branch 'origin/master' 2019-09-11 20:27:41 +08:00
Him188moe
8782689a19 Updated 2019-09-11 20:27:20 +08:00
liujiahua123123
79f7cd627a ImageNetworkTest0 2019-09-11 20:21:02 +08:00
Him188moe
15de6f313a Updated 2019-09-11 19:55:57 +08:00
Him188moe
ece200d499 Updated docs, migrated TEA encryption from java to kotlin, fixed bugs 2019-09-10 22:25:13 +08:00
liujiahua123123
97ff41fea8 update readme 2019-09-10 19:56:17 +08:00
liujiahua123123
d05cecefc5 Merge remote-tracking branch 'origin/master' 2019-09-10 19:52:26 +08:00
liujiahua123123
2f96338107 thread-pool 2019-09-10 19:52:13 +08:00
Him188moe
114604f2b3 Renamed robot to bot 2019-09-08 20:53:54 +08:00
Him188moe
aac8b08f00 Updated message 2019-09-08 19:58:47 +08:00
Him188moe
f2986d91db Updated message 2019-09-08 19:29:21 +08:00
Him188moe
fa6a9b66b2 Updated message&contact adding 2019-09-08 16:16:36 +08:00
Him188moe
b33e8757e5 Moduled project 2019-09-08 14:49:05 +08:00
Him188moe
6da2bd2f31 Enhanced Message 2019-09-08 14:29:21 +08:00
Him188
95b0d3b907 Updated readme 2019-09-08 01:36:19 +08:00
Him188moe
3549e666c5 Updated readme 2019-09-08 01:33:54 +08:00
Him188moe
9fda59afc3 Message analysis 2019-09-08 01:10:02 +08:00
Him188moe
7fb588be87 Enhanced output & login flow 2019-09-07 20:50:00 +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
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
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
e129719d4b Updated robot & network structure 2019-09-05 20:21:35 +08:00
Him188moe
c353e8e8f9 Updated robot & network structure 
sendPacket is not async now
 2019-09-04 22:57:46 +08:00
Him188moe
e9ee57296d Updated robot & network structure 2019-09-04 22:56:18 +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
7ca62bb0c8 Updated verification code processing 2019-09-02 22:33:23 +08:00
Him188moe
3bf1d3a84c update 2019-09-01 19:15:24 +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
ff732162c4 update 2019-09-01 15:45:51 +08:00
Him188moe
dc6ee1093d Message receiver is working! 2019-09-01 01:20:41 +08:00
Him188moe
2e20d75298 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
 2019-09-01 01:05:08 +08:00
Him188moe
f61f738daf Message receiver is working! 2019-09-01 01:02:25 +08:00
liujiahua123123
c2eee671ca change robot structure 2019-09-01 00:59:55 +08:00
liujiahua123123
6991a73af5 Merge remote-tracking branch 'origin/master' 2019-09-01 00:59:14 +08:00
liujiahua123123
f257f610fc change robot structure 2019-09-01 00:58:39 +08:00
Him188moe
680de13f82 Merge remote-tracking branch 'origin/master' 2019-09-01 00:36:54 +08:00
Him188moe
af761d898f Message receiver is working! 2019-09-01 00:36:26 +08:00
liujiahua123123
f7541c1934 change robot structure 2019-09-01 00:29:13 +08:00
Him188moe
018a3b8f7b Merge remote-tracking branch 'origin/master' 2019-09-01 00:05:16 +08:00
Him188moe
418f95db65 Message receiver is working! 2019-09-01 00:04:50 +08:00
liujiahua123123
e697da8c6e Merge remote-tracking branch 'origin/master' 2019-09-01 00:01:27 +08:00
liujiahua123123
836e9c2bd5 change robot structure 2019-09-01 00:01:09 +08:00
Him188moe
c7b0b58c34 Message receiver is working! 2019-08-31 23:46:46 +08:00
Him188moe
c5b01fbf5f Message receiver is working! 2019-08-31 23:29:59 +08:00
Him188moe
6350638e40 Message receiver is working! 2019-08-31 23:21:56 +08:00
Him188moe
929592303d Working on message events 2019-08-31 21:19:10 +08:00
Him188moe
17b1cf6e7c Working on message events 2019-08-31 21:18:30 +08:00
Him188moe
87ccf60dcd Working on new network 2019-08-31 20:05:59 +08:00
Him188moe
c23a48ebb0 Working on verify code 2019-08-31 19:41:37 +08:00
Him188moe
4508c66225 Session finished 2019-08-31 19:16:52 +08:00
Him188moe
16d70c9f9c Login finished. Now working on Session 2019-08-31 17:51:27 +08:00
Him188moe
4b889141cc Enhanced ConfigSection 2019-08-28 22:18:22 +08:00
liujiahua123123
114e652810 Merge remote-tracking branch 'origin/master' 2019-08-28 21:43:47 +08:00
liujiahua123123
2c17c9f3a8 merge 2019-08-28 11:04:31 +08:00
Him188moe
913ecd60de Merge remote-tracking branch 'origin/master' 2019-08-26 18:45:30 +08:00
Him188moe
1a1dbdabe1 update 2019-08-26 18:44:58 +08:00
liujiahua123123
8cf4f4dbed merge 2019-08-26 14:23:45 +08:00
liujiahua123123
8b5479f544 Merge branch 'master' of https://github.com/mamoe/mirai 2019-08-23 11:25:38 +08:00
Him188moe
31bb236e21 update 2019-08-22 00:55:15 +08:00
Him188moe
de239cffb3 update 2019-08-22 00:46:53 +08:00
Him188moe
30e0d76c82 update 2019-08-22 00:22:15 +08:00
Him188moe
aed1854388 update 2019-08-22 00:05:57 +08:00
Him188moe
61138e8cee update 2019-08-21 23:03:00 +08:00
Him188moe
b2f11120b5 update 2019-08-21 22:08:18 +08:00
Him188moe
d3ba95c5b0 update 2019-08-21 21:32:02 +08:00
Him188moe
335e371b15 update 2019-08-21 21:28:38 +08:00
Him188moe
cd5da2ddc7 update 2019-08-21 21:25:27 +08:00
liujiahua123123
4a7b706f23 udp 2019-08-21 19:53:20 +08:00
liujiahua123123
d02704bebb SynchronizedLinkedListMap 2019-08-21 19:51:57 +08:00
liujiahua123123
c8cb01d46f SynchronizedLinkedListMap 2019-08-21 12:59:30 +08:00
liujiahua123123
155d883b58 SynchronizedLinkedListMap 2019-08-21 12:50:17 +08:00
liujiahua123123
5fd84411e5 YAML supported 2019-08-21 12:41:31 +08:00
liujiahua123123
23663e5823 YAML supported 2019-08-21 11:48:37 +08:00
liujiahua123123
d27f6b8574 YAML supported 2019-08-21 11:19:04 +08:00
liujiahua123123
e7c49eb471 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
 2019-08-21 11:09:37 +08:00
liujiahua123123
640f1c8a60 YAML supported 2019-08-21 11:08:33 +08:00
Him188moe
9be18408f8 update 2019-08-21 00:48:44 +08:00
Him188moe
e1f706f76d update 2019-08-20 22:49:35 +08:00
Him188moe
8c2511c876 Merge remote-tracking branch 'origin/master' 2019-08-20 18:56:34 +08:00
Him188moe
1e127732c2 update 2019-08-20 18:56:15 +08:00
liujiahua123123
83de4b4c53 YAML supported 2019-08-20 18:25:57 +08:00
liujiahua123123
a23c2e0d6c change "config" to "setting" 2019-08-20 17:02:10 +08:00
Him188moe
b3a227e51d update 2019-08-19 02:31:37 +08:00
Him188moe
75352667ee update 2019-08-19 02:18:39 +08:00
Him188moe
e530720f72 update 2019-08-19 02:02:27 +08:00
Him188moe
239b9c5ba3 update 2019-08-19 01:20:19 +08:00
Him188moe
fa80ddf843 update 2019-08-18 22:05:17 +08:00
Him188moe
d0dc547641 update 2019-08-18 22:04:34 +08:00
Him188moe
71750d43a4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseResendPacket.kt
 2019-08-18 22:04:02 +08:00
Him188moe
6e5ce3a84c update 2019-08-18 22:03:20 +08:00
liujiahua123123
01ef09a561 ServerLoginResponseResendPacket 2019-08-18 21:59:11 +08:00
Him188moe
0b76137936 update 2019-08-18 21:37:50 +08:00
Him188moe
a2e5379db5 update 2019-08-18 21:36:31 +08:00
Him188moe
1ae263a1ab Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseVerificationCodePacket.kt
 2019-08-18 21:29:05 +08:00
liujiahua123123
1f4a9932a3 Server Login Response Success Packet done 2019-08-18 21:27:15 +08:00
Him188moe
e1c8a6a073 update 2019-08-18 21:27:13 +08:00
liujiahua123123
f81f0343e9 Server Login Response Success Packet done 2019-08-18 20:34:26 +08:00