diff --git a/README.md b/README.md index 06c469971d..92bf84acc4 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ - - + + - - + +

diff --git a/luci-app-openclash/Makefile b/luci-app-openclash/Makefile index 565ce7736e..acf0bfab2c 100644 --- a/luci-app-openclash/Makefile +++ b/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.43.06 +PKG_VERSION:=0.43.07 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/luci-app-openclash/root/etc/init.d/openclash b/luci-app-openclash/root/etc/init.d/openclash index 82c4bb2a19..1cd3237726 100644 --- a/luci-app-openclash/root/etc/init.d/openclash +++ b/luci-app-openclash/root/etc/init.d/openclash @@ -1135,6 +1135,17 @@ do_run_file() [ ! -x "$dev_core_path" ] && chmod 4755 "$dev_core_path" 2>/dev/null #文件检查 + #fake_ip_filter + if [ "$3" = "fake-ip" ]; then + if [ ! -f "/tmp/openclash_fake_filter.list" ] || [ -n "$(grep "config servers" /etc/config/openclash 2>/dev/null)" ]; then + /usr/share/openclash/openclash_fake_filter.sh + fi + if [ -s "/tmp/openclash_servers_fake_filter.conf" ]; then + mkdir -p /tmp/dnsmasq.d + cp /tmp/openclash_servers_fake_filter.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf + fi + fi + [ -f "$geoip_path" ] && [ "$small_flash_memory" = "1" ] && { ln -s "$geoip_path" /etc/openclash/Country.mmdb 2>/dev/null } @@ -2038,7 +2049,7 @@ start() LOG_OUT "Step 2: Check The Components..." #检查文件是否存在 - do_run_file "$RAW_CONFIG_FILE" "$BACKUP_FILE" + do_run_file "$RAW_CONFIG_FILE" "$BACKUP_FILE" "$en_mode" #快速启动判断 check_run_quick diff --git a/luci-app-openclash/root/etc/openclash/Country.mmdb b/luci-app-openclash/root/etc/openclash/Country.mmdb index 88e913d092..53202204f2 100644 Binary files a/luci-app-openclash/root/etc/openclash/Country.mmdb and b/luci-app-openclash/root/etc/openclash/Country.mmdb differ diff --git a/luci-app-openclash/root/etc/openclash/china_ip6_route.ipset b/luci-app-openclash/root/etc/openclash/china_ip6_route.ipset index dd842fed57..f5ea48e7b5 100644 --- a/luci-app-openclash/root/etc/openclash/china_ip6_route.ipset +++ b/luci-app-openclash/root/etc/openclash/china_ip6_route.ipset @@ -66,7 +66,6 @@ add china_ip6_route 2001:df3:c680::/48 add china_ip6_route 2001:df3:d880::/48 add china_ip6_route 2001:df3:ed80::/48 add china_ip6_route 2001:df3:ef80::/48 -add china_ip6_route 2001:df4:80::/48 add china_ip6_route 2001:df4:880::/48 add china_ip6_route 2001:df4:d80::/48 add china_ip6_route 2001:df4:1280::/48 @@ -90,7 +89,6 @@ add china_ip6_route 2001:df5:2080::/48 add china_ip6_route 2001:df5:5f80::/48 add china_ip6_route 2001:df5:7800::/48 add china_ip6_route 2001:df6:100::/48 -add china_ip6_route 2001:df6:1c00::/48 add china_ip6_route 2001:df6:3d00::/48 add china_ip6_route 2001:df6:5d00::/48 add china_ip6_route 2001:df6:6800::/48 @@ -111,6 +109,7 @@ add china_ip6_route 2001:f88::/32 add china_ip6_route 2001:4438::/32 add china_ip6_route 2001:4510::/29 add china_ip6_route 2400:1040::/32 +add china_ip6_route 2400:1160::/32 add china_ip6_route 2400:12c0::/32 add china_ip6_route 2400:1340::/32 add china_ip6_route 2400:1380::/32 @@ -534,7 +533,6 @@ add china_ip6_route 2401:ec40::/32 add china_ip6_route 2401:f300::/32 add china_ip6_route 2401:f7c0::/32 add china_ip6_route 2401:fa80::/32 -add china_ip6_route 2401:fac0::/32 add china_ip6_route 2401:fb80::/32 add china_ip6_route 2401:fc80::/32 add china_ip6_route 2401:fe80::/32 @@ -1176,7 +1174,6 @@ add china_ip6_route 2404:8a80::/32 add china_ip6_route 2404:8b00::/32 add china_ip6_route 2404:8dc0::/32 add china_ip6_route 2404:9340::/32 -add china_ip6_route 2404:9880::/32 add china_ip6_route 2404:9b80::/32 add china_ip6_route 2404:9c80::/32 add china_ip6_route 2404:a000::/32 @@ -1733,7 +1730,6 @@ add china_ip6_route 2406:de80::/32 add china_ip6_route 2406:df80::/32 add china_ip6_route 2406:e080::/32 add china_ip6_route 2406:e180::/32 -add china_ip6_route 2406:e280::/32 add china_ip6_route 2406:e2c0::/32 add china_ip6_route 2406:e380::/32 add china_ip6_route 2406:e3c0::/32 @@ -1863,14 +1859,18 @@ add china_ip6_route 2407:d480::/32 add china_ip6_route 2407:d580::/32 add china_ip6_route 2407:d680::/32 add china_ip6_route 2407:d780::/32 +add china_ip6_route 2407:d7c0::/32 add china_ip6_route 2407:d880::/32 +add china_ip6_route 2407:d8c0::/32 add china_ip6_route 2407:d980::/32 +add china_ip6_route 2407:d9c0::/32 add china_ip6_route 2407:da80::/32 add china_ip6_route 2407:db80::/32 add china_ip6_route 2407:dc80::/32 add china_ip6_route 2407:dd80::/32 add china_ip6_route 2407:de80::/32 add china_ip6_route 2407:df80::/32 +add china_ip6_route 2407:dfc0::/32 add china_ip6_route 2407:e080::/32 add china_ip6_route 2407:e180::/32 add china_ip6_route 2407:e280::/32 @@ -1882,7 +1882,9 @@ add china_ip6_route 2407:e780::/32 add china_ip6_route 2407:e800::/32 add china_ip6_route 2407:ea80::/32 add china_ip6_route 2407:eb80::/32 +add china_ip6_route 2407:ec40::/32 add china_ip6_route 2407:ec80::/32 +add china_ip6_route 2407:ecc0::/32 add china_ip6_route 2407:ed80::/32 add china_ip6_route 2407:ee80::/32 add china_ip6_route 2407:ef80::/32 diff --git a/luci-app-openclash/root/usr/share/openclash/res/openclash_version b/luci-app-openclash/root/usr/share/openclash/res/openclash_version index e920b0a686..66d23b19a8 100644 --- a/luci-app-openclash/root/usr/share/openclash/res/openclash_version +++ b/luci-app-openclash/root/usr/share/openclash/res/openclash_version @@ -1,2 +1,2 @@ -v0.43.06-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAAHzBexdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDOTRBMTk1MjJEMjExRUM4RDlBRTBCMzY4M0NFMUJFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDOTRBMTk2MjJEMjExRUM4RDlBRTBCMzY4M0NFMUJFIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OUM5NEExOTMyMkQyMTFFQzhEOUFFMEIzNjgzQ0UxQkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6OUM5NEExOTQyMkQyMTFFQzhEOUFFMEIzNjgzQ0UxQkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5O+46dAAADAFBMVEXC3u66urqCqcCxytk1dZpJns7h7/cFbakjhLwGVYJjlbFISEilpaWKiooGXpEdcqLR0dGEscw9PT2enp6CgoKStckJdbMVappFgKLv9PfR4Okwk8tUiqoGcKzR5vLe3t6izOW1tbVFkr0/Pz8bhcFubm52ttra2toIWonn5+cEU4DOzs6RkZEHVoRjnL0HZp1FRUVLS0tycnKCrsZXlbgJaqEkapJ3d3eFhYUIca2y1urB1eAkeqqcnJxiYmIEWYmixtq/v7+srKx4eHgJY5WUxuIFZZuhoaHg4OBmrdVDQ0M0faZBQUEJbaUEYJQIZJmUlJQqjMXCwsJ0sdVqampXpdLIyMjw9PfQ3+dFmsqiwNEXgL3FxcVAQEDAwMC2trbKysoXYo0FaaIGXY8gdaZlZWU6lstgYGBlqM6y0+bB2ecJWIVHirEYbZ03k8ikzuaTxOAYfbZHnMyNjY0EXI5zn7kFcrAnicEEYphDfqA2kcaSvtYFa6Zor9evr690dHSjy+KJweImb5lFiK41h7UBcrNZWVlTU1NRUVFUVFRVVVVSUlILfL0FdrcKe7wHeLlWVlYEdrYOgMAEdbYDdLQOf8ADdLUDdbUSg8MSg8QShMQThMUAcrIGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0IeboIebkJe7sJeroJers6OjqqqqrV1dXU1NSrq6upqanw9/s7OzuAgIB+fn719fWBgYHq6uqEvd2EvN3B3u7z8/P09PSFvt5MTEyGvt9/f3+DvNzB3e2Hv9+ErMJkq9PA1N/g6u/o6OiGv99Hm8yFvd4UXolGm8vg6vChv9DB3e4sj8eXl5cFdLRVos+Dr8gJeLiEtNDW1taFvd0IaJ8LdK/B2+oHbKQHdbKDu9wIV4Wjo6N1qMXC3OuDq8KRuM/B1+OixNez0OALcatEmcpHmsk5lcl0s9gFZ6Aab6CAudkCc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////9e1Y8zAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAEJpJREFUeNpi+P8FF5iNFTQyfMcJPmIHDL9//zP4DQfuq4GECERg8eLFzxcvtja1Xvzv36HFi3cvVlm8mHXxYobOzn+d/4Bo1QYg2enFvaGzM32VIpDZuYRtyZIl1euXXF7y79+SHZzb/3EuWQJEDB04wUTsgOH/V1ygFSuYAxBADEakBdVsBjJCyisEEkoiiAAT+W0HCijm9cDQMV28+CaIYAUFFjigIGADhFq1YY0hMJT2AcNpifV2YADtWAIGwBD6Bwyrf3jCCVcwkRhKrQABKBVXFgSiIApfEBQUNlwMGjeKWBSrBrFssVpV9A/4H9w23GAdNgsqaLO54AOsZoPRJohBkIOzLr7Ast8wM+ecGVW8R+YcCXUJSPcvf+h+m9pHeiH+c/Zewn9FW+8HZYS8NKSuGrqitYEDxwmzwG40UnpiFinMxBlD1CBFJwIRtRQRMiKOYuNNEVSyUO8UaG8VysGHcoURMLABUdKyw3rbsZvDdOraGM2D0GXmGHMTFh+Yl7zGisFJ7BhIyA2otgFZWZnM6hadYSQeAogBd9mBC9jMJgX8ZyA9KdmQmJa+kwxSPpIEIKnVCVti/SwCRhipNQWSCmsh1Pn559VANOv5+RAWWmKdzwAqJOwMhZBLjN+/VX//A5Kav3/HQ8sS1d8GwIIEIpmyGATUfCVA1L/di7NdQKWJi8ZiNg2+xZCiBVjE7AaXM6BiBpi+106AgH9CE5SBSf/fBHCWmDChfYL5hH+gTMCtajBhbYAP9wR1r38TJvADc0AfFyipgxjX+8D54jqIcxXM0jXrizL9d5mvz/8eSAm8IOsEFf1AoL5hA5wNrAOAXGChtkG7c1UYUGANSPztkiUyp5dYg8u3HTtA1QKwsFMCUv+WXF3CybcdyJLh5Ny+JJqTE6QEnOM0/+1s/3cMksmcwTkPmL2AhE46iLsJnO3W/QTnPaDwW1CumisLylRA1l1g1koC57O5p/6dBQn8k5zL/E/yzT/2f9VzQTmug2SQO5EkQEae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 \ No newline at end of file +v0.43.07-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAAHzBexdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVERjNBMjc2MzAzRjExRUM4MDI4OUIwMUIwN0QwRjM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVERjNBMjc3MzAzRjExRUM4MDI4OUIwMUIwN0QwRjM4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RURGM0EyNzQzMDNGMTFFQzgwMjg5QjAxQjA3RDBGMzgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RURGM0EyNzUzMDNGMTFFQzgwMjg5QjAxQjA3RDBGMzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7xCxBLAAADAFBMVEUEXI6hoaG6urqxytk1dZrh7/cjhLwJca2Gvt9jlbBISEilpaWKiooFbakGXpB1tdkdcqLR0dEKYZM9PT0KdbKenp6CgoIHVoQVaprv9Pcwk8tUiqpFgKLe3t4GVYK1tbXR5vMGcKw/Pz/R4elubm4XgL1Fkb3a2trn5+fOzs4HZp2RkZFjnL1FRUVLS0tycnKCrsZXlbgkapIEU4B3d3eFhYUEWYmizOQleaoJZJgbhcGcnJxiYmLB1OCixtpmrdW/v7+srKx4eHiUxuLg4OAIWokJaqFDQ0Pw9PcXYo1BQUGy1uqUlJQqjMXCwsJ0sdVqamo0fabIyMgJbaVFmspXpdKStcnFxcVAQEDAwMAFaaKiwNEFZZtKn8+2trbQ3+cEYJTKyso7l8uTvteEtNAgdaZlZWWTxOBgYGBlqM6y0+bB2edHirEYbZ0JWIWDqsE3k8gYfbaDscuNjY0Fa6WkzuZzn7lGh6xHnMwIaJ4FcrAHdbI2kcYnicEEYpivr690dHSJweJDfqAmbpg1h7UKebkBcrNZWVlTU1NRUVFUVFRVVVUFdrcLfL1SUlIKe7wHeLkGd7hWVlYDdLUEdrYOgMADdbUEdbYDdLQOf8ASg8MSg8QShMQThMUAcrJXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIeboIebkJero6OjqqqqrV1dXU1NSrq6upqanw9/s7OzuAgIB+fn7C3u719fWBgYGEvd3q6uqEvN3z8/P09PTB3u6Fvt5MTEyDvNx/f3/B1eCCqcDB3e3g6u/A1N/o6Ohkq9NJns5Gm8uFvd7g6vDB3e5Hm8yXl5cJeLfW1taDr8iDq8KFvd0sj8cFdLRVos8UXonC3u8HbKRor9fD3+/B2+qErMKCutt1qMUIV4bC3OuEq8LB1+OixNdInc05lcmz0OBEmcpHmskFZ6DB1+TQ5PAmcZwab6ACc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7////////sRlzzAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAEGFJREFUeNpi+P8FF5iLFTQyfMcJPmIHDL9//9P9DQeMa4CEGERgyZIl7EuWHHQ7uOTfP6G3S/YusVqy5MSSJQxdXf+6/gHR6o1Assuda2NXV8ZqeSCzaznr8uXLkzcsv7j837/ly+V2/pMDksuXM3TiBFOwA4b/X3GBNqxgHkAAMeiTFlRzGcgIKfcASCiJIQJM7LcNKKCYNwBDx23JEpElQuBA2rsEHFAQsBFCrd64Vg8YSgeA4bT84M5/y/fsWQ4CD4Ah9A8YVv/whBOuYCIxlNoAAlAitioIREEUvmBRw5YLLoJg1aRJEEwKLr6CIILBF/Ah3DbMTUbzgi6oyWLwp5vMRpsgBkEOznVxNVj2G2bmfEdVnom5JkLdLLnR7Q/DX2l+4zQi/b6DT5Db6w3iPkYZoSwLmbuGbmht4MHzos7qQSOr52adxULMGKI6rehCIKLOiggFCWertqGqg5bj0tFx29aVLwTAuAhIkpUfTawzv4Qw9IsIlrb0mTnF3IfDG+Yt77BncAYnuRag1gXk5WEL9UjOJBEvATgre5eGoSiKB5ws2EoL2lIJKNFWpA4i0kAXBRXFSTelLhJw0T9DSpeSh6vQIZBBrASnSktxERylmZycHQoiIvLg1nvvkyLUCM9DePcj6/mda0RnR5SKFzrqG/pWKmp66UNbzquWlFtXfzPr2wR/Q251lAufVAnrYYJqOUSzlofNWjcoJEqLqZ+JIaUlAd+8lIffWWLJAgaJ+ul4pMTeFBVoe6c2pYm97iWT4KlowYhpc85QzKC/G0IJUmIGrQ+CkRCiIpYFEAQxqyAaO9sxkdsEIcbJ96NsfWy6ioIuj1vUTS7VDjbgMV6zn2k3CLIqRT8qFwSDHm8AjhhqwXz1chcXV7Tv+X72wb/jgGu16Cxg2M3RRIch3sQma5pNf9Y0acnE5eG2AvcKsjUmD/HCZ+GYxhvG7vqT2cN1j6hypwkq7DqI1j5z5rorBFwHMu4IZF5gDI5o/uMGRenkXEv/YDqt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 \ No newline at end of file diff --git a/luci-app-openclash/root/usr/share/openclash/yml_change.sh b/luci-app-openclash/root/usr/share/openclash/yml_change.sh index 95d9e5869b..0371001a95 100644 --- a/luci-app-openclash/root/usr/share/openclash/yml_change.sh +++ b/luci-app-openclash/root/usr/share/openclash/yml_change.sh @@ -48,16 +48,6 @@ if [ "$(ruby_read "$7" "['secret']")" != "$4" ]; then fi uci commit openclash -if [ "$2" = "fake-ip" ]; then - if [ ! -f "/tmp/openclash_fake_filter.list" ] || [ ! -z "$(grep "config servers" /etc/config/openclash 2>/dev/null)" ]; then - /usr/share/openclash/openclash_fake_filter.sh - fi - if [ -s "/tmp/openclash_servers_fake_filter.conf" ]; then - mkdir -p /tmp/dnsmasq.d - cp /tmp/openclash_servers_fake_filter.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf - fi -fi - ruby -ryaml -E UTF-8 -e " begin Value = YAML.load_file('$7'); diff --git a/luci-app-openclash_0.43.06-beta_all.ipk b/luci-app-openclash_0.43.06-beta_all.ipk deleted file mode 100644 index 0a51b3e148..0000000000 Binary files a/luci-app-openclash_0.43.06-beta_all.ipk and /dev/null differ diff --git a/luci-app-openclash_0.43.07-beta_all.ipk b/luci-app-openclash_0.43.07-beta_all.ipk new file mode 100644 index 0000000000..4f97ebed6d Binary files /dev/null and b/luci-app-openclash_0.43.07-beta_all.ipk differ diff --git a/version b/version index d2e35917f7..d762bacdf5 100644 --- a/version +++ b/version @@ -1,2 +1,2 @@ -v0.43.06-beta -https://img.shields.io/badge/New Release-v0.43.06--beta-orange.svg \ No newline at end of file +v0.43.07-beta +https://img.shields.io/badge/New Release-v0.43.07--beta-orange.svg \ No newline at end of file