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
823 Commits 68 Branches 330 Tags 107 MiB
5b4c631b16
Commit Graph

645 Commits

Author SHA1 Message Date
Him188
6c6f0a48c7 update docs 2019-10-24 22:25:12 +08:00
Him188
550b4e86de inline MessageChain 2019-10-24 22:22:57 +08:00
Him188
7892333c27 Cleanup 2019-10-24 20:51:37 +08:00
Him188
3ab540d5f2 Rename BufferedImage as ExternalImage 2019-10-24 15:03:42 +08:00
Him188
0334d33d7e Extensions of subscribers for Bot 2019-10-24 15:02:57 +08:00
Him188
cb320dd988 Inline messages, improved contacts 2019-10-24 15:01:56 +08:00
Him188
1f9b003c55 Inlined message classes 2019-10-24 14:33:08 +08:00
Him188
eed9c8f160 Let BotNetworkHandler implements CoroutineScope 2019-10-24 10:59:13 +08:00
Him188
b7628cd3d6 Adjust package names and file names 2019-10-22 20:08:08 +08:00
Him188
3f30bb4d54 Image uploading is now available 2019-10-22 15:28:48 +08:00
Him188
cfd5b2e845 Image uploading is now available 2019-10-21 01:41:33 +08:00
Him188
d6201a14ba Image uploading is now available 2019-10-21 01:21:24 +08:00
Him188
0e5f6d4787 Remove typing events 2019-10-20 22:06:29 +08:00
Him188
0494b374ba Image sending is now available 2019-10-20 22:01:50 +08:00
Him188
bc57001e36 Image uploading 2019-10-20 21:37:34 +08:00
Him188
28b47f9603 Image uploading 2019-10-20 21:27:59 +08:00
Him188
14722eb838 Image uploading 2019-10-20 20:27:35 +08:00
Him188
d06197d346 Image uploading 2019-10-20 19:30:17 +08:00
Him188
3474c87faa Image uploading 2019-10-20 16:50:24 +08:00
Him188
fdf50e4d1d Image uploading 2019-10-19 23:19:45 +08:00
Him188
4d346a2c3d Fix SendFriendMessage due to TIM update 2019-10-19 14:21:52 +08:00
Him188
05e590c93f Convert to expression fun 2019-10-19 13:51:16 +08:00
Him188
cf052614f5 Use Klock 2019-10-19 13:41:36 +08:00
Him188
244996ac28 Fail-fast decryption and encryption 2019-10-19 13:18:57 +08:00
Him188
8353a6ae8d Improve performance 2019-10-19 11:59:08 +08:00
Him188
735b0934b6 Name and permission analyzing is now available 2019-10-18 19:33:51 +08:00
Him188
d5587bb3d8 Name and permission analyzing is now available 2019-10-18 19:32:03 +08:00
Him188
7e90737c68 Merge remote-tracking branch 'origin/master' 2019-10-18 18:43:06 +08:00
Him188
fdb3be9453 Improve performance 2019-10-18 18:42:45 +08:00
PeratX
f54db4981f core: remove PluginManager 2019-10-18 09:37:28 +08:00
Him188
24404f9af4 Rename qqNumber as account 2019-10-17 10:01:20 +08:00
Him188
09046ae686 Rewrite packets 2019-10-16 22:33:02 +08:00
Him188
61895b5c8e Update message 2019-10-16 18:31:08 +08:00
Him188
4d870b2434 Rename Image.imageId to Image.id 2019-10-16 12:59:49 +08:00
Him188
2b6a8f1da8 MessageChain is now overriding MutableList<Message> 2019-10-16 12:39:21 +08:00
Him188
ac9a445abf Update doc 2019-10-16 12:38:37 +08:00
Him188
10aa950b63 Update README 2019-10-15 21:37:16 +08:00
Him188
2f65e0f5ed Use CompletableJob instead of CompletableDeffered<Unit> 2019-10-15 19:15:54 +08:00
Him188
fb8829a035 Add lock for TemporaryPacketHandlers 2019-10-15 19:04:29 +08:00
Him188
f9daee0379 Update docs 2019-10-15 19:02:57 +08:00
Him188
fdd9db65b9 Update docs 2019-10-14 20:40:30 +08:00
Him188
93607e4999 Platform specified Contact 2019-10-14 14:19:45 +08:00
Him188
ad43a92be4 Use PacketHandler.Key 2019-10-13 22:21:26 +08:00
Him188
d89f8acc43 Multiplatform 2019-10-13 20:19:54 +08:00
Him188
c09d44f45a Fix subscribeAll 2019-10-11 18:10:54 +08:00
Him188
8e323644ab
Add top-level fun for subscribeAll 2019-10-11 07:48:30 +08:00
Him188
a9b3ecf5ea Improve getRandomByteArray 2019-10-10 12:38:02 +08:00
Him188
ff6403cd87 Merge remote-tracking branch 'origin/master' 2019-10-10 11:30:28 +08:00
Him188
5292b22461 Small updates 2019-10-10 11:30:06 +08:00
Him188
f51790e79b Add EventScope 2019-10-10 11:29:22 +08:00
Him188
4d09010cf0 Cleanup 2019-10-10 11:28:25 +08:00
Him188
00d8e26850 Add atomicFU and kotlinx.IO 2019-10-10 11:27:30 +08:00
Him188
f7cdbbde2d
Blocking pass packets to handlers 2019-10-09 23:53:42 +08:00
Him188
a64123bdbf Cleanup 2019-10-09 20:32:24 +08:00
Him188
69954add48 cleanup 2019-10-09 20:24:14 +08:00
Him188
f9f7d4a7d1 Merge remote-tracking branch 'origin/master' 2019-10-09 20:23:23 +08:00
Him188
0b667ba355 Sealed messages 2019-10-09 20:22:53 +08:00
PeratX
79e211256e ECDH: remove 2019-10-09 18:44:53 +08:00
PeratX
712d8cac8b Merge remote-tracking branch 'origin/master' 2019-10-09 18:30:37 +08:00
PeratX
4b4f43cc27 InternalEventListeners: typo 2019-10-09 18:30:12 +08:00
Him188
47e3570702 Cleanup 2019-10-09 18:12:32 +08:00
Him188
d6125cd9d4 Move logging extensions for bot to BotHelper.kt 2019-10-09 18:05:34 +08:00
Him188
7131600643 Cleanup 2019-10-09 18:04:08 +08:00
Him188
db6f74a07d Remove meaningless @Synchronized 2019-10-09 17:48:47 +08:00
Him188
4cccd854cc Remove useless files 2019-10-09 17:47:20 +08:00
Him188
b9720385f0 Fixed event listening 2019-10-09 17:40:39 +08:00
Him188
c69f2ab31e Group events into mixed files 2019-10-09 16:42:37 +08:00
Him188
d239feeda4
Update build.gradle 2019-10-09 13:00:49 +08:00
Him188
97f47b5484 Working on uploading image 2019-10-08 16:35:30 +08:00
Him188
522ac8b839 Improved message parsing 2019-10-08 16:32:52 +08:00
Him188
c6373ec727 Rename .java to .kt 2019-10-08 16:32:48 +08:00
Him188
1728e80532 Add ByteArray.decryptBy 2019-10-07 18:13:52 +08:00
Him188
5f0220b905 Rename lazyEncode to dataEncode 2019-10-07 17:49:15 +08:00
Him188
8ca3e6578d Use MessageKey instead of MessageId 2019-10-07 13:50:36 +08:00
Him188
3dfe7f6e6f Make ClientEventResponsePacket inside ServerEventPacket 2019-10-07 13:18:04 +08:00
Him188
a8039e5e1f Make addHandler suspend 2019-10-07 13:11:28 +08:00
Him188
e05ad6cf6a Add comments 2019-10-07 13:04:54 +08:00
Him188
2fca15b0c1 Add Bot.qqNumber 2019-10-07 13:04:35 +08:00
Him188
2c35f9e416 Change id type to UByte 2019-10-07 13:01:55 +08:00
Him188
2b3deb24d3 Make sendPacket not synchronized 2019-10-07 12:54:13 +08:00
Him188
05c73017ff Login timeout 2019-10-07 12:52:28 +08:00
Him188
26b3ac07c2 Unmodifiable IP list 2019-10-07 12:49:39 +08:00
Him188
6d58cb1880 Debugging updates 2019-10-07 12:44:44 +08:00
Him188
8e97b47a8c Small updates 2019-10-05 13:42:00 +08:00
Him188
2d825992bb Small updates 2019-10-05 13:40:20 +08:00
Him188
624d471432 Small updates 2019-10-03 21:12:54 +08:00
Him188
ba7e50de31 Not use random device name 2019-10-03 19:37:02 +08:00
Him188
7dc35240e0 Rename Login to LoginHandler 2019-10-03 19:36:01 +08:00
Him188
a157a106e8 Rename Login to LoginHandler 2019-10-03 19:34:49 +08:00
Him188
71a1a40957 Rename tryLogin to login 2019-10-03 19:32:58 +08:00
Him188
db77227d35 Rewrite in kotlin 2019-10-03 19:26:33 +08:00
Him188
1e3db169b0 Rename .java to .kt 2019-10-03 19:26:30 +08:00
Him188
b38c262df0 Multiplatform with gradle building 2019-10-03 19:07:03 +08:00
Him188
58c6a40795 Modifiable MiraiLogger 2019-10-03 13:57:02 +08:00
Him188
cca32a037b Shortcut for bot.login 2019-10-03 13:56:01 +08:00
Him188
333178388a Renamed captcha packet 2019-10-03 13:42:57 +08:00
Him188
41ddd4c2be Small updates 2019-10-03 12:56:08 +08:00
Him188
7c5c01bb40 Remove unnecessary let 2019-10-03 12:33:35 +08:00
Him188
7bf8d3fb19 Fixed bug 2019-10-03 12:30:44 +08:00
Him188
965958bc24 Use encryptAndWrite 2019-10-03 12:30:21 +08:00
Him188
04f8c36f13 Cleanup 2019-10-03 12:26:48 +08:00
Him188
bb1848ed0e Make not internal 2019-10-03 12:25:33 +08:00
Him188
a85d3a62a3 Use receivers 2019-10-02 21:02:51 +08:00
Him188
56f1c9a6f3 Use String.repeat instead of SB 2019-10-02 20:55:17 +08:00
Him188
034e25d7da Make PacketNameFormatter internal 2019-10-02 20:53:03 +08:00
Him188
d50c2746d6 Little updates 2019-10-02 20:51:11 +08:00
Him188
39d8406018 Moved debuggers from mirai-core to mirai-debug 2019-10-02 20:50:31 +08:00
Him188
8e33e07ceb Renamed args 2019-10-02 20:26:25 +08:00
Him188
126b221079 New event listeners 2019-10-02 19:13:09 +08:00
Him188
ffdb7c03fc Fixed inline calling 2019-09-30 03:26:56 +08:00
Him188
d1cc2710ec Improved temporary packet handlers 2019-09-30 03:24:53 +08:00
Him188
738c76752f Moved package 2019-09-30 03:08:29 +08:00
Him188
94e445a1bb Add jpcap lib 2019-09-30 00:52:55 +08:00
Him188
3119a83c09 Rewritten in kotlin 2019-09-30 00:19:01 +08:00
Him188
9e3b0661da update 2019-09-30 00:06:28 +08:00
Him188
4ca1884831 Update pom.xml 2019-09-29 23:26:19 +08:00
Him188
900040f963 Improved logger 2019-09-29 21:58:17 +08:00
Him188
7cce7c3a4a Fixed bugs 2019-09-29 21:16:26 +08:00
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
liujiahua123123
74ca633b7d Server Login Response Success Packet done 2019-08-18 20:33:05 +08:00
Him188moe
9ad7492790 update 2019-08-18 20:33:01 +08:00
liujiahua123123
dc3d8063b7 Merge remote-tracking branch 'origin/master' 2019-08-18 20:14:16 +08:00
liujiahua123123
0b6f4a271d reset 2019-08-18 20:14:00 +08:00
Him188moe
ceef31610b update 2019-08-18 18:57:45 +08:00
Him188moe
2483dcc49d update 2019-08-18 18:57:25 +08:00
Him188moe
e9b64c83f4 update 2019-08-18 18:51:11 +08:00
Him188moe
1eae0932af Merge remote-tracking branch 'origin/master' 2019-08-18 18:40:24 +08:00
Him188moe
8123ea577e update 2019-08-18 18:40:03 +08:00
liujiahua123123
a3c51a6022 Merge remote-tracking branch 'origin/master' 2019-08-18 17:33:14 +08:00
liujiahua123123
e3aabdafca decode 2019-08-18 17:32:52 +08:00
Him188moe
4cb4b3d9d4 update 2019-08-18 17:31:30 +08:00
liujiahua123123
99a0ec85c5 Merge remote-tracking branch 'origin/master' 2019-08-18 17:28:48 +08:00
liujiahua123123
d3064bc088 decode 2019-08-18 17:28:32 +08:00
Him188moe
f6c2012204 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt
 2019-08-18 17:21:21 +08:00
