From e1886d94982747c3e8c555adeb9bd20e55cfc258 Mon Sep 17 00:00:00 2001
From: dongchengjie <37543964+dongchengjie@users.noreply.github.com>
Date: Wed, 21 Aug 2024 08:53:28 +0800
Subject: [PATCH] release: v1.18.7

---
 CHANGELOG.md                    |  5 +++++
 package-lock.json               |  4 ++--
 package.json                    |  2 +-
 src/modules/config/general.json | 10 +++++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0147df..978b6fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 ### Changes
 
 - 调整: `tun` 配置项 `route-exclude-address` 描述
+- 调整: 支持部分 `chacha8` 加密方法
+- 新增: 全局配置新增 `external-doh-server`，支持配置提供本地DOH服务
+- 新增: 规则集新增 `mrs` 格式
+- 新增: 全局配置新增 `keep-alive-idle` 和 `disable-keep-alive` 保持连接相关配置
+- 移除: 不再支持 `ebpf` 配置
 
 ### Bugs Fixes
 
diff --git a/package-lock.json b/package-lock.json
index a9da393..080ed3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meta-json-schema",
-  "version": "1.18.6-alpha",
+  "version": "1.18.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meta-json-schema",
-      "version": "1.18.6-alpha",
+      "version": "1.18.7",
       "license": "MIT",
       "devDependencies": {
         "json-schema-artifact": "^1.1.1"
diff --git a/package.json b/package.json
index 6b842be..9b34dfa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meta-json-schema",
-  "version": "1.18.6-alpha",
+  "version": "1.18.7",
   "description": "JSON Schema for Clash Meta",
   "keywords": [
     "clash",
diff --git a/src/modules/config/general.json b/src/modules/config/general.json
index e93c94e..1666ab8 100644
--- a/src/modules/config/general.json
+++ b/src/modules/config/general.json
@@ -135,14 +135,14 @@
         "keep-alive-idle": {
           "type": "integer",
           "title": "保持活跃空闲时间（单位:s）",
-          "description": "连接空闲后多久发送keep-alive包",
-          "markdownDescription": "连接空闲后多久发送keep-alive包"
+          "description": "连接空闲后多久发送探测包",
+          "markdownDescription": "连接空闲后多久发送探测包"
         },
         "keep-alive-interval": {
           "type": "integer",
-          "title": "保持活跃间隔时间（单位:s）",
-          "description": "发送keep-alive包的时间间隔",
-          "markdownDescription": "发送keep-alive包的时间间隔"
+          "title": "保持活跃探测间隔时间（单位:s）",
+          "description": "发送探测包的时间间隔",
+          "markdownDescription": "发送探测包的时间间隔"
         },
         "disable-keep-alive": {
           "type": "boolean",