github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-08 09:10:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,462 Commits 68 Branches 330 Tags 107 MiB
de4bbafbd4
Commit Graph

2194 Commits

Author SHA1 Message Date
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
Him188moe
5a8899bdde update 2019-08-17 18:11:03 +08:00
Him188moe
87e5f0dfcd update 2019-08-17 17:49:45 +08:00
Him188moe
233ed7da38 update 2019-08-17 16:44:05 +08:00
Him188moe
7ecfee0a66 Merge remote-tracking branch 'origin/master' 2019-08-17 16:04:54 +08:00
Him188moe
cb56add828 update 2019-08-17 16:04:19 +08:00
liujiahua123123
8df21a7497 GC 2019-08-17 16:01:53 +08:00
liujiahua123123
87fe5206e9 GC 2019-08-17 15:58:40 +08:00
liujiahua123123
1ce386e80d Merge remote-tracking branch 'origin/master' 2019-08-17 15:54:48 +08:00
liujiahua123123
69b97a3b24 thread safe event system 2019-08-17 15:53:38 +08:00
Him188moe
45416ee4ae Merge remote-tracking branch 'origin/master' 2019-08-17 15:44:37 +08:00
Him188moe
88d2fa0449 update 2019-08-17 15:43:42 +08:00
Him188moe
2ff1e9bf9e Rename .java to .kt 2019-08-17 15:43:37 +08:00
liujiahua123123
5a7570001e deprecated onEvent 2019-08-17 15:41:34 +08:00
liujiahua123123
32e9c9c81a logger fixed 2019-08-17 15:06:27 +08:00
liujiahua123123
0fc7b8cf83 logger fixed 2019-08-17 15:05:56 +08:00
Him188moe
f5cee3b267 update 2019-08-17 14:50:38 +08:00
Him188moe
c7584c2d68 Merge remote-tracking branch 'origin/master' 2019-08-17 14:39:34 +08:00
Him188moe
52857fad71 update 2019-08-17 14:39:00 +08:00
liujiahua123123
e30c8ea3c4 UDP client 2019-08-17 14:30:58 +08:00
Him188moe
bbc1f717a6 update 2019-08-16 00:30:38 +08:00
Him188moe
14ffda6ae2 update 2019-08-16 00:23:58 +08:00
Him188moe
20a322a0a0 update 2019-08-16 00:16:40 +08:00
Him188moe
c110c2331a update 2019-08-16 00:15:41 +08:00
Him188moe
97b90b08c8 update 2019-08-16 00:04:39 +08:00
Him188moe
6673bada67 Rename .java to .kt 2019-08-16 00:04:31 +08:00
Him188moe
4ce8fe60a1 update 2019-08-15 22:04:21 +08:00
liujiahua123123
fa4adfd596 UDP client 2019-08-11 23:31:37 +08:00
liujiahua123123
48db4a92b7 network 2019-08-11 23:02:55 +08:00
liujiahua123123
5c3cce7e08 network 2019-08-11 23:02:31 +08:00
liujiahua123123
e342261ea1 MN 2019-08-11 22:30:44 +08:00
liujiahua123123
24ef0c1d93 Config 2019-08-11 21:38:03 +08:00
liujiahua123123
7c1cba29a0 fix event 2019-08-11 18:08:55 +08:00
liujiahua123123
88ffeb5a3b fix event 2019-08-10 12:01:52 +08:00
liujiahua123123
35f3d0ca70 fix event 2019-08-09 14:41:50 +08:00
liujiahua123123
6eaa004bee rename 2019-08-09 14:18:40 +08:00
liujiahua123123
e85014e7a6 Merge remote-tracking branch 'origin/master' 2019-08-09 14:13:50 +08:00
liujiahua123123
eeed28598e task 2019-08-09 14:13:35 +08:00
Him188moe
43595db045 update 2019-08-09 00:19:12 +08:00
Him188moe
9e21ebcb6f Merge remote-tracking branch 'origin/master' 2019-08-09 00:07:03 +08:00
Him188moe
8c294cb9eb update 2019-08-09 00:06:41 +08:00
liujiahua123123
9e3d1209cf task 2019-08-09 00:05:18 +08:00
liujiahua123123
9a877b2b11 Server 2019-08-08 23:39:23 +08:00
liujiahua123123
f6c489f929 Server 2019-08-08 23:35:59 +08:00
liujiahua123123
bd7e08b483 Event Hook 2019-08-08 23:25:05 +08:00
liujiahua123123
6e8d5ae9fd event hook 2019-08-08 23:16:45 +08:00
liujiahua123123
73cbb5b2d1 Server 2019-08-08 23:10:02 +08:00
liujiahua123123
dbd94bfdff Merge remote-tracking branch 'origin/master' 2019-08-08 23:03:28 +08:00
liujiahua123123
317ac754ce Server 2019-08-08 23:03:10 +08:00
Him188moe
a907267965 Merge remote-tracking branch 'origin/master' 2019-08-08 22:53:46 +08:00
Him188moe
dbfe12dddf update 2019-08-08 22:53:17 +08:00
liujiahua123123
78826c5648 event manager 2019-08-08 22:50:22 +08:00
liujiahua123123
0e032cf9b7 Merge remote-tracking branch 'origin/master' 2019-08-08 22:47:38 +08:00
liujiahua123123
9335caba2d event manager 2019-08-08 22:46:57 +08:00
Him188moe
825965e35e Merge remote-tracking branch 'origin/master' 2019-08-08 22:22:21 +08:00
Him188moe
a25b6428a8 update project structure 2019-08-08 22:21:53 +08:00
liujiahua123123
2eccc978f0 Merge remote-tracking branch 'origin/master' 2019-08-08 22:12:18 +08:00
liujiahua123123
eae076a677 events 2019-08-08 22:12:02 +08:00
Him188moe
bcd789ef9a update project structure 2019-08-08 21:52:09 +08:00
Him188moe
2f2b175153 update project structure 2019-08-08 21:42:58 +08:00
liujiahua123123
7e2cde8c79 base 2019-08-08 21:19:09 +08:00
Him188moe
f71ae87f09 Merge remote-tracking branch 'origin/master' 2019-08-08 21:16:47 +08:00
liujiahua123123
c17e95300a base 2019-08-08 21:16:28 +08:00
Him188moe
a2fae796fa update project structure 2019-08-08 21:16:26 +08:00
liujiahua123123
ce220da11c base 2019-08-08 17:33:06 +08:00
liujiahua123123
7bde0cb668 base 2019-08-08 13:01:32 +08:00
liujiahua123123
29f8f556d0 structure 2019-08-08 13:00:15 +08:00
Him188moe
2d1270f4a1 update project structure 2019-08-07 18:33:25 +08:00
Him188moe
3e3bd1a60e update project structure 2019-08-07 18:26:11 +08:00