v1.1.5-test

~新手引导流程中新增自动设置加密DNS功能（当检测到本地证书时自动配置） ~优化了合并自定义配置文件的流程，现在会在生成的规则中添加注释 ~同步最新1.4.2版本官方核心及高级版核心 ~同步最新Dashboard面板及数据库文件 ~修复部分描述错误
2021-03-13 18:06:38 +08:00
parent 0b6e84d767
commit 2328ed9616
24 changed files with 16 additions and 7 deletions
--- a/bin/Country.mmdb
+++ b/bin/Country.mmdb
--- a/bin/clash/clash-linux-386
+++ b/bin/clash/clash-linux-386
--- a/bin/clash/clash-linux-amd64
+++ b/bin/clash/clash-linux-amd64
--- a/bin/clash/clash-linux-armv5
+++ b/bin/clash/clash-linux-armv5
--- a/bin/clash/clash-linux-armv7
+++ b/bin/clash/clash-linux-armv7
--- a/bin/clash/clash-linux-armv8
+++ b/bin/clash/clash-linux-armv8
--- a/bin/clash/clash-linux-mips-softfloat
+++ b/bin/clash/clash-linux-mips-softfloat
--- a/bin/clash/clash-linux-mipsle-hardfloat
+++ b/bin/clash/clash-linux-mipsle-hardfloat
--- a/bin/clash/clash-linux-mipsle-softfloat
+++ b/bin/clash/clash-linux-mipsle-softfloat
--- a/bin/clashdb.tar.gz
+++ b/bin/clashdb.tar.gz
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/clashpre/clash-linux-386
+++ b/bin/clashpre/clash-linux-386
--- a/bin/clashpre/clash-linux-amd64
+++ b/bin/clashpre/clash-linux-amd64
--- a/bin/clashpre/clash-linux-armv5
+++ b/bin/clashpre/clash-linux-armv5
--- a/bin/clashpre/clash-linux-armv7
+++ b/bin/clashpre/clash-linux-armv7
--- a/bin/clashpre/clash-linux-armv8
+++ b/bin/clashpre/clash-linux-armv8
--- a/bin/clashpre/clash-linux-mips-softfloat
+++ b/bin/clashpre/clash-linux-mips-softfloat
--- a/bin/clashpre/clash-linux-mipsle-hardfloat
+++ b/bin/clashpre/clash-linux-mipsle-hardfloat
--- a/bin/clashpre/clash-linux-mipsle-softfloat
+++ b/bin/clashpre/clash-linux-mipsle-softfloat
--- a/bin/cn_mini.mmdb
+++ b/bin/cn_mini.mmdb
--- a/bin/version
+++ b/bin/version
@@ -1,4 +1,4 @@
-GeoIP_v=20210219
-clash_v=1.4.1
-clashpre_v=2021.02.21
-versionsh=1.1.4
+clash_v=1.4.2
+clashpre_v=2021.03.10
+GeoIP_v=20210312
+versionsh=1.1.5
--- a/bin/yacd.tar.gz
+++ b/bin/yacd.tar.gz