Him188moe
baec0a2bda update 2019-08-18 17:17:43 +08:00
liujiahua123123
a0b2516c3c half done 2019-08-18 17:14:50 +08:00
Him188moe
8937239e40 update 2019-08-18 16:49:12 +08:00
Him188moe
a8385bfe4d update 2019-08-18 16:47:06 +08:00
Him188moe
2e1b399d73 update 2019-08-18 16:42:20 +08:00
Him188moe
da0e2e829e update 2019-08-18 15:47:56 +08:00
Him188moe
00ac8cb2c6 Merge remote-tracking branch 'origin/master' 2019-08-18 15:34:31 +08:00
Him188moe
fc7e756f3f update 2019-08-18 15:34:05 +08:00
liujiahua123123
59fbbd5cd9 Merge remote-tracking branch 'origin/master' 2019-08-18 13:58:51 +08:00
liujiahua123123
5cb0ebfe47 packetID 2019-08-18 13:58:37 +08:00
Him188moe
8ccf931a4c update 2019-08-18 13:40:49 +08:00
Him188moe
c2d348d568 update 2019-08-18 02:34:35 +08:00
Him188moe
3592d2dd6d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
 2019-08-18 01:15:24 +08:00
Him188moe
3c0c8f18cf update 2019-08-18 01:14:09 +08:00
liujiahua123123
fa8df3870c remove ; -> 2019-08-17 23:02:18 +08:00
liujiahua123123
ff3bd74abf Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientPasswordSubmissionPacket.kt
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
 2019-08-17 23:00:49 +08:00
liujiahua123123
22d82db793 remove ; -> 2019-08-17 22:59:54 +08:00