Commit Graph

6 Commits

Author SHA1 Message Date
Him188
06685158a2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt
2020-01-18 21:36:04 +08:00
Him188
2f7a9cf9d4 Add build.gradle 2020-01-18 21:35:20 +08:00
jiahua.liu
5aba7196d5 plugin supporting 2020-01-18 21:31:08 +08:00
jiahua.liu
bda3e6dc0f plugin supporting 2020-01-18 21:27:26 +08:00
Him188
bbe3bf65ea Remove iml 2020-01-18 21:03:09 +08:00
jiahua.liu
d67a858548 plugin supporting 2020-01-18 17:29:46 +08:00