summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyomotoi <[email protected]>2020-08-18 00:28:14 +0800
committerKyomotoi <[email protected]>2020-08-18 00:28:14 +0800
commitfccaa44115f71d46b2ee76cde8b367c191229630 (patch)
tree6adcedde05feeccab884fb856ffacfc825c714ca
parent0bd751a03a1c38b990caee19d7cc4e28c906bcea (diff)
parenteb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7 (diff)
downloadATRI-fccaa44115f71d46b2ee76cde8b367c191229630.tar.gz
ATRI-fccaa44115f71d46b2ee76cde8b367c191229630.tar.bz2
ATRI-fccaa44115f71d46b2ee76cde8b367c191229630.zip
[Fix]
-rw-r--r--ATRI/plugins/BlackList.py2
-rw-r--r--ATRI/plugins/noobList/noobList.json6
-rw-r--r--README.md8
3 files changed, 12 insertions, 4 deletions
diff --git a/ATRI/plugins/BlackList.py b/ATRI/plugins/BlackList.py
index b23f22f..5a470ed 100644
--- a/ATRI/plugins/BlackList.py
+++ b/ATRI/plugins/BlackList.py
@@ -49,4 +49,4 @@ async def _(session: CommandSession):
end = time.perf_counter()
msg0 = f"=============\nDone time: {round(end - start, 3)}s"
msg += msg0
- await session.send(msg) \ No newline at end of file
+ await session.send(msg)
diff --git a/ATRI/plugins/noobList/noobList.json b/ATRI/plugins/noobList/noobList.json
index 6e1ba39..31edd3f 100644
--- a/ATRI/plugins/noobList/noobList.json
+++ b/ATRI/plugins/noobList/noobList.json
@@ -1 +1,5 @@
-{"123": "123"} \ No newline at end of file
+<<<<<<< HEAD
+{"123": "123"}
+=======
+{"123": "123"}
+>>>>>>> eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7
diff --git a/README.md b/README.md
index e2ebb05..19257e3 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
</div>
## アトリ
-**文档重写进行中**
+**star上100、fork上30👴在README贴女装照**
现在仍处于开放版,功能大多应该或许可能能正常使用,这个仓库先挂着
@@ -34,7 +34,7 @@
详细功能介绍请见此 >>> [传送门](https://blog.lolihub.icu/#/ATRI/user)
## 安装
-安装文档正在编写
+详细部署教程请见此 >>> [传送门](https://blog.lolihub.icu/#/ATRI/install)
## 关于开源
本项目使用 [GPLv3](https://github.com/Kyomotoi/Aya/blob/master/LICENSE) 开源协议,这意味着你可以使用本项目运行你的机器人,并向你的用户提供服务,但如果你需要对项目的源码进行修改,则必须将你修改后的版本对你的用户开源。
@@ -48,6 +48,10 @@
以及NoneBot裙友萌
+还有以下:
+ - 50861735 三杯红茶
+ - 1072324725 7r
+
## 其它
Blog: <http://blog.lolihub.icu>