github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-27 17:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,624 Commits 68 Branches 330 Tags 107 MiB
9930fc7ed1
Commit Graph

7624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Him188
f4c1b0af12
Update CONTRIBUTING.md 2021-04-01 22:55:17 +08:00
Him188
30cb70f67f Release version v2.6-M1 2021-03-30 22:14:14 +08:00
Him188
1c486854a8 Fix FileMessage.Key 2021-03-30 21:42:05 +08:00
Him188
6b251b9267 Release version v2.6-M1 2021-03-30 12:39:45 +08:00
Him188
3f807353b3 Remove UNSUPPORTED_MERGED_MESSAGE_PLAIN, fix #1119 2021-03-30 12:16:08 +08:00
Him188
cea4d23d7f Create OtherClientInfo from known information, fix #1109 2021-03-30 12:14:20 +08:00
Him188
fc70bb9ed8 Remove type definition to help compatibility with Kotlin 1.5 2021-03-29 23:59:03 +08:00
Him188
a560e93838 Add gson dependency for gradle plugin 2021-03-29 23:57:16 +08:00
Him188
41d0c16ad1
New Project Wizard (#320) 
* Add project wizard

* Add OptionsStep

* Template application fundamentals

* Extract BuildSystemType from BuildSystemStep to top-level

* Complete templates

* Fix build

* Fix build

* Support Java and Groovy, fix strings in Kotlin templates

* Add template for gradle.properties

* Disable `depends on` field

* Fix Java template

* Fix build

* Update tools/compiler-annotations/src/CheckerConstants.kt

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>

* Update tools/intellij-plugin/src/creator/steps/ValidationUtil.kt

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-03-29 18:17:50 +08:00
sandtechnology
70bbfcf786
Correct group syncing logic again, Fix #1120 (#1123) 2021-03-28 22:48:38 +08:00
Him188
de170325c9 Merge branch 'fix_1118_empty_listFiles' into dev 2021-03-28 19:32:44 +08:00
Him188
0a0caeeb3a ConfigurePluginMainServiceFix and PluginMainServiceNotConfiguredInspection: support multiline service files 2021-03-28 17:34:00 +08:00
Him188
75d9805db1 Fix BuildMiraiPluginTask 2021-03-28 12:28:52 +08:00
Him188
4efb21da05
Update CONTRIBUTING.md 2021-03-28 00:29:38 +08:00
Him188
b6417ac336 Fix doc on ConsoleInput 2021-03-27 22:40:42 +08:00
Him188
3fbbba9cfa Revert ".gitignore: Change build/ to /build/" 
This reverts commit 7ce4696d
 2021-03-27 20:23:32 +08:00
Him188
7ce4696de6 .gitignore: Change build/ to /build/ 2021-03-27 19:30:17 +08:00
Him188
30b38500c6 Merge remote-tracking branch 'console/master' 2021-03-27 19:28:12 +08:00
Him188
8b7dc78a5d Improve BuildMiraiPluginTask 2021-03-27 19:27:30 +08:00
Him188
c8e0eccf67 2.5.1-dev-1 2021-03-27 15:41:09 +08:00
Him188
174ca300d6 Fix empty listFiles for child directories, fix #1118 2021-03-27 15:39:46 +08:00
mzdluo123
512895ad9b
add MiraiForum url to greeting 2021-03-27 14:52:42 +08:00
Him188
430c2c59ad
Support UnsupportedMessage (#1112) 
* Support UnsupportedMessage

* Fix serialize

* `UnsupportedMessage.contentToString`: use `struct.contentHashCode()`

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-03-26 23:54:17 +08:00
Him188
24587503a3 Merge remote-tracking branch 'mirai/dev' into dev 2021-03-26 20:44:07 +08:00
Him188
0f41c225f9 Move SerialDescriptor.copy to mirai-core-utils 2021-03-26 20:42:51 +08:00
Him188
c47535289a
Merge pull request #1115 from mamoe/transform_special_messages 
Move Dice to MarketFace conversion from `SendMessageHandler.transformSpecialMessages`...
 2021-03-26 20:36:21 +08:00
Him188
8d25025d24 Support decode Dice sent by TIM PC clients 2021-03-26 20:34:32 +08:00
Him188
efc6eda312 Move Dice to MarketFace conversion from SendMessageHandler.transformSpecialMessages to MessageChain.toRichTextElems to enable conversions for ForwardMessage 2021-03-26 19:54:11 +08:00
Him188
4308c59da2
Use device.json by default for AutoLoginConfig (#312) 2021-03-26 19:00:42 +08:00
Karlatemp
3ae575e9eb
Ensure that the PermissionService is loaded correctly (#307) 
* Ensure that the PermissionService is loaded correctly

* Update backend/mirai-console/src/extensions/PermissionServiceProvider.kt

* Mark `@ConsoleExperimentalApi`

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-03-26 19:00:25 +08:00
Him188
0723c5c568 Release version 2.5.0 2021-03-26 11:48:20 +08:00
Him188
faebbde94c Do not publish on release created 2021-03-26 10:46:01 +08:00
Him188
5dc1c90ac4 Release version 2.5.0 2021-03-26 10:42:42 +08:00
Him188
eccb92a78d Publish on tagged v* 2021-03-26 10:40:08 +08:00
Him188
3ae44a3b8e Add docs for FileMessage 2021-03-26 10:24:50 +08:00
Him188
aa1aaf1ada Update serialization version to 1.1.0 
Fix unresolved reference on Maven sync due to kotlin-stdlib:1.4.30-370
 2021-03-26 10:19:54 +08:00
Him188
fef0b4220a Merge remote-tracking branch 'mirai/dev' into dev 2021-03-26 10:07:13 +08:00
Him188
7ed8502e68 Fix docs on IMirai.FileCacheStrategy 2021-03-26 10:06:48 +08:00
Karlatemp
a5e85f443e
Try fix forward message display (#1052) 
fix https://github.com/mamoe/mirai/issues/1052#issuecomment-805600071
 2021-03-25 00:01:04 +08:00
Him188
c071ac5773
Update docs of Nudge, clearification 2021-03-23 23:57:20 +08:00
Him188
f8da762d2f Merge remote-tracking branch 'mirai/dev' into dev 2021-03-22 12:52:39 +08:00
Him188
c006a48de5 Update docs about FileCacheStrategy, close #1046 2021-03-22 12:52:18 +08:00
Him188
bf47ab4f58
Merge pull request #1089 from mamoe/him188/forward_builder 
Make ForwardMessageBuilder easier to use for Java, close #1087
 2021-03-22 12:12:35 +08:00
Him188
ee1ea33898 Remove inappropriate use of DSL marker on ForwardMessageBuilder.add 2021-03-22 11:24:26 +08:00
Him188
0c3c85f61c Add members to make ForwardMessageBuilder easier to use from Java, close #1087 2021-03-22 11:24:26 +08:00
Him188
f42747f6ac Make buildMessageChain not @JvmSynthetic 2021-03-22 11:21:22 +08:00
Him188
daa7453d73 Add UserOrBot.nameCardOrNick 2021-03-22 11:16:34 +08:00
Him188
146433d56f Add common UserOrBot.nick 2021-03-22 11:16:34 +08:00
Him188
896b9ac56c
Merge pull request #1110 from Nambers/patch-1 
增加社区SDK?
 2021-03-22 11:13:51 +08:00
Eritque arcus
a5d920146b
增加社区SDK? 
稍后应该会增加MiraiCP的英文文档，如果可以收录的话
 2021-03-22 09:06:01 +08:00