github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 10:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
265 Commits 68 Branches 330 Tags 107 MiB
2fb658be37
Commit Graph

218 Commits

Author SHA1 Message Date
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
Him188moe
699d29c663 update 2019-08-17 22:57:22 +08:00
Him188moe
21ffb8a7f0 update 2019-08-17 22:37:39 +08:00
liujiahua123123
fce4bbc86b fix 2019-08-17 22:30:02 +08:00
Him188moe
fdde4cae5a update 2019-08-17 22:14:05 +08:00
Him188moe
6d4b3253e3 Merge remote-tracking branch 'origin/master' 2019-08-17 22:09:52 +08:00
Him188moe
011417249f update 2019-08-17 22:09:26 +08:00
liujiahua123123
abe1f5ea8f 0825 done 2019-08-17 22:09:22 +08:00
Him188moe
145b856611 Merge remote-tracking branch 'origin/master' 2019-08-17 21:58:44 +08:00
Him188moe
a226dafef7 update 2019-08-17 21:58:17 +08:00
liujiahua123123
f6bab7921a Merge remote-tracking branch 'origin/master' 2019-08-17 21:58:01 +08:00
liujiahua123123
3f5fdfb3a4 ?? 2019-08-17 21:57:48 +08:00
Him188moe
7e4e94a982 update 2019-08-17 21:57:36 +08:00
liujiahua123123
6e01b4ec71 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/Client0836_622Packet.kt
 2019-08-17 21:51:19 +08:00
liujiahua123123
13b436152b ?? 2019-08-17 21:51:03 +08:00
Him188moe
a6959672d7 update 2019-08-17 21:50:07 +08:00
liujiahua123123
091037ec49 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
 2019-08-17 21:43:09 +08:00
liujiahua123123
50c0f27c1b ?? 2019-08-17 21:42:38 +08:00
Him188moe
3e451344b4 update 2019-08-17 21:42:00 +08:00
Him188moe
0b87253d72 Merge remote-tracking branch 'origin/master' 2019-08-17 20:47:47 +08:00
Him188moe
e1b2a94dd9 update 2019-08-17 20:46:27 +08:00
liujiahua123123
815d966b9a Merge remote-tracking branch 'origin/master' 2019-08-17 20:17:47 +08:00
liujiahua123123
c9992a1588 ?? 2019-08-17 20:17:33 +08:00
liujiahua123123
1ac45fa724 test 2019-08-17 20:16:04 +08:00
Him188moe
23584bb744 Merge remote-tracking branch 'origin/master' 2019-08-17 18:59:17 +08:00
Him188moe
eca1c1ae19 update 2019-08-17 18:58:50 +08:00
liujiahua123123
325110e909 Hax Comparator 2019-08-17 18:50:20 +08:00
Him188moe
2fa99f22af update 2019-08-17 18:28:09 +08:00