Merge branch 'dev' into master

# Conflicts: # bin/version # scripts/menu.sh
2024-01-16 18:36:30 +08:00
parent 7759b0ed9a 3ab931d946
commit 2090ead938
22 changed files with 395 additions and 246 deletions
--- a/bin/ShellCrash.tar.gz
+++ b/bin/ShellCrash.tar.gz
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/public.tar.gz
+++ b/bin/public.tar.gz
--- a/bin/singbox/singbox-linux-amd64
+++ b/bin/singbox/singbox-linux-amd64
--- a/bin/singbox/singbox-linux-armv5
+++ b/bin/singbox/singbox-linux-armv5
--- a/bin/singbox/singbox-linux-armv7
+++ b/bin/singbox/singbox-linux-armv7
--- a/bin/singbox/singbox-linux-armv8
+++ b/bin/singbox/singbox-linux-armv8
--- a/bin/singbox/singbox-linux-mips-softfloat
+++ b/bin/singbox/singbox-linux-mips-softfloat
--- a/bin/singbox/singbox-linux-mipsle-hardfloat
+++ b/bin/singbox/singbox-linux-mipsle-hardfloat
--- a/bin/singbox/singbox-linux-mipsle-softfloat
+++ b/bin/singbox/singbox-linux-mipsle-softfloat
--- a/bin/version
+++ b/bin/version
@@ -2,5 +2,7 @@ clashnet_v=v1.7.6
 clashpre_v=2022.11.25
 clash_v=v1.7.1
 meta_v=v1.18.0
+
 singbox_v=1.7.8
 versionsh=1.8.5d
+GeoIP_v=20240113