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 |
|
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 |
|
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 |
|