github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-03 05:33:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,148 Commits 68 Branches 330 Tags 107 MiB
d1d5435e99
Commit Graph

4148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karlatemp
d1d5435e99
remark 2020-10-28 12:43:28 +08:00
Karlatemp
14e3ddf8d6
Remark support 2020-10-28 12:33:17 +08:00
Karlatemp
d3f6b3ce33
Merge branch 'remark' into dev 
# Conflicts:
#	mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt
 2020-10-28 11:46:02 +08:00
AdoptOSS
bb3d039bf8
Simplify DeviceInfo (#655) 
* Simplify DeviceInfo

* Place random string helper properly

* Make DeviceInfo::random java-friendly
 2020-10-27 08:57:28 +08:00
Him188
54df8d63aa Set JVM target 1.8 2020-10-25 12:31:34 +08:00
Him188
f7c7452484 Set JVM target 1.8 2020-10-25 12:31:16 +08:00
Him188
7bf701630e Gradle 6.7 2020-10-25 12:26:53 +08:00
Karlatemp
6b7365d24c
Merge branch '1.x' into dev 
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
 2020-10-04 10:13:37 +08:00
Karlatemp
e6c90f0edf
1.3.2 2020-10-04 10:04:01 +08:00
Karlatemp
26fdf6b22d
Merge remote-tracking branch 'origin/dev' into 1.x 
# Conflicts:
#	build.gradle.kts
#	mirai-core-api/src/commonMain/kotlin/event/events/bot.kt
#	mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
 2020-10-03 22:15:52 +08:00
Karlatemp
c1f609d0de
Nugde stability update 2020-10-03 22:12:49 +08:00
Karlatemp
16623aec65
Remove md5 2020-10-03 21:27:18 +08:00
Karlatemp
19254df0e1
Fix packet processing order 2020-10-03 21:10:03 +08:00
Him188
0477ed94e8 Fix tests 2020-10-03 13:47:36 +08:00
Him188
0d96ea53d0 Fix build 2020-10-03 13:44:19 +08:00
Him188
80722aaea7 Pretty buildscript 2020-10-03 13:35:05 +08:00
Him188
a9d4d14576 Rearrange module structure: 
- Rename mirai-core to mirai-core-api
- Rename mirai-core-qqandroid to mirai-core
- Rename package net.mamoe.mirai.qqandroid to net.mamoe.mirai.internal
- Delete old android targets
- Configure default packages correctly
- Update licenses
 2020-10-03 12:42:13 +08:00
Him188
fb2f437a21 Merge remote-tracking branch 'origin/dev' into dev 2020-10-03 12:09:12 +08:00
Him188
32705d9920 Remove JvmBlockingBridge on Image.queryUrl 2020-10-03 12:08:57 +08:00
Karlatemp
8f7a9f21aa
Remove md5 2020-10-02 23:17:56 +08:00
Karlatemp
e643988c87
Standard Captcha update (#543) 
* Standard Captcha update

- Add icon
- Typo
- System tips

* Remove unnecessary message.

* Update WindowHelperJvm.kt
 2020-09-28 13:29:45 +08:00
sandtechnology
648777e1bd
Ignore auto reply message (#607) 
* try to fix #358 according to @Mar8s comment

* Disable mirror

* Cancel group coroutine when bot leave group and fire event separately

* Re-add 0x82 and 0x83

* Revert else logic

* Fix build

* ignore auto reply message

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-09-28 12:45:26 +08:00
Him188
b8bb129ac1
Update CONTRIBUTING.md 2020-09-23 09:49:49 +08:00
Him188
9ced99efe1 Bump BlockingBridge version 2020-09-23 09:42:07 +08:00
Him188
6cf8a58c7c Set version to 2.0-M1 2020-09-23 09:41:52 +08:00
Him188
780598d6fa Add mirai-core-all 2020-09-22 18:56:27 +08:00
Him188
72a478f712 Update buildscript, add shadow md5 2020-09-22 13:23:08 +08:00
Him188
a774b8a706 Update README 2020-09-22 08:58:32 +08:00
Him188
3f7d5bffea Update README 2020-09-22 08:44:34 +08:00
Him188
cf7aed646d Update README 2020-09-22 08:43:32 +08:00
Karlatemp
57892fc882
Update README.md 2020-09-21 23:51:28 +08:00
Karlatemp
8cfd1f8932
Update README.md 2020-09-21 23:50:41 +08:00
Karlatemp
fdb2224f64
Update README.md 2020-09-21 23:48:58 +08:00
Karlatemp
85c447695b
1.3.1 2020-09-21 23:07:52 +08:00
Karlatemp
34c325e014
Add md5 in shadow 2020-09-21 22:59:00 +08:00
Karlatemp
c9200852de
Keep old documents 2020-09-20 12:10:22 +08:00
Karlatemp
ae6d6a8f9c
Fix BotJoinGroupEvent.Retrieve.toString() (#606) 2020-09-20 01:33:34 +08:00
sandtechnology
5d5fa301cc
Add missing template id in nudge decoding (#615) 2020-09-20 01:33:05 +08:00
Karlatemp
901d60bd0e
Change doc commitor to mamoebot 2020-09-19 22:57:19 +08:00
Karlatemp
f77c089e5d
Format code; revert debugging code. 2020-09-19 21:44:03 +08:00
Karlatemp
d860d6b328
Support friend remark 2020-09-19 21:39:41 +08:00
Karlatemp
db7e196239
Fix "member -xxxxx not in group xxxxx" 2020-09-18 20:25:06 +08:00
Him188
838eeefc3b Update CHANGELOG 2020-09-16 12:39:20 +08:00
Him188
9eed2b94ae Merge branch 'dev' 2020-09-16 12:36:04 +08:00
Him188
092aecf607 1.3.0 2020-09-16 12:34:35 +08:00
Him188
1b7252e8ef Update event README 2020-09-16 12:12:22 +08:00
Him188
21d26a2760 Fix duplication filtering in OnlinePushReqPush. close #527 2020-09-16 10:49:06 +08:00
Him188
ac7dcbd070 Fix OnlinePushPbPushTransMsg, close #482 2020-09-16 10:44:44 +08:00
Him188
cf66a7c065 Filter duplicated SystemMsgNewGroup, close #449 2020-09-16 10:40:56 +08:00
Him188
a059267868 Revert "Fix potential packet missing in NewContact" 
This reverts commit 636f4cbe
 2020-09-16 10:37:39 +08:00