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

4214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188
f28df741c8 Merge remote-tracking branch 'origin/master' 2020-09-12 00:07:20 +08:00
Him188
d5820055c0 Update CHANGELOG 2020-09-12 00:07:04 +08:00
Him188
96abc36a34 1.2.3 2020-09-12 00:01:14 +08:00
Him188
568d37812b Add retry for syncing issues (#249, #482, #542, #567, #590) 2020-09-11 23:50:58 +08:00
Him188
4b25900ab8 Drop bad servers on failure, fix #589 2020-09-11 23:39:19 +08:00
Him188
c4b76db4a1 Merge branch 'master' into dev 2020-09-08 12:10:32 +08:00
Him188
0388e1756f Merge remote-tracking branch 'origin/dev' into dev 2020-09-08 12:10:07 +08:00
Him188
557c933e61 Add JvmBlockingBridge for Image.queryUrl 2020-09-08 12:09:54 +08:00
Him188
6732dad9f1
Update README.md 2020-09-05 23:55:06 +08:00
Him188
89ca75c3f1 Update README 2020-09-04 21:47:27 +08:00
Him188
33e96e2df5 Add notice 2020-09-04 21:17:08 +08:00
Him188
25632c93d3 Add notice 2020-09-04 21:15:45 +08:00
Him188
3492a3ad7e Merge remote-tracking branch 'origin/master' 2020-09-04 21:13:14 +08:00
Him188
4024d677cf Add notice 2020-09-04 21:13:00 +08:00
Him188
dd051eb710
Merge pull request #505 from shenshaoming/master 
change the way of device lock verify
 2020-09-01 20:13:35 +08:00
Him188
89974923f8
Merge pull request #561 from sandtechnology/Fix#550 
Fix #550: NoSuchElementException when concatenating an EmptyMessageChain with another
 2020-09-01 20:09:28 +08:00
sandtechnology
208ecfc1b2 Fix #550 2020-09-01 12:41:11 +08:00
Him188
9e4deb1b6e Update GitHub uploader 2020-08-27 22:18:35 +08:00
Karlatemp
bf4e205b1b
更新文档上传方式 (#535) 
* Update DOKKA Upload

* GH Token -> Deploy Key

* Change upload path

* Change DOC Target to project-mirai/mirai-doc
 2020-08-24 20:03:59 +08:00
Him188
5a959619c7 Update README 2020-08-24 16:54:39 +08:00
Him188
bd4dcec68e Fix copyright 2020-08-23 19:57:09 +08:00
yyuueexxiinngg
f577a5fd99
Make BotJoinGroupEvent.Active and .Invite inherit BotJoinGroupEvent (#532) 2020-08-23 16:38:17 +08:00
Him188
713308331d Merge branch 'dev' 2020-08-22 14:05:15 +08:00
Him188
eb8f6c8829 Merge branch 'master' into dev 2020-08-22 14:03:11 +08:00
Him188
919c83a4c0 1.2.2 2020-08-22 14:02:39 +08:00
Him188
f107048944 Update CONTRIBUTING.md 2020-08-22 13:06:01 +08:00
Him188
45cde508a9 Merge remote-tracking branch 'origin/dev' into dev 2020-08-22 12:57:09 +08:00
Him188
44d90c703f Exclude kotlinx-coroutines-core and kotlin-stdlib from dependencies to avoid clashes (fix #523) 2020-08-22 12:56:41 +08:00
Karlatemp
e7a1ee20e5
Semantic (#526) 2020-08-22 12:15:35 +08:00
Him188
3e4de4fa74 Merge remote-tracking branch 'origin/dev' into dev 2020-08-22 01:32:19 +08:00
Him188
146768ea10 Fix exception message in PermissionDeniedException 2020-08-22 01:30:38 +08:00
Him188
e56e4ec1db Fix LockFreeLinkedList.isEmpty, also fixes ContactList.isEmpty 2020-08-22 01:28:55 +08:00
mzdluo123
8e3fb15556
Fix receiving messages repeatedly 2020-08-21 17:57:34 +08:00
HelloWorld
d387a2d65c
Update README.md 2020-08-21 15:22:12 +08:00
HelloWorld
9bc8266dfe
Update README.md 2020-08-21 09:53:10 +08:00
PeratX
adf0299c5d Original AGPLv3 2020-08-20 23:50:56 +08:00
NaturalHG
f6f472cea7
add sound clear 2020-08-20 22:06:04 +08:00
HelloWorld
72cccc74a0
Merge pull request #516 from purofle/dev 
修改CHANGELOG.md
 2020-08-20 13:04:18 +08:00
purofle
26b5f3de08
修改CHANGELOG.md 
把arm改成amr
 2020-08-20 12:42:32 +08:00
Him188
7d4df0f952 Merge branch 'dev' 2020-08-19 20:45:11 +08:00
Him188
3ed163fb17 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	CHANGELOG.md
 2020-08-19 20:44:20 +08:00
Him188
5c6aeb8262 1.2.1 2020-08-19 20:43:43 +08:00
Him188
0dd4974250 Add blocking bridge for group.uploadVoice, close #512 2020-08-19 20:42:40 +08:00
Him188
088c2712d3 Merge branch 'dev' 2020-08-19 20:38:31 +08:00
Him188
121b51982c 1.2.1 2020-08-19 20:36:57 +08:00
Him188
9bf6a59d9b Fix #511: group.uploadImage causes compiler error in Java 2020-08-19 20:36:31 +08:00
Him188
90f6d14819 Fix publishing 2020-08-19 12:21:01 +08:00
Him188
1b67a9fcd8 Merge branch 'dev' 2020-08-19 10:44:41 +08:00
ryoii
5edcf410b6 [Fix conflict] ReNamed pb struct 2020-08-19 10:22:53 +08:00
Him188
31f688cdca Merge remote-tracking branch 'origin/dev' into dev 2020-08-19 10:22:23 +08:00