Merge branch 'master' into dev

# Conflicts:
#	ShellCrash.tar.gz
#	bin/version
#	scripts/menus/2_settings.sh
#	scripts/starts/singbox_modify.sh
#	version

scripts/menus/2_settings.sh

@@ -11,7 +11,10 @@ settings() {
     while true; do
         # 获取设置默认显示
         [ -z "$skip_cert" ] && skip_cert=ON
-        [ -z "$sniffer" ] && sniffer=OFF
+        [ -z "$sniffer" ] && {
+            sniffer=OFF
+            echo "$crashcore" | grep -q 'singbox' && sniffer=ON
+        }
         [ -z "$dns_mod" ] && dns_mod='redir_host'
 
         line_break

scripts/menus/bot_tg.sh

@@ -2,6 +2,7 @@
 
 [ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd)
 . "$CRASHDIR"/libs/web_json.sh
+. "$CRASHDIR"/libs/set_config.sh
 . "$CRASHDIR"/libs/web_get_lite.sh
 . "$CRASHDIR"/menus/running_status.sh
 . "$CRASHDIR"/configs/gateway.cfg
@@ -308,6 +309,9 @@ polling(){
 		/crash)
 			send_menu
 		;;
+		/"$my_alias")
+			send_menu
+		;;
 		/help)
 			send_help
 		;;

scripts/menus/fw_filter.sh

@@ -432,7 +432,7 @@ fw_filter_lan() {
 
         comp_box "\033[30;47m请在此添加或移除设备\033[0m" \
             "" \
-            "当前过滤方式为：\033[33m$fw_filter_lan_type模式\033[0m" \
+            "当前过滤方式为：\033[33m$macfilter_type模式\033[0m" \
             "仅列表内设备流量\033[36m$fw_filter_lan_scrip经过\033[0m内核"
         if [ -n "$(cat "$CRASHDIR"/configs/mac)" ]; then
             content_line "当前已过滤设备为："
@@ -465,7 +465,7 @@ fw_filter_lan() {
         1)
             macfilter_type=$fw_filter_lan_over
             if setconfig macfilter_type $macfilter_type; then
-                msg_alert "\033[32m已切换为$fw_filter_lan_type模式！\033[0m"
+                msg_alert "\033[32m已切换为$macfilter_type模式！\033[0m"
             else
                 msg_alert "\033[31m$COMMON_FAILED\033[0m"
             fi