Merge pull request #532 from andywang425/dev

7.1.7
andywang425 · Aug 7, 2024 · b697de5 · b697de5
2 parents b69c2f3 + e5a147d
commit b697de5
Show file tree

Hide file tree

Showing 67 changed files with 1,958 additions and 962 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -11,8 +11,5 @@ module.exports = {
   ],
   parserOptions: {
     ecmaVersion: 'latest'
-  },
-  env: {
-    browser: true
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,13 @@
 # Dependency directories
 node_modules
 
-# vscode directories and files
+# MacOS
+.DS_Store
+
+# Editor directories and files
 .vscode/*
 !.vscode/extensions.json
+.idea
 
 # Notes
 notes

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [7.1.7] - 2024-8-7
+
+### 新增
+
+- 点亮熄灭粉丝勋章功能（支持点赞、发送弹幕两种方式）
+- 适配最新的观看直播任务
+
+### 修复
+
+- 修复合并配置项时部分用户配置被默认配置覆盖的bug
+
 ## [7.1.6] - 2024-7-23
 
 ### 新增

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/README.md b/README.md
@@ -96,10 +96,6 @@
 
 请查看[CHANGELOG](https://github.com/andywang425/BLTH/blob/master/CHANGELOG.md)。
 
-# 贡献者公约
-
-请查看[CODE OF CONDUCT](https://github.com/andywang425/BLTH/blob/master/CODE_OF_CONDUCT.md)。
-
 # 相关推荐
 
 ## Bilibili Evolved