update cl

.env

@@ -1,2 +1,2 @@
-version=1.0.7
-VERSION=1.0.7
+version=1.3.01
+VERSION=1.3.01

.github/workflows/build.yml

@@ -0,0 +1,206 @@
+name: Build Executables
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number (e.g. 1.0.9)'
+        required: true
+        default: '1.0.9-dev'
+
+permissions:
+  contents: write
+  actions: write
+  packages: write
+
+jobs:
+  create-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # 获取所有标签
+          
+      - name: Delete existing tag if exists
+        run: |
+          if git ls-remote --tags origin | grep -q "refs/tags/v${{ github.event.inputs.version }}"; then
+            git push origin --delete "v${{ github.event.inputs.version }}" || true
+            git tag -d "v${{ github.event.inputs.version }}" || true
+          fi
+          
+      - name: Create Tag
+        run: |
+          git tag "v${{ github.event.inputs.version }}"
+          git push origin "v${{ github.event.inputs.version }}"
+
+  build-windows:
+    needs: create-tag
+    runs-on: windows-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    
+    - name: Set version
+      shell: bash
+      run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller
+        pip install -r requirements.txt
+        
+    - name: Build EXE
+      run: |
+        pyinstaller build.spec
+         
+    - name: Upload Windows artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: CursorFreeVIP_${{ env.VERSION }}_windows.exe
+        path: dist/*
+
+  build-macos-arm64:
+    needs: create-tag
+    runs-on: macos-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    
+    - name: Set version
+      shell: bash
+      run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller
+        pip install -r requirements.txt
+        
+    - name: Build MacOS ARM executable
+      run: |
+        pyinstaller build.spec
+
+    - name: Upload MacOS ARM artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: CursorFreeVIP_${{ env.VERSION }}_mac_arm64
+        path: dist/*
+
+  build-linux:
+    needs: create-tag
+    runs-on: ubuntu-22.04
+    
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    
+    - name: Set version
+      shell: bash
+      run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pyinstaller
+        pip install -r requirements.txt
+        
+    - name: Build Linux executable
+      run: |
+        pyinstaller build.spec
+        
+    - name: Upload Linux artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: CursorFreeVIP_${{ env.VERSION }}_linux
+        path: dist/*
+
+
+  build-macos-intel:
+    needs: create-tag
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Set version
+      shell: bash
+      run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+
+    - name: Install dependencies
+      run: |
+        arch -x86_64 pip3 install --upgrade pip
+        arch -x86_64 pip3 install pyinstaller
+        arch -x86_64 pip3 install -r requirements.txt
+
+    - name: Build MacOS Intel executable
+      env:
+        TARGET_ARCH: 'x86_64'
+      run: |
+        arch -x86_64 python3 -m PyInstaller build.spec
+        
+    - name: Upload MacOS Intel artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: CursorFreeVIP_${{ env.VERSION }}_mac_intel
+        path: dist/*
+
+
+  create-release:
+    needs: [build-windows, build-macos-arm64, build-linux, build-macos-intel]
+    runs-on: ubuntu-22.04
+    
+    steps:
+      - name: Get version
+        shell: bash
+        run: echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+          
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Prepare release files
+        run: |
+          cd artifacts
+          # 重命名文件为最终的可执行文件名
+          mv CursorFreeVIP_${{ env.VERSION }}_windows.exe/CursorFreeVIP.exe CursorFreeVIP_${{ env.VERSION }}_windows.exe
+          mv CursorFreeVIP_${{ env.VERSION }}_mac_arm64/CursorFreeVIP CursorFreeVIP_${{ env.VERSION }}_mac_arm64
+          mv CursorFreeVIP_${{ env.VERSION }}_linux/CursorFreeVIP CursorFreeVIP_${{ env.VERSION }}_linux
+          mv CursorFreeVIP_${{ env.VERSION }}_mac_intel/CursorFreeVIP CursorFreeVIP_${{ env.VERSION }}_mac_intel
+          # 删除空目录
+          rm -rf */
+          ls -la
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ env.VERSION }}
+          files: |
+            artifacts/CursorFreeVIP_${{ env.VERSION }}_windows.exe
+            artifacts/CursorFreeVIP_${{ env.VERSION }}_mac_arm64
+            artifacts/CursorFreeVIP_${{ env.VERSION }}_linux
+            artifacts/CursorFreeVIP_${{ env.VERSION }}_mac_intel
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -0,0 +1,159 @@
+# Change Log
+
+## v1.3.01
+
+1. Add Manual Email Input | 增加手動輸入郵箱地址
+2. Add Manual Code Input | 增加手動輸入驗證碼
+3. Fix Cursor Options | 修復Cursor選項
+
+
+## v1.2.02
+
+1. Add PBlock | 增加PBlock
+2. Remove uBlock0.chromium | 移除uBlock0.chromium
+3. Optimize the logic of the script | 優化腳本邏輯
+4. Optimize Size | 優化大小
+
+
+## v1.2.01
+
+1. Fix Cursor Cloudflare Human Verification Problem | 修復Cursor Cloudflare人機驗證問題
+2. Change to automatic registration account | 全面改為自動註冊賬號
+3. Change Mail Site | 改變郵箱網站
+4. Fix Cursor Cloudflare Problem | 修復Cursor Cloudflare問題
+
+
+## v1.1.01
+
+<p align="center">
+  <img src="./images/cloudflare_2025-02-12_13-43-21.png" alt="free" width="400"/><br>
+</p>
+
+1. Hot Fix Cursor Cloudflare Problem | 修復Cursor Cloudflare問題
+2. Fix Cursor Cloudflare Human Verification Problem | 修復Cursor Cloudflare人機驗證問題
+3. Remake signup logic | 重做註冊邏輯
+
+
+## v1.0.10
+
+1. Hot Fix Mac Chrome Problem | 修復Mac Chrome問題
+2. Fix Linux Start Donet Problem | 修復Linux啟動開發者問題
+
+
+## v1.0.9
+
+<p align="center">
+  <img src="./images/cloudflare_2025-02-12_13-43-21.png" alt="free" width="400"/><br>
+</p>
+
+1. Fixed New 0.45.x Version Reset Machine | 修復新0.45版本重置機器
+2. Fix Locale Language | 修復多語言
+3. Add Support Crypto Machine Regedit | 增加支持加密機器註冊
+4. Add Remake main.js | 重做main.js
+
+
+## v1.0.8
+
+1. Fix New 0.45 Version Reset Machine | 修復新0.45版本重置機器
+2. Fix Locale Language | 修復多語言
+3. Add Support Crypto Machine Regedit | 增加支持加密機器註冊
+
+
+## v1.0.7 - HotFix
+
+1. Fix Reset Machine | 修復重置機器
+2. Fix Locale Language | 修復多語言
+
+
+## v1.0.7
+
+1. Add Locale Language Support | 增加多語言支持
+<p align="center">
+  <img src="./images/locale_2025-01-15_13-40-08.png" alt="locale" width="400"/><br>
+</p>
+
+
+## v1.0.6
+
+1. Add Quit Cursor Option | 增加退出Cursor選項
+2. Add Recaptcha Path Patch | 增加Recaptcha路徑修復
+3. Fix Admin Permission | 修復管理員權限問題
+4. Remove all need admin permission | 移除所有需要管理員權限
+
+
+## v1.0.5 - HotFix
+
+1. Fix: Mac Browser Control | 修復Mac瀏覽器控制問題
+2. Fix: Verification Code Cant Patch | 修復驗證碼無法修復問題
+3. Add Linux Support | 增加Linux支持
+<p align="center">
+  <img src="./images/fix_2025-01-14_21-30-43.png" alt="fix" width="400"/><br>
+</p>
+
+
+## v1.0.5
+
+1. Remove MachineID | 移除機器碼ID
+2. Change to automatic registration account | 全面改為自動註冊賬號
+3. Use your own exclusive new account | 使用自己獨享的新賬號
+4. Fully automatic reset machine configuration | 全面自動化重置機器配置
+<p align="center">
+  <img src="./images/pro_2025-01-14_14-40-37.png" alt="Why" width="400"/><br>
+</p>
+
+
+## v1.0.4
+
+1. Fix: Cursor's configuration | 修復Cursor的配置問題
+2. Fix Cloud Lame | 修復雲端慢速模式
+
+
+## v1.0.3
+
+1. Fix: Cursor's configuration | 修復Cursor的配置問題
+2. Add Manual Reset Machine | 增加手動重置機器
+3. Add CDN Cloud Control WatchDog | 增加CDN雲端控制WatchDog
+4. Add Mac OS Support | 增加Mac OS支持
+5. 759 ++ People use , but star only a few | 759 ++人使用，但只有幾個人點贊
+<p align="center">
+  <img src="./images/what_2025-01-13_13-32-54.png" alt="Why" width="400"/><br>
+</p>
+
+
+## v1.0.2
+  
+1. Fix: Some known issues | 修復了一些已知問題
+2. Add cloud control device code | 增加雲端控制設備碼
+3. Cloud reset device code | 雲端重置設備碼
+4. Remove official WatchDog monitoring | 移除官方WatchDog監控
+5. Remove Proxy official prompt | 移除Proxy 官方提示
+6. Fix: Too Many Computer | 修復Too Many Computer 問題
+7. Fix Billing Issue | 修復計費問題
+8. Fix: Cursor's configuration | 修復Cursor的配置問題
+9. Fix cursor-slow mode | 修復cursor-slow模式
+
+
+## v1.0.1
+
+1. Fix: Reset machine ID | 修復了重置機器ID的問題
+2. Fix: Bypass membership check | 修復了 繞過會員檢查的問題
+3. Fix: Auto upgrade to "pro" membership | 修復了 自動升級為pro會員的問題
+4. Fix: Real-time send Token request | 修復了 實時發送Token請求的問題
+5. Fix: Reset Cursor's configuration | 修復了 重置Cursor的配置的問題
+
+
+
+## v1.0
+1. Preview Image | 預覽圖<br>
+<p align="center">
+  <img src="./images/pro_2025-01-11_00-50-40.png" alt="Cursor Pro Logo" width="400"/><br>
+</p>
+<p align="center">
+  <img src="./images/pro_2025-01-11_00-51-07.png" alt="Cursor Pro Logo" width="400"/><br>
+</p>
+2. Add usage period,but can be contacted by leaving MachineID | 不得已才添加，但可以通過留下MachineID 聯繫作者
+<br>
+
+<p align="center">
+  <img src="./images/pro_2025-01-11_16-24-03.png" alt="Cursor Pro Logo" width="400"/><br>
+</p>

PBlock/background.js

@@ -0,0 +1,5 @@
+// Import the contents of your other files
+importScripts('default_filters.js', 'block.js');
+
+// Your service worker initialization code can go here
+console.log('Service worker initialized'); 

PBlock/block.js

@@ -0,0 +1,129 @@
+/**
+ * All the actual functionality of the extension; loads as part of the background page.
+ *
+ * Active ingredient is enable(), which sets up the webRequest callbacks.
+ *
+ * */
+
+let blockingEnabled = false;
+let allFilters = null;
+let webRTCPrivacy = null;
+
+function setFilters(newFilters) {
+	allFilters = newFilters;
+	chrome.storage.local.set({"filters": newFilters});
+	if (blockingEnabled) {
+		refreshFilters();
+	}
+}
+
+// Convert URL patterns to declarativeNetRequest rule format
+function createRules(filters) {
+	return filters.map((filter, index) => ({
+		id: index + 1,
+		priority: 1,
+		action: {
+			type: "block"
+		},
+		condition: {
+			urlFilter: filter.replace("*://", "*"),
+			resourceTypes: [
+				"main_frame", "sub_frame", "stylesheet", "script", "image", 
+				"font", "object", "xmlhttprequest", "ping", "media", "websocket"
+			]
+		}
+	}));
+}
+
+async function enable(icon = true) {
+	if (blockingEnabled) return;
+	
+	if (allFilters && allFilters.length > 0) {
+		const rules = createRules(allFilters);
+		await chrome.declarativeNetRequest.updateDynamicRules({
+			removeRuleIds: rules.map(rule => rule.id),
+			addRules: rules
+		});
+	}
+
+	blockingEnabled = true;
+	if (icon) {
+		chrome.action.setIcon({
+			path: {
+				"16": "enabled16.png",
+				"48": "enabled48.png"
+			}
+		});
+	}
+}
+
+async function disable(icon = true) {
+	if (!blockingEnabled) return;
+
+	const rules = await chrome.declarativeNetRequest.getDynamicRules();
+	await chrome.declarativeNetRequest.updateDynamicRules({
+		removeRuleIds: rules.map(rule => rule.id),
+		addRules: []
+	});
+
+	blockingEnabled = false;
+	if (icon) {
+		chrome.action.setIcon({
+			path: {
+				"16": "disabled.png",
+				"32": "disabled.png"
+			}
+		});
+	}
+}
+
+async function refreshFilters() {
+	await disable(false);
+	await enable(true);
+}
+
+async function toggleEnabled() {
+	if (blockingEnabled) {
+		await disable();
+	} else {
+		await enable();
+	}
+}
+
+function setWebRTCPrivacy(flag, store = true) {
+	webRTCPrivacy = flag;
+	const privacySetting = flag ? "default_public_interface_only" : "default";
+	chrome.privacy.network.webRTCIPHandlingPolicy.set({value: privacySetting});
+	if (store) {
+		chrome.storage.local.set({"webrtc_privacy": flag});
+	}
+}
+
+// Initialization
+chrome.storage.local.get("filters",
+	function(result) {
+		if (result["filters"] == undefined) {
+			console.log("Initializing filters to defaults.");
+			setFilters(defaultFilters);
+		} else {
+			setFilters(result["filters"]);
+			allFilters = result["filters"];
+		}
+
+		// toggle blocking on-off via the extension icon
+		chrome.action.onClicked.addListener(toggleEnabled);
+		// initialize blocking
+		enable();
+	}
+);
+
+chrome.storage.local.get("webrtc_privacy",
+	function(result) {
+		if (result["webrtc_privacy"] == undefined) {
+			console.log("Initializing WebRTC privacy to default.");
+			setWebRTCPrivacy(false, true);
+		} else {
+			setWebRTCPrivacy(result["webrtc_privacy"], false);
+		}
+	}
+);

PBlock/default_filters.js

@@ -0,0 +1,14 @@
+defaultFilters = [
+	// personally, I can't stand the like box
+	//"http://www.facebook.com/plugins/likebox.php?*",
+	"*://*.doubleclick.net/*",
+	"*://partner.googleadservices.com/*",
+	"*://*.googlesyndication.com/*",
+	"*://*.google-analytics.com/*",
+	"*://creative.ak.fbcdn.net/*",
+	"*://*.adbrite.com/*",
+	"*://*.exponential.com/*",
+	"*://*.quantserve.com/*",
+	"*://*.scorecardresearch.com/*",
+	"*://*.zedo.com/*",
+]

PBlock/manifest.json

@@ -0,0 +1,29 @@
+{
+  "name": "PBlock",
+  "version": "0.1",
+  "manifest_version": 3,
+  "author": "yeongpin",
+  "url": "https://github.com/yeongpin/PBlock",
+  "description": "Just a simple blocker.",
+  "action": {
+    "default_icon": "enabled48.png"
+  },
+  "background": {
+    "service_worker": "background.js"
+  },
+  "icons": {
+     "16": "enabled16.png",
+     "48": "enabled48.png"
+  },
+  "permissions": [
+    "declarativeNetRequest",
+    "storage",
+    "privacy"
+  ],
+  "host_permissions": [
+    "http://*/*",
+    "https://*/*",
+    "ws://*/*", 
+    "wss://*/*"
+  ]
+}

PBlock/rules.json

@@ -0,0 +1,5 @@
+{
+  "id": "ruleset_1",
+  "version": "1.0",
+  "rules": []
+} 

README.md

@@ -11,132 +11,31 @@
 [![Stars](https://img.shields.io/github/stars/yeongpin/cursor-free-vip?style=flat-square&logo=github)](https://github.com/yeongpin/cursor-free-vip/stargazers)
 
 </p>
+<h4>Support Latest 0.45.11 Version | 支持最新0.45.11版本</h4>
 
-This is a tool to automatically register (except for Google verification code), support Windows and macOS systems, complete Auth verification, and reset Cursor's configuration.
+This is a tool to automatically register , support Windows and macOS systems, complete Auth verification, and reset Cursor's configuration.
 
 這是一個自動化工具，自動註冊（除了Google驗證碼)，支持 Windows 和 macOS 系統，完成Auth驗證，重置Cursor的配置。
 
 <p align="center">
-  <img src="./images/pro_2025-01-14_14-40-37.png" alt="new" width="400"/><br>
+  <img src="./images/new107_2025-01-15_13-53-56.png" alt="new" width="400"/><br>
 </p>
 
-<br>
-<p align="center">
-  <img src="./images/free_2025-01-14_14-59-15.png" alt="free" width="400"/><br>
-</p>
+##### If you dont have google chrome , you can download it from [here](https://www.google.com/intl/en_pk/chrome/)
 
-## ⚠️ Google Recaptcha need to be manually verified, don't be lazy, move your fingers, verify it, otherwise it will keep prompting you to verify ⚠️
-### If you dont have google chrome , you can download it from [here](https://www.google.com/intl/en_pk/chrome/)
-
-## ⚠️ 郵箱驗證 需要手動驗證，不要那麼懶，動一動手指，驗證一下，不然會一直提示你驗證 ⚠️
-### 如果沒有Google Chrome，可以從[這裡](https://www.google.com/intl/en_pk/chrome/)下載
+##### 如果沒有Google Chrome，可以從[這裡](https://www.google.com/intl/en_pk/chrome/)下載
 
 </p>
 </div>
 
 
-## 🔄 更新日志
-<details open>
-<summary>v1.0.7</summary>
-
-1. Add Locale Language Support | 增加多語言支持
-<p align="center">
-  <img src="./images/locale_2025-01-15_13-40-08.png" alt="locale" width="400"/><br>
-</p>
-</details>
-<details>
-<summary>v1.0.6</summary>
-
-1. Add Quit Cursor Option | 增加退出Cursor選項
-2. Add Recaptcha Path Patch | 增加Recaptcha路徑修復
-3. Fix Admin Permission | 修復管理員權限問題
-4. Remove all need admin permission | 移除所有需要管理員權限
-</details>
-<details>
-<summary>v1.0.5 - HotFix</summary>
-
-1. Fix: Mac Browser Control | 修復Mac瀏覽器控制問題
-2. Fix: Verification Code Cant Patch | 修復驗證碼無法修復問題
-3. Add Linux Support | 增加Linux支持
-<p align="center">
-  <img src="./images/fix_2025-01-14_21-30-43.png" alt="fix" width="400"/><br>
-</p>
-</details>
-<details>
-<summary>v1.0.5</summary>
-
-1. Remove MachineID | 移除機器碼ID
-2. Change to automatic registration account | 全面改為自動註冊賬號
-3. Use your own exclusive new account | 使用自己獨享的新賬號
-4. Fully automatic reset machine configuration | 全面自動化重置機器配置
-<p align="center">
-  <img src="./images/pro_2025-01-14_14-40-37.png" alt="Why" width="400"/><br>
-</p>
-</details>
-<details>
-<summary>v1.0.4</summary>
-
-1. Fix: Cursor's configuration | 修復Cursor的配置問題
-2. Fix Cloud Lame | 修復雲端慢速模式
-</details>
-<details>
-<summary>v1.0.3</summary>
-
-1. Fix: Cursor's configuration | 修復Cursor的配置問題
-2. Add Manual Reset Machine | 增加手動重置機器
-3. Add CDN Cloud Control WatchDog | 增加CDN雲端控制WatchDog
-4. Add Mac OS Support | 增加Mac OS支持
-5. 759 ++ People use , but star only a few | 759 ++人使用，但只有幾個人點贊
-<p align="center">
-  <img src="./images/what_2025-01-13_13-32-54.png" alt="Why" width="400"/><br>
-</p>
-</details>
-<details>
-<summary>v1.0.2</summary>
-  
-1. Fix: Some known issues | 修復了一些已知問題
-2. Add cloud control device code | 增加雲端控制設備碼
-3. Cloud reset device code | 雲端重置設備碼
-4. Remove official WatchDog monitoring | 移除官方WatchDog監控
-5. Remove Proxy official prompt | 移除Proxy 官方提示
-6. Fix: Too Many Computer | 修復Too Many Computer 問題
-7. Fix Billing Issue | 修復計費問題
-8. Fix: Cursor's configuration | 修復Cursor的配置問題
-9. Fix cursor-slow mode | 修復cursor-slow模式
-</details>
-<details>
-<summary>v1.0.1</summary>
-
-1. Fix: Reset machine ID | 修復了重置機器ID的問題
-2. Fix: Bypass membership check | 修復了 繞過會員檢查的問題
-3. Fix: Auto upgrade to "pro" membership | 修復了 自動升級為pro會員的問題
-4. Fix: Real-time send Token request | 修復了 實時發送Token請求的問題
-5. Fix: Reset Cursor's configuration | 修復了 重置Cursor的配置的問題
-</details>
-
-<details>
-<summary>v1.0</summary>
-1. Preview Image | 預覽圖<br>
-<p align="center">
-  <img src="./images/pro_2025-01-11_00-50-40.png" alt="Cursor Pro Logo" width="400"/><br>
-</p>
-<p align="center">
-  <img src="./images/pro_2025-01-11_00-51-07.png" alt="Cursor Pro Logo" width="400"/><br>
-</p>
-2. Add usage period,but can be contacted by leaving MachineID | 不得已才添加，但可以通過留下MachineID 聯繫作者
-<br>
-
-<p align="center">
-  <img src="./images/pro_2025-01-11_16-24-03.png" alt="Cursor Pro Logo" width="400"/><br>
-</p>
-</details>
+## 🔄 Change Log | 更新日志
+[Watch Change Log | 查看更新日志](CHANGELOG.md)
 
 ## ✨ Features | 功能特點
 
 * Automatically register Cursor membership<br>自動註冊Cursor會員<br>
 
-* Except for Google verification code<br>除了Google驗證碼<br>
-
 * Support Windows and macOS systems<br>支持 Windows 和 macOS 系統<br>
 
 * Complete Auth verification<br>完成Auth驗證<br>
@@ -153,9 +52,7 @@ This is a tool to automatically register (except for Google verification code),
 |Linux|ARM64|✅|Linux|ARM64|✅|
 
 ## 👀 How to use | 如何使用
-|⚠️Must logout your account before running the script⚠️|⚠️必須先登出你的帳戶再運行腳本⚠️ |
-|:---:|:---:|
-<br>
+
 <details open>
 <summary><b>⭐ Auto Run Script | 腳本自動化運行</b></summary>
 
@@ -190,8 +87,6 @@ irm https://raw.githubusercontent.com/yeongpin/cursor-free-vip/main/scripts/rese
 
 * Confirm that Cursor is closed before running the script <br>請確保在運行腳本前已經關閉 Cursor<br>
 
-* Do not close this script when using Cursor <br>使用Cursor時請勿關閉此腳本<br>
-
 * This tool is only for learning and research purposes <br>此工具僅供學習和研究使用<br>
 
 * Please comply with the relevant software usage terms when using this tool <br>使用本工具時請遵守相關軟件使用條款

browser.py

@@ -2,6 +2,7 @@ from DrissionPage import ChromiumOptions, ChromiumPage
 import sys
 import os
 import logging
+import random
 
 
 class BrowserManager:
@@ -26,27 +27,36 @@ class BrowserManager:
         try:
             extension_path = self._get_extension_path()
             co.add_extension(extension_path)
+            co.set_argument("--allow-extensions-in-incognito")
 
             extension_block_path = self.get_extension_block()
             co.add_extension(extension_block_path)
-
-            extension_recaptcha_path = self.get_extension_recaptcha()
-            co.add_extension(extension_recaptcha_path)
-
+            co.set_argument("--allow-extensions-in-incognito")
         except FileNotFoundError as e:
             logging.warning(f"警告: {e}")
 
+        # 设置更真实的用户代理
         co.set_user_agent(
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.92 Safari/537.36"
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
         )
+
+        # 基本设置
         co.set_pref("credentials_enable_service", False)
-        co.set_argument("--hide-crash-restore-bubble")
+        
+        # 随机端口
         co.auto_port()
 
-        # Mac 系统特殊处理
-        if sys.platform == "darwin":
-            co.set_argument("--no-sandbox")
+        # 系统特定设置
+        if sys.platform == "darwin":  # macOS
             co.set_argument("--disable-gpu")
+            co.set_argument("--no-sandbox")
+        elif sys.platform == "win32":  # Windows
+            co.set_argument("--disable-software-rasterizer")
+
+        # 设置窗口大小
+        window_width = random.randint(1024, 1920)
+        window_height = random.randint(768, 1080)
+        co.set_argument(f"--window-size={window_width},{window_height}")
 
         return co
 
@@ -66,23 +76,10 @@ class BrowserManager:
     def get_extension_block(self):
         """获取插件路径"""
         root_dir = os.getcwd()
-        extension_path = os.path.join(root_dir, "uBlock0.chromium")
+        extension_path = os.path.join(root_dir, "PBlock")
         
         if hasattr(sys, "_MEIPASS"):
-            extension_path = os.path.join(sys._MEIPASS, "uBlock0.chromium")
-
-        if not os.path.exists(extension_path):
-            raise FileNotFoundError(f"插件不存在: {extension_path}")
-
-        return extension_path
-
-    def get_extension_recaptcha(self):
-        """获取插件路径"""
-        root_dir = os.getcwd()
-        extension_path = os.path.join(root_dir, "recaptchaPatch")
-
-        if hasattr(sys, "_MEIPASS"):
-            extension_path = os.path.join(sys._MEIPASS, "recaptchaPatch")
+            extension_path = os.path.join(sys._MEIPASS, "PBlock")
 
         if not os.path.exists(extension_path):
             raise FileNotFoundError(f"插件不存在: {extension_path}")

build.spec

@@ -24,14 +24,14 @@ a = Analysis(
     binaries=[],
     datas=[
         ('turnstilePatch', 'turnstilePatch'),
-        ('recaptchaPatch', 'recaptchaPatch'),
-        ('uBlock0.chromium', 'uBlock0.chromium'),
+        ('PBlock', 'PBlock'),
         ('locales', 'locales'),
         ('cursor_auth.py', '.'),
         ('reset_machine_manual.py', '.'),
         ('cursor_register.py', '.'),
         ('browser.py', '.'),
-        ('control.py', '.')
+        ('control.py', '.'),
+        ('.env', '.')
     ],
     hiddenimports=[
         'cursor_auth',

control.py

@@ -58,67 +58,7 @@ class BrowserControl:
     def get_current_tab(self):
         """获取当前标签页"""
         return self.browser
-
-    def generate_new_email(self):
-        """点击新的按钮生成新邮箱"""
-        try:
-            print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.generate_email')}...{Style.RESET_ALL}")
-            new_button = self.browser.ele('xpath://button[contains(@class, "egenbut")]')
-            if new_button:
-                new_button.click()
-                time.sleep(1)  # 等待生成
-                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('control.generate_email_success')}{Style.RESET_ALL}")
-                return True
-            else:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.generate_email_failed')}{Style.RESET_ALL}")
-                return False
-        except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.browser_error', error=str(e))}{Style.RESET_ALL}")
-            return False
-
-    def select_email_domain(self, domain_index=None):
-        """选择邮箱域名，如果不指定index则随机选择"""
-        try:
-            print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.select_email_domain')}...{Style.RESET_ALL}")
-            # 找到下拉框
-            select_element = self.browser.ele('xpath://select[@id="seldom"]')
-            if select_element:
-                # 获取所有选项，包括两个 optgroup 下的所有 option
-                all_options = []
-                
-                # 获取 "新的" 组下的选项
-                new_options = self.browser.eles('xpath://select[@id="seldom"]/optgroup[@label="-- 新的 --"]/option')
-                all_options.extend(new_options)
-                
-                # 获取 "其他" 组下的选项
-                other_options = self.browser.eles('xpath://select[@id="seldom"]/optgroup[@label="-- 其他 --"]/option')
-                all_options.extend(other_options)
-                
-                if all_options:
-                    # 如果没有指定索引，随机选择一个
-                    if domain_index is None:
-                        domain_index = random.randint(0, len(all_options) - 1)
-                    
-                    if domain_index < len(all_options):
-                        # 获取选中选项的文本
-                        selected_domain = all_options[domain_index].text
-                        print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.select_email_domain')}: {selected_domain}{Style.RESET_ALL}")
-                        
-                        # 点击选择
-                        all_options[domain_index].click()
-                        time.sleep(1)
-                        print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('control.select_email_domain_success')}{Style.RESET_ALL}")
-                        return True
-                    
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.no_available_domain_options', count=len(all_options))}{Style.RESET_ALL}")
-                return False
-            else:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.no_domain_select_box')}{Style.RESET_ALL}")
-                return False
-        except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.select_email_domain_failed', error=str(e))}{Style.RESET_ALL}")
-            return False
-
+    
     def wait_for_page_load(self, seconds=2):
         """等待页面加载"""
         time.sleep(seconds)
@@ -134,80 +74,6 @@ class BrowserControl:
             print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.browser_error', error=str(e))}{Style.RESET_ALL}")
             return False
 
-    def copy_and_get_email(self):
-        """获取邮箱地址"""
-        try:
-            print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.generate_email')}...{Style.RESET_ALL}")
-            
-            # 等待元素加载
-            time.sleep(1)
-            
-            # 获取邮箱名称
-            try:
-                email_div = self.browser.ele('xpath://div[@class="segen"]//div[contains(@style, "color: #e5e5e5")]')
-                if email_div:
-                    email_name = email_div.text.split()[0]
-                    print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.get_email_name')}: {email_name}{Style.RESET_ALL}")
-                else:
-                    print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.get_email_name_failed')}{Style.RESET_ALL}")
-                    return None
-            except Exception as e:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.get_email_name_failed', error=str(e))}{Style.RESET_ALL}")
-                return None
-            
-            # 直接使用上一步选择的域名
-            try:
-                domain = self.browser.ele('xpath://select[@id="seldom"]').value
-                if not domain:  # 如果获取不到value，尝试获取选中的选项文本
-                    selected_option = self.browser.ele('xpath://select[@id="seldom"]/option[1]')
-                    domain = selected_option.text if selected_option else "@yopmail.com"  # 使用默认域名作为后备
-            except:
-                domain = "@yopmail.com"  # 如果出错，使用默认域名
-            
-            # 组合完整邮箱地址
-            full_email = f"{email_name}{domain}"
-            print(f"{Fore.GREEN}{EMOJI['MAIL']} {self.translator.get('control.get_email_address')}: {full_email}{Style.RESET_ALL}")
-            return full_email
-            
-        except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.get_email_address_failed', error=str(e))}{Style.RESET_ALL}")
-            return None 
-
-    def view_mailbox(self):
-        """点击查看邮箱按钮"""
-        try:
-            print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.enter_mailbox')}...{Style.RESET_ALL}")
-            view_button = self.browser.ele('xpath://button[contains(@class, "egenbut") and contains(.//span, "查看邮箱")]')
-            if view_button:
-                view_button.click()
-                time.sleep(2)  # 等待页面加载
-                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('control.enter_mailbox_success')}{Style.RESET_ALL}")
-                return True
-            else:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.no_view_mailbox_button')}{Style.RESET_ALL}")
-                return False
-        except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.enter_mailbox_failed', error=str(e))}{Style.RESET_ALL}")
-            return False 
-
-    def refresh_mailbox(self):
-        """刷新邮箱获取最新信息"""
-        try:
-            print(f"{Fore.CYAN}{EMOJI['MAIL']} {self.translator.get('control.refresh_mailbox')}...{Style.RESET_ALL}")
-            refresh_button = self.browser.ele('xpath://button[@id="refresh"]')
-            if refresh_button:
-                refresh_button.click()
-                time.sleep(2)  # 等待刷新完成
-                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('control.refresh_mailbox_success')}{Style.RESET_ALL}")
-                return True
-            else:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.no_refresh_button')}{Style.RESET_ALL}")
-                return False
-        except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('control.refresh_mailbox_failed', error=str(e))}{Style.RESET_ALL}")
-            return False 
-
-
     def get_verification_code(self):
         """从邮件中获取验证码"""
         try:

cursor_auth.py

@@ -56,7 +56,7 @@ class CursorAuth:
 
             # 重新连接数据库
             conn = sqlite3.connect(self.db_path)
-            print(f"{EMOJI['INFO']} {Fore.GREEN}{self.translator.get('auth.connected_to_database')}{Style.RESET_ALL}")
+            print(f"{EMOJI['INFO']} {Fore.GREEN} {self.translator.get('auth.connected_to_database')}{Style.RESET_ALL}")
             cursor = conn.cursor()
             
             # 增加超时和其他优化设置
@@ -90,7 +90,7 @@ class CursorAuth:
                             UPDATE ItemTable SET value = ?
                             WHERE key = ?
                         """, (value, key))
-                    print(f"{EMOJI['INFO']} {Fore.CYAN}Updating {key.split('/')[-1]}...{Style.RESET_ALL}")
+                    print(f"{EMOJI['INFO']} {Fore.CYAN} {self.translator.get('auth.updating_pair')} {key.split('/')[-1]}...{Style.RESET_ALL}")
                 
                 cursor.execute("COMMIT")
                 print(f"{EMOJI['SUCCESS']} {Fore.GREEN}{self.translator.get('auth.database_updated_successfully')}{Style.RESET_ALL}")
@@ -101,14 +101,14 @@ class CursorAuth:
                 raise e
 
         except sqlite3.Error as e:
-            print(f"\n{EMOJI['ERROR']} {Fore.RED}{self.translator.get('auth.database_error', error=str(e))}{Style.RESET_ALL}")
+            print(f"\n{EMOJI['ERROR']} {Fore.RED} {self.translator.get('auth.database_error', error=str(e))}{Style.RESET_ALL}")
             return False
         except Exception as e:
-            print(f"\n{EMOJI['ERROR']} {Fore.RED}{self.translator.get('auth.an_error_occurred', error=str(e))}{Style.RESET_ALL}")
+            print(f"\n{EMOJI['ERROR']} {Fore.RED} {self.translator.get('auth.an_error_occurred', error=str(e))}{Style.RESET_ALL}")
             return False
         finally:
             if conn:
                 conn.close()
-                print(f"{EMOJI['DB']} {Fore.CYAN}{self.translator.get('auth.database_connection_closed')}{Style.RESET_ALL}")
+                print(f"{EMOJI['DB']} {Fore.CYAN} {self.translator.get('auth.database_connection_closed')}{Style.RESET_ALL}")
 
 

cursor_register.py

@@ -65,238 +65,75 @@ class CursorRegistration:
         """设置邮箱"""
         try:
             print(f"{Fore.CYAN}{EMOJI['START']} {self.translator.get('register.browser_start')}...{Style.RESET_ALL}")
-            self.browser = self.browser_manager.init_browser()
-            self.controller = BrowserControl(self.browser, self.translator)
             
-            # 打开邮箱生成器页面（第一个标签页）
-            self.controller.navigate_to(self.mail_url)
-            self.email_tab = self.browser  # 保存邮箱标签页
-            self.controller.email_tab = self.email_tab  # 同时保存到controller
+            # 使用 new_tempemail 创建临时邮箱，传入 translator
+            from new_tempemail import NewTempEmail
+            self.temp_email = NewTempEmail(self.translator)  # 传入 translator
             
-            # 生成新邮箱
-            self.controller.generate_new_email()
+            # 创建临时邮箱
+            email_address = self.temp_email.create_email()
+            if not email_address:
+                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.email_create_failed')}{Style.RESET_ALL}")
+                return False
             
-            # 选择随机域名
-            self.controller.select_email_domain()
+            # 保存邮箱地址和浏览器实例
+            self.email_address = email_address
+            self.email_tab = self.temp_email  # 传递 NewTempEmail 实例而不是 page
+            self.controller = BrowserControl(self.temp_email.page, self.translator)
             
-            # 获取邮箱地址
-            self.email_address = self.controller.copy_and_get_email()
-            if self.email_address:
-                print(f"{EMOJI['MAIL']}{Fore.CYAN} {self.translator.get('register.get_email_address')}: {self.email_address}{Style.RESET_ALL}")
-                
-                # 进入邮箱
-                if self.controller.view_mailbox():
-                    return True
-            
-            return False
+            return True
             
         except Exception as e:
-            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.setup_error', error=str(e))}{Style.RESET_ALL}")
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.email_setup_failed', error=str(e))}{Style.RESET_ALL}")
             return False
 
     def register_cursor(self):
         """注册 Cursor"""
-        signup_browser_manager = None
+        browser_tab = None
         try:
             print(f"{Fore.CYAN}{EMOJI['START']} {self.translator.get('register.register_start')}...{Style.RESET_ALL}")
             
-            # 创建新的浏览器实例用于注册
-            from browser import BrowserManager
-            signup_browser_manager = BrowserManager(noheader=True)
-            self.signup_tab = signup_browser_manager.init_browser()
+            # 直接使用 new_signup.py 进行注册
+            from new_signup import main as new_signup_main
             
-            # 访问注册页面
-            self.signup_tab.get(self.sign_up_url)
-            time.sleep(2)
-
-            # 填写注册表单
-            if self.signup_tab.ele("@name=first_name"):
-                print(f"{Fore.CYAN}{EMOJI['FORM']} {self.translator.get('register.filling_form')}...{Style.RESET_ALL}")
-                
-                self.signup_tab.ele("@name=first_name").input(self.first_name)
-                time.sleep(random.uniform(1, 2))
-                
-                self.signup_tab.ele("@name=last_name").input(self.last_name)
-                time.sleep(random.uniform(1, 2))
-                
-                self.signup_tab.ele("@name=email").input(self.email_address)
-                time.sleep(random.uniform(1, 2))
-                
-                self.signup_tab.ele("@type=submit").click()
-                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.basic_info_submitted')}...{Style.RESET_ALL}")
-
-            # 处理 Turnstile 验证
-            self._handle_turnstile()
-
-            # 设置密码
-            if self.signup_tab.ele("@name=password"):
-                print(f"{Fore.CYAN}{EMOJI['PASSWORD']} {self.translator.get('register.set_password')}...{Style.RESET_ALL}")
-                self.signup_tab.ele("@name=password").input(self.password)
-                time.sleep(random.uniform(1, 2))
-                self.signup_tab.ele("@type=submit").click()
+            # 执行新的注册流程，传入 translator
+            result, browser_tab = new_signup_main(
+                email=self.email_address,
+                password=self.password,
+                first_name=self.first_name,
+                last_name=self.last_name,
+                email_tab=self.email_tab,
+                controller=self.controller,
+                translator=self.translator
+            )
             
-            self._handle_turnstile()
-
-            # 等待并获取验证码
-            time.sleep(5)  # 等待验证码邮件
-
-            self.browser.refresh()
+            if result:
+                # 使用返回的浏览器实例获取账户信息
+                self.signup_tab = browser_tab  # 保存浏览器实例
+                success = self._get_account_info()
+                
+                # 获取信息后关闭浏览器
+                if browser_tab:
+                    try:
+                        browser_tab.quit()
+                    except:
+                        pass
+                
+                return success
             
-            # 获取验证码，设置60秒超时
-            verification_code = None
-            max_attempts = 10  # 增加到10次尝试
-            retry_interval = 5  # 每5秒重试一次
-            start_time = time.time()
-            timeout = 60  # 60秒超时
-
-            print(f"{Fore.CYAN}{EMOJI['WAIT']} {self.translator.get('register.start_getting_verification_code')}...{Style.RESET_ALL}")
+            return False
             
-            for attempt in range(max_attempts):
-                # 检查是否超时
-                if time.time() - start_time > timeout:
-                    print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.get_verification_code_timeout')}...{Style.RESET_ALL}")
-                    break
-                    
-                verification_code = self.controller.get_verification_code()
-                if verification_code:
-                    print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.get_verification_code_success')}: {verification_code}{Style.RESET_ALL}")
-                    break
-                    
-                remaining_time = int(timeout - (time.time() - start_time))
-                print(f"{Fore.YELLOW}{EMOJI['WAIT']} {self.translator.get('register.try_get_verification_code', attempt=attempt + 1, remaining_time=remaining_time)}...{Style.RESET_ALL}")
-                
-                # 刷新邮箱
-                self.browser.refresh()
-                time.sleep(retry_interval)
-            
-            if verification_code:
-                # 在注册页面填写验证码
-                for i, digit in enumerate(verification_code):
-                    self.signup_tab.ele(f"@data-index={i}").input(digit)
-                    time.sleep(random.uniform(0.1, 0.3))
-                
-                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.verification_code_filled')}...{Style.RESET_ALL}")
-                time.sleep(3)
-
-                self._handle_turnstile()
-                
-                # 检查当前URL
-                current_url = self.signup_tab.url
-                if "authenticator.cursor.sh" in current_url:
-                    print(f"{Fore.CYAN}{EMOJI['VERIFY']} {self.translator.get('register.detect_login_page')}...{Style.RESET_ALL}")
-                    
-                    # 填写邮箱
-                    email_input = self.signup_tab.ele('@name=email')
-                    if email_input:
-                        email_input.input(self.email_address)
-                        time.sleep(random.uniform(1, 2))
-                        
-                        # 点击提交
-                        submit_button = self.signup_tab.ele('@type=submit')
-                        if submit_button:
-                            submit_button.click()
-                            time.sleep(2)
-                            
-                            # 处理 Turnstile 验证
-                            self._handle_turnstile()
-                            
-                            # 填写密码
-                            password_input = self.signup_tab.ele('@name=password')
-                            if password_input:
-                                password_input.input(self.password)
-                                time.sleep(random.uniform(1, 2))
-                                
-                                # 点击提交
-                                submit_button = self.signup_tab.ele('@type=submit')
-                                if submit_button:
-                                    submit_button.click()
-                                    time.sleep(2)
-                                    
-                                    # 处理 Turnstile 验证
-                                    self._handle_turnstile()
-                                    
-                                    # 等待跳转到设置页面
-                                    max_wait = 30
-                                    start_time = time.time()
-                                    while time.time() - start_time < max_wait:
-                                        if "cursor.com/settings" in self.signup_tab.url:
-                                            print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.login_success_and_jump_to_settings_page')}...{Style.RESET_ALL}")
-                                            break
-                                        time.sleep(1)
-                
-                # 获取账户信息
-                result = self._get_account_info()
-                
-                # 关闭注册窗口
-                if signup_browser_manager:
-                    signup_browser_manager.quit()
-                    
-                return result
-            else:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.get_verification_code_timeout')}...{Style.RESET_ALL}")
-                return False
-
         except Exception as e:
             print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.register_process_error', error=str(e))}{Style.RESET_ALL}")
             return False
         finally:
-            # 确保在任何情况下都关闭注册窗口
-            if signup_browser_manager:
-                signup_browser_manager.quit()
-
-    def _handle_turnstile(self):
-        """处理 Turnstile 验证"""
-        print(f"{Fore.YELLOW}{EMOJI['VERIFY']} {self.translator.get('register.handle_turnstile')}...{Style.RESET_ALL}")
-        
-        # 设置最大等待时间（秒）
-        max_wait_time = 10  # 增加等待时间
-        start_time = time.time()
-        
-        while True:
-            try:
-                # 检查是否超时
-                if time.time() - start_time > max_wait_time:
-                    print(f"{Fore.YELLOW}{EMOJI['WAIT']} {self.translator.get('register.no_turnstile')}...{Style.RESET_ALL}")
-                    time.sleep(2)
-                    break
-                    
+            # 确保在任何情况下都关闭浏览器
+            if browser_tab:
                 try:
-                    challengeCheck = (
-                        self.signup_tab.ele("@id=cf-turnstile", timeout=1)
-                        .child()
-                        .shadow_root.ele("tag:iframe")
-                        .ele("tag:body")
-                        .sr("tag:input")
-                    )
-
-                    if challengeCheck:
-                        challengeCheck.click()
-                        time.sleep(3)
-                        print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.turnstile_passed')}{Style.RESET_ALL}")
-                        time.sleep(2)
-                        break
+                    browser_tab.quit()
                 except:
                     pass
-                    
-                try:
-                    if (self.signup_tab.ele("@name=password", timeout=0.5) or 
-                        self.signup_tab.ele("@name=email", timeout=0.5) or
-                        self.signup_tab.ele("@data-index=0", timeout=0.5)):
-                        print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.turnstile_passed')}{Style.RESET_ALL}")
-                        time.sleep(2)
-                        break
-                except:
-                    pass
-                    
-                time.sleep(1)
                 
-            except Exception as e:
-                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.error', error=str(e))}{Style.RESET_ALL}")
-                time.sleep(2)
-                break
-
-        time.sleep(2)
-
     def _get_account_info(self):
         """获取账户信息和 Token"""
         try:
@@ -389,8 +226,12 @@ class CursorRegistration:
                     return True
             return False
         finally:
-            if self.browser_manager:
-                self.browser_manager.quit()
+            # 关闭邮箱标签页
+            if hasattr(self, 'temp_email'):
+                try:
+                    self.temp_email.close()
+                except:
+                    pass
 
     def update_cursor_auth(self, email=None, access_token=None, refresh_token=None):
         """更新Cursor的认证信息的便捷函数"""

cursor_register_manual.py

@@ -0,0 +1,260 @@
+import os
+from colorama import Fore, Style, init
+import time
+import random
+from browser import BrowserManager
+from control import BrowserControl
+from cursor_auth import CursorAuth
+from reset_machine_manual import MachineIDResetter
+
+os.environ["PYTHONVERBOSE"] = "0"
+os.environ["PYINSTALLER_VERBOSE"] = "0"
+
+# 初始化colorama
+init()
+
+# 定义emoji常量
+EMOJI = {
+    'START': '🚀',
+    'FORM': '📝',
+    'VERIFY': '🔄',
+    'PASSWORD': '🔑',
+    'CODE': '📱',
+    'DONE': '✨',
+    'ERROR': '❌',
+    'WAIT': '⏳',
+    'SUCCESS': '✅',
+    'MAIL': '📧',
+    'KEY': '🔐',
+    'UPDATE': '🔄',
+    'INFO': 'ℹ️'
+}
+
+class CursorRegistration:
+    def __init__(self, translator=None):
+        self.translator = translator
+        # 设置为显示模式
+        os.environ['BROWSER_HEADLESS'] = 'False'
+        self.browser_manager = BrowserManager()
+        self.browser = None
+        self.controller = None
+        self.sign_up_url = "https://authenticator.cursor.sh/sign-up"
+        self.settings_url = "https://www.cursor.com/settings"
+        self.email_address = None
+        self.signup_tab = None
+        self.email_tab = None
+        
+        # 账号信息
+        self.password = self._generate_password()
+        self.first_name = self._generate_name()
+        self.last_name = self._generate_name()
+
+    def _generate_password(self, length=12):
+        """Generate Random Password"""
+        chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*"
+        return ''.join(random.choices(chars, k=length))
+
+    def _generate_name(self, length=6):
+        """Generate Random Name"""
+        first_letter = random.choice("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+        rest_letters = ''.join(random.choices("abcdefghijklmnopqrstuvwxyz", k=length-1))
+        return first_letter + rest_letters
+
+    def setup_email(self):
+        """设置邮箱"""
+        try:
+            print(f"{Fore.CYAN}{EMOJI['START']} {self.translator.get('register.manual_email_input') if self.translator else '请输入邮箱地址：'}")
+            self.email_address = input().strip()
+            
+            if '@' not in self.email_address:
+                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.invalid_email') if self.translator else '无效的邮箱地址'}{Style.RESET_ALL}")
+                return False
+                
+            return True
+            
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.email_setup_failed', error=str(e))}{Style.RESET_ALL}")
+            return False
+
+    def get_verification_code(self):
+        """手动获取验证码"""
+        try:
+            print(f"{Fore.CYAN}{EMOJI['CODE']} {self.translator.get('register.manual_code_input') if self.translator else '请输入验证码：'}{Style.RESET_ALL}")
+            code = input().strip()
+            
+            if not code.isdigit() or len(code) != 6:
+                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.invalid_code') if self.translator else '无效的验证码'}{Style.RESET_ALL}")
+                return None
+                
+            return code
+            
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.code_input_failed', error=str(e))}{Style.RESET_ALL}")
+            return None
+
+    def register_cursor(self):
+        """注册 Cursor"""
+        browser_tab = None
+        try:
+            print(f"{Fore.CYAN}{EMOJI['START']} {self.translator.get('register.register_start')}...{Style.RESET_ALL}")
+            
+            # 直接使用 new_signup.py 进行注册
+            from new_signup import main as new_signup_main
+            
+            # 执行新的注册流程，传入 translator
+            result, browser_tab = new_signup_main(
+                email=self.email_address,
+                password=self.password,
+                first_name=self.first_name,
+                last_name=self.last_name,
+                email_tab=None,  # 不需要邮箱标签页
+                controller=self,  # 传入 self 而不是 self.controller
+                translator=self.translator
+            )
+            
+            if result:
+                # 使用返回的浏览器实例获取账户信息
+                self.signup_tab = browser_tab  # 保存浏览器实例
+                success = self._get_account_info()
+                
+                # 获取信息后关闭浏览器
+                if browser_tab:
+                    try:
+                        browser_tab.quit()
+                    except:
+                        pass
+                
+                return success
+            
+            return False
+            
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.register_process_error', error=str(e))}{Style.RESET_ALL}")
+            return False
+        finally:
+            # 确保在任何情况下都关闭浏览器
+            if browser_tab:
+                try:
+                    browser_tab.quit()
+                except:
+                    pass
+                
+    def _get_account_info(self):
+        """获取账户信息和 Token"""
+        try:
+            self.signup_tab.get(self.settings_url)
+            time.sleep(2)
+            
+            usage_selector = (
+                "css:div.col-span-2 > div > div > div > div > "
+                "div:nth-child(1) > div.flex.items-center.justify-between.gap-2 > "
+                "span.font-mono.text-sm\\/\\[0\\.875rem\\]"
+            )
+            usage_ele = self.signup_tab.ele(usage_selector)
+            total_usage = "未知"
+            if usage_ele:
+                total_usage = usage_ele.text.split("/")[-1].strip()
+
+            print(f"{Fore.CYAN}{EMOJI['WAIT']} {self.translator.get('register.get_token')}...{Style.RESET_ALL}")
+            max_attempts = 30
+            retry_interval = 2
+            attempts = 0
+
+            while attempts < max_attempts:
+                try:
+                    cookies = self.signup_tab.cookies()
+                    for cookie in cookies:
+                        if cookie.get("name") == "WorkosCursorSessionToken":
+                            token = cookie["value"].split("%3A%3A")[1]
+                            print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.token_success')}{Style.RESET_ALL}")
+                            self._save_account_info(token, total_usage)
+                            return True
+
+                    attempts += 1
+                    if attempts < max_attempts:
+                        print(f"{Fore.YELLOW}{EMOJI['WAIT']} {self.translator.get('register.token_attempt', attempt=attempts, time=retry_interval)}{Style.RESET_ALL}")
+                        time.sleep(retry_interval)
+                    else:
+                        print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.token_max_attempts', max=max_attempts)}{Style.RESET_ALL}")
+
+                except Exception as e:
+                    print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.token_failed', error=str(e))}{Style.RESET_ALL}")
+                    attempts += 1
+                    if attempts < max_attempts:
+                        print(f"{Fore.YELLOW}{EMOJI['WAIT']} {self.translator.get('register.token_attempt', attempt=attempts, time=retry_interval)}{Style.RESET_ALL}")
+                        time.sleep(retry_interval)
+
+            return False
+
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.account_error', error=str(e))}{Style.RESET_ALL}")
+            return False
+
+    def _save_account_info(self, token, total_usage):
+        """保存账户信息到文件"""
+        try:
+            # 先更新认证信息
+            print(f"{Fore.CYAN}{EMOJI['KEY']} {self.translator.get('register.update_cursor_auth_info')}...{Style.RESET_ALL}")
+            if self.update_cursor_auth(email=self.email_address, access_token=token, refresh_token=token):
+                print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.cursor_auth_info_updated')}...{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.cursor_auth_info_update_failed')}...{Style.RESET_ALL}")
+
+            # 重置机器ID
+            print(f"{Fore.CYAN}{EMOJI['UPDATE']} {self.translator.get('register.reset_machine_id')}...{Style.RESET_ALL}")
+            resetter = MachineIDResetter(self.translator)  # 创建实例时传入translator
+            if not resetter.reset_machine_ids():  # 直接调用reset_machine_ids方法
+                raise Exception("Failed to reset machine ID")
+            
+            # 保存账户信息到文件
+            with open('cursor_accounts.txt', 'a', encoding='utf-8') as f:
+                f.write(f"\n{'='*50}\n")
+                f.write(f"Email: {self.email_address}\n")
+                f.write(f"Password: {self.password}\n")
+                f.write(f"Token: {token}\n")
+                f.write(f"Usage Limit: {total_usage}\n")
+                f.write(f"{'='*50}\n")
+                
+            print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('register.account_info_saved')}...{Style.RESET_ALL}")
+            return True
+            
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('register.save_account_info_failed', error=str(e))}{Style.RESET_ALL}")
+            return False
+
+    def start(self):
+        """启动注册流程"""
+        try:
+            if self.setup_email():
+                if self.register_cursor():
+                    print(f"\n{Fore.GREEN}{EMOJI['DONE']} {self.translator.get('register.cursor_registration_completed')}...{Style.RESET_ALL}")
+                    return True
+            return False
+        finally:
+            # 关闭邮箱标签页
+            if hasattr(self, 'temp_email'):
+                try:
+                    self.temp_email.close()
+                except:
+                    pass
+
+    def update_cursor_auth(self, email=None, access_token=None, refresh_token=None):
+        """更新Cursor的认证信息的便捷函数"""
+        auth_manager = CursorAuth(translator=self.translator)
+        return auth_manager.update_auth(email, access_token, refresh_token)
+
+def main(translator=None):
+    """Main function to be called from main.py"""
+    print(f"\n{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
+    print(f"{Fore.CYAN}{EMOJI['START']} {translator.get('register.title')}{Style.RESET_ALL}")
+    print(f"{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
+
+    registration = CursorRegistration(translator)
+    registration.start()
+
+    print(f"\n{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
+    input(f"{EMOJI['INFO']} {translator.get('register.press_enter')}...")
+
+if __name__ == "__main__":
+    from main import translator as main_translator
+    main(main_translator) 

locales/en.json

@@ -4,6 +4,7 @@
         "exit": "Exit Program",
         "reset": "Reset Machine Manual",
         "register": "Register Cursor",
+        "register_manual": "Register Cursor With Manual Email",
         "quit": "Quit Cursor",
         "select_language": "Select Language",
         "input_choice": "Enter your choice ({choices})",
@@ -45,14 +46,46 @@
         "updating_pair": "Updating Key-Value Pair",
         "sqlite_success": "SQLite Database Updated Successfully",
         "sqlite_error": "SQLite Database Update Failed: {error}",
-        "press_enter": "Press Enter to Exit"
+        "press_enter": "Press Enter to Exit",
+        "unsupported_os": "Unsupported OS: {os}",
+        "linux_path_not_found": "Linux Path Not Found",
+        "updating_system_ids": "Updating System IDs",
+        "system_ids_updated": "System IDs Updated Successfully",
+        "system_ids_update_failed": "System IDs Update Failed: {error}",
+        "windows_guid_updated": "Windows GUID Updated Successfully",
+        "windows_permission_denied": "Windows Permission Denied",
+        "windows_guid_update_failed": "Windows GUID Update Failed",
+        "macos_uuid_updated": "macOS UUID Updated Successfully",
+        "plutil_command_failed": "plutil Command Failed",
+        "start_patching": "Starting Patching getMachineId",
+        "macos_uuid_update_failed": "macOS UUID Update Failed",
+        "current_version": "Current Cursor Version: {version}",
+        "patch_completed": "Patching getMachineId Completed",
+        "patch_failed": "Patching getMachineId Failed: {error}",
+        "version_check_passed": "Cursor Version Check Passed",
+        "file_modified": "File Modified"
     },
     "register": {
         "title": "Cursor Registration Tool",
         "start": "Starting Registration Process",
+        "handling_turnstile": "Handling Turnstile",
+        "retry_verification": "Retry Verification",
+        "detect_turnstile": "Detect Turnstile",
+        "verification_success": "Verification Success",
+        "starting_browser": "Starting Browser",
+        "form_success": "Form Success",
+        "browser_started": "Browser Started",
+        "waiting_for_second_verification": "Waiting for Second Verification",
+        "waiting_for_verification_code": "Waiting for Verification Code",
+        "password_success": "Password Set Successfully",
+        "password_error": "Password Set Failed: {error}",
+        "waiting_for_page_load": "Waiting for Page Load",
+        "first_verification_passed": "First Verification Passed",
         "mailbox": "Successfully Entered Mailbox",
         "register_start": "Start Register",
+        "form_submitted": "Form Submitted, Start Verification...",
         "filling_form": "Fill Form",
+        "visiting_url": "Visiting URL",
         "basic_info": "Basic Info Submitted",
         "handle_turnstile": "Handle Turnstile",
         "no_turnstile": "Not Detect Turnstile",
@@ -90,7 +123,10 @@
         "save_account_info_failed": "Save Account Info Failed",
         "get_email_address": "Get Email Address",
         "update_cursor_auth_info": "Update Cursor Auth Info",
-        "register_process_error": "Register Process Error: {error}"
+        "register_process_error": "Register Process Error: {error}",
+        "setting_password": "Setting Password",
+        "manual_code_input": "Manual Code Input",
+        "manual_email_input": "Manual Email Input"
     },
     "auth": {
         "title": "Cursor Auth Manager",
@@ -107,10 +143,12 @@
         "reset_machine_id": "Reset Machine ID",
         "database_connection_closed": "Database Connection Closed",
         "database_updated_successfully": "Database Updated Successfully",
-        "connected_to_database": "Connected to Database"
+        "connected_to_database": "Connected to Database",
+        "updating_pair": "Updating Key-Value Pair"
     },
     "control": {
         "generate_email": "Generating New Email",
+        "blocked_domain": "Blocked Domain",
         "select_domain": "Selecting Random Domain",
         "copy_email": "Copying Email Address",
         "enter_mailbox": "Entering Mailbox",
@@ -136,6 +174,27 @@
         "get_cursor_session_token": "Get Cursor Session Token",
         "get_cursor_session_token_success": "Get Cursor Session Token Success",
         "get_cursor_session_token_failed": "Get Cursor Session Token Failed",
-        "save_token_failed": "Save Token Failed"
+        "save_token_failed": "Save Token Failed",
+        "database_updated_successfully": "Database Updated Successfully",
+        "database_connection_closed": "Database Connection Closed",
+        "no_valid_verification_code": "No Valid Verification Code"
+    },
+    "email": {
+        "starting_browser": "Starting Browser",
+        "visiting_site": "Visiting smailpro.com",
+        "create_success": "Email Created Successfully",
+        "create_failed": "Failed to Create Email",
+        "create_error": "Email Creation Error: {error}",
+        "refreshing": "Refreshing Email",
+        "refresh_success": "Email Refreshed Successfully",
+        "refresh_error": "Email Refresh Error: {error}",
+        "refresh_button_not_found": "Refresh Button Not Found",
+        "verification_found": "Verification Found",
+        "verification_not_found": "Verification Not Found",
+        "verification_error": "Verification Error: {error}",
+        "verification_code_found": "Verification Code Found",
+        "verification_code_not_found": "Verification Code Not Found",
+        "verification_code_error": "Verification Code Error: {error}",
+        "address": "Email Address"
     }
 }

locales/zh_cn.json

@@ -4,6 +4,7 @@
         "exit": "退出程序",
         "reset": "重置机器标识",
         "register": "注册 Cursor",
+        "register_manual": "手动指定邮箱注册 Cursor",
         "quit": "退出 Cursor",
         "select_language": "选择语言",
         "input_choice": "输入选择 ({choices})",
@@ -26,13 +27,66 @@
         "timeout": "以下进程未能在规定时间内关闭: {pids}",
         "error": "关闭 Cursor 进程时发生错误: {error}"
     },
+    "reset": {
+        "title": "Cursor 机器标识重置工具",
+        "checking": "检查配置文件",
+        "not_found": "配置文件未找到",
+        "no_permission": "无法读取或写入配置文件，请检查文件权限",
+        "reading": "读取当前配置",
+        "creating_backup": "创建配置备份",
+        "backup_exists": "备份文件已存在，跳过备份步骤",
+        "generating": "生成新机器标识",
+        "saving_json": "保存新配置到JSON",
+        "success": "机器标识重置成功",
+        "new_id": "新机器标识",
+        "permission_error": "权限错误: {error}",
+        "run_as_admin": "请尝试以管理员身份运行此程序",
+        "process_error": "重置进程错误: {error}",
+        "updating_sqlite": "更新SQLite数据库",
+        "updating_pair": "更新键值对",
+        "sqlite_success": "SQLite数据库更新成功",
+        "sqlite_error": "SQLite数据库更新失败: {error}",
+        "press_enter": "按回车键退出",
+        "updating_system_ids": "更新系统ID",
+        "system_ids_updated": "系统ID更新成功",
+        "system_ids_update_failed": "系统ID更新失败: {error}",
+        "unsupported_os": "不支持的操作系统: {os}",
+        "linux_path_not_found": "Linux路径未找到",
+        "windows_guid_updated": "Windows GUID更新成功",
+        "windows_permission_denied": "Windows权限拒绝",
+        "windows_guid_update_failed": "Windows GUID更新失败",
+        "macos_uuid_updated": "macOS UUID更新成功",
+        "plutil_command_failed": "plutil命令失败",
+        "macos_uuid_update_failed": "macOS UUID更新失败",
+        "start_patching": "开始修补getMachineId",
+        "current_version": "当前Cursor版本: {version}",
+        "patch_completed": "getMachineId修补完成",
+        "patch_failed": "getMachineId修补失败: {error}",
+        "version_check_passed": "Cursor版本检查通过",
+        "file_modified": "文件已修改"
+    },
     "register": {
         "title": "Cursor 注册工具",
         "start": "开始注册流程",
+        "browser_started": "浏览器已启动",
+        "password_success": "密码设置完成",
+        "password_error": "密码设置失败: {error}",
+        "waiting_for_page_load": "等待页面加载",
         "mailbox": "成功进入邮箱",
+        "waiting_for_second_verification": "等待第二阶段验证",
+        "waiting_for_verification_code": "等待验证码",
+        "first_verification_passed": "第一阶段验证通过",
         "register_start": "开始注册流程",
+        "form_submitted": "表单已提交，开始验证...",
         "filling_form": "填写注册信息",
+        "visiting_url": "访问URL",
         "basic_info": "基本信息提交完成",
+        "handling_turnstile": "处理 Turnstile 验证",
+        "retry_verification": "重试验证",
+        "detect_turnstile": "检测 Turnstile 验证",
+        "verification_success": "验证成功",
+        "starting_browser": "启动浏览器",
+        "form_success": "表单提交成功",
         "handle_turnstile": "处理 Turnstile 验证",
         "no_turnstile": "未检测到 Turnstile 验证",
         "turnstile_passed": "验证通过",
@@ -68,7 +122,11 @@
         "account_info_saved": "账户信息已保存",
         "save_account_info_failed": "保存账户信息失败",
         "get_email_address": "获取邮箱地址",
-        "register_process_error": "注册流程错误: {error}"
+        "register_process_error": "注册流程错误: {error}",
+        "update_cursor_auth_info": "更新Cursor认证信息",
+        "setting_password": "设置密码",
+        "manual_code_input": "手动输入验证码",
+        "manual_email_input": "手动输入邮箱"
     },
     "auth": {
         "title": "Cursor 认证管理器",
@@ -81,13 +139,18 @@
         "auth_update_failed": "认证信息更新失败: {error}",
         "auth_file_created": "认证文件已创建",
         "auth_file_create_failed": "认证文件创建失败: {error}",
-        "press_enter": "按回车键退出"
+        "press_enter": "按回车键退出",
+        "connected_to_database": "已连接到数据库",
+        "database_updated_successfully": "数据库更新成功",
+        "database_connection_closed": "数据库连接已关闭",
+        "updating_pair": "更新键值对"
     },
     "control": {
         "generate_email": "生成新邮箱",
         "select_domain": "选择随机域名",
         "copy_email": "复制邮箱地址",
         "enter_mailbox": "进入邮箱",
+        "blocked_domain": "被屏蔽的域名",
         "refresh_mailbox": "刷新邮箱",
         "check_verification": "检查验证码",
         "verification_found": "找到验证码",
@@ -110,6 +173,25 @@
         "get_cursor_session_token": "获取Cursor Session Token",
         "get_cursor_session_token_success": "获取Cursor Session Token成功",
         "get_cursor_session_token_failed": "获取Cursor Session Token失败",
-        "save_token_failed": "保存Token失败"
+        "save_token_failed": "保存Token失败",
+        "no_valid_verification_code": "没有有效的验证码"
+    },
+    "email": {
+        "starting_browser": "启动浏览器",
+        "visiting_site": "访问 smailpro.com",
+        "create_success": "邮箱创建成功",
+        "create_failed": "邮箱创建失败",
+        "create_error": "邮箱创建错误: {error}",
+        "refreshing": "刷新邮箱",
+        "refresh_success": "邮箱刷新成功",
+        "refresh_error": "邮箱刷新错误: {error}",
+        "refresh_button_not_found": "未找到刷新按钮",
+        "verification_found": "找到验证码",
+        "verification_not_found": "未找到验证码",
+        "verification_error": "验证错误: {error}",
+        "verification_code_found": "找到验证码",
+        "verification_code_not_found": "未找到验证码",
+        "verification_code_error": "验证码错误: {error}",
+        "address": "邮箱地址"
     }
 } 

locales/zh_tw.json

@@ -4,6 +4,7 @@
         "exit": "退出程序",
         "reset": "重置機器標識",
         "register": "註冊 Cursor",
+        "register_manual": "手動指定郵箱註冊 Cursor",
         "quit": "退出 Cursor",
         "select_language": "選擇語言",
         "input_choice": "輸入選擇 ({choices})",
@@ -26,17 +27,70 @@
         "timeout": "以下進程未能在規定時間內關閉: {pids}",
         "error": "關閉 Cursor 進程時發生錯誤: {error}"
     },
+    "reset": {
+        "title": "Cursor 機器標識重置工具",
+        "checking": "檢查配置文件",
+        "not_found": "配置文件未找到",
+        "no_permission": "無法讀取或寫入配置文件，請檢查文件權限",
+        "reading": "讀取當前配置",
+        "creating_backup": "創建配置備份",
+        "backup_exists": "備份文件已存在，跳過備份步驟",
+        "generating": "生成新機器標識",
+        "saving_json": "保存新配置到JSON",
+        "success": "機器標識重置成功",
+        "new_id": "新機器標識",
+        "permission_error": "權限錯誤: {error}",
+        "run_as_admin": "請嘗試以管理員身份運行此程序",
+        "process_error": "重置進程錯誤: {error}",
+        "updating_sqlite": "更新SQLite數據庫",
+        "updating_pair": "更新鍵值對",
+        "sqlite_success": "SQLite數據庫更新成功",
+        "sqlite_error": "SQLite數據庫更新失敗: {error}",
+        "press_enter": "按回車鍵退出",
+        "updating_system_ids": "更新系統ID",
+        "system_ids_updated": "系統ID更新成功",
+        "system_ids_update_failed": "系統ID更新失敗: {error}",
+        "unsupported_os": "不支持的操作系統: {os}",
+        "linux_path_not_found": "Linux路徑未找到",
+        "windows_guid_updated": "Windows GUID更新成功",
+        "windows_permission_denied": "Windows權限拒絕",
+        "windows_guid_update_failed": "Windows GUID更新失敗",
+        "macos_uuid_updated": "macOS UUID更新成功",
+        "plutil_command_failed": "plutil命令失敗",
+        "macos_uuid_update_failed": "macOS UUID更新失敗",
+        "start_patching": "開始修補getMachineId",
+        "current_version": "當前Cursor版本: {version}",
+        "patch_completed": "getMachineId修補完成",
+        "patch_failed": "getMachineId修補失敗: {error}",
+        "version_check_passed": "Cursor版本檢查通過",
+        "file_modified": "文件已修改"
+    },
     "register": {
         "title": "Cursor 註冊工具",
         "start": "開始註冊流程",
         "mailbox": "成功進入郵箱",
+        "browser_started": "瀏覽器已啟動",
+        "waiting_for_page_load": "等待頁面加載",
+        "password_success": "密碼設置完成",
+        "password_error": "密碼設置失敗: {error}",
+        "visiting_url": "訪問URL",
+        "first_verification_passed": "第一階段驗證通過",
         "register_start": "開始註冊流程",
+        "form_submitted": "表單已提交，開始驗證...",
+        "waiting_for_second_verification": "等待第二階段驗證",
         "filling_form": "填寫註冊信息",
         "basic_info": "基本信息提交完成",
         "handle_turnstile": "處理 Turnstile 驗證",
         "no_turnstile": "未檢測到 Turnstile 驗證",
         "turnstile_passed": "驗證通過",
         "verification_start": "開始獲取驗證碼",
+        "waiting_for_verification_code": "等待驗證碼",
+        "handling_turnstile": "處理 Turnstile 驗證",
+        "retry_verification": "重試驗證",
+        "detect_turnstile": "檢測 Turnstile 驗證",
+        "verification_success": "驗證成功",
+        "starting_browser": "啟動瀏覽器",
+        "form_success": "表單提交成功",
         "verification_timeout": "獲取驗證碼超時",
         "verification_not_found": "未找到驗證碼",
         "try_get_code": "第 {attempt} 次嘗試獲取驗證碼 | 剩餘時間: {time}秒",
@@ -68,7 +122,11 @@
         "account_info_saved": "賬戶信息已保存",
         "save_account_info_failed": "保存賬戶信息失敗",
         "get_email_address": "獲取郵箱地址",
-        "register_process_error": "註冊流程錯誤: {error}"
+        "register_process_error": "註冊流程錯誤: {error}",
+        "update_cursor_auth_info": "更新Cursor認證信息",
+        "setting_password": "設置密碼",
+        "manual_code_input": "手動輸入驗證碼",
+        "manual_email_input": "手動輸入郵箱地址"
     },
     "auth": {
         "title": "Cursor 認證管理器",
@@ -81,7 +139,11 @@
         "auth_update_failed": "認證信息更新失敗: {error}",
         "auth_file_created": "認證文件已創建",
         "auth_file_create_failed": "認證文件創建失敗: {error}",
-        "press_enter": "按回車鍵退出"
+        "press_enter": "按回車鍵退出",
+        "connected_to_database": "已連接到數據庫",
+        "database_updated_successfully": "數據庫更新成功",
+        "database_connection_closed": "數據庫連接已關閉",
+        "updating_pair": "更新鍵值對"
     },
     "control": {
         "generate_email": "生成新郵箱",
@@ -110,6 +172,27 @@
         "get_cursor_session_token": "獲取Cursor Session Token",
         "get_cursor_session_token_success": "獲取Cursor Session Token成功",
         "get_cursor_session_token_failed": "獲取Cursor Session Token失敗",
-        "save_token_failed": "保存Token失敗"
-    }
+        "save_token_failed": "保存Token失敗",
+        "blocked_domain": "被屏蔽的域名",
+        "no_valid_verification_code": "沒有有效的驗證碼"
+    },
+    "email": {
+        "starting_browser": "啟動瀏覽器",
+        "visiting_site": "訪問 smailpro.com",
+        "create_success": "郵箱創建成功",
+        "create_failed": "郵箱創建失敗",
+        "create_error": "郵箱創建錯誤: {error}",
+        "refreshing": "刷新郵箱",
+        "refresh_success": "郵箱刷新成功",
+        "refresh_error": "郵箱刷新錯誤: {error}",
+        "refresh_button_not_found": "未找到刷新按鈕",
+        "verification_found": "找到驗證碼",
+        "verification_not_found": "未找到驗證碼",
+        "verification_error": "驗證錯誤: {error}",
+        "verification_code_found": "找到驗證碼",
+        "verification_code_not_found": "未找到驗證碼",
+        "verification_code_error": "驗證碼錯誤: {error}",
+        "address": "郵箱地址"
+    }   
+
 } 

logo.py

@@ -2,8 +2,14 @@ from colorama import Fore, Style, init
 from dotenv import load_dotenv
 import os
 
-# 加載環境變量獲取版本號
-load_dotenv()
+# 獲取當前腳本所在目錄
+current_dir = os.path.dirname(os.path.abspath(__file__))
+# 構建.env文件的完整路徑
+env_path = os.path.join(current_dir, '.env')
+
+# 加載環境變量，指定.env文件路徑
+load_dotenv(env_path)
+# 獲取版本號，如果未找到則使用默認值
 version = os.getenv('VERSION', '1.0.0')
 
 # 初始化 colorama
@@ -29,6 +35,5 @@ CURSOR_LOGO = f"""
 def print_logo():
     print(CURSOR_LOGO)
 
-
 if __name__ == "__main__":
     print_logo()

main.py

@@ -42,11 +42,17 @@ class Translator:
     
     def get(self, key, **kwargs):
         """获取翻译文本"""
-        keys = key.split('.')
-        value = self.translations.get(self.current_language, {})
-        for k in keys:
-            value = value.get(k, key)
-        return value.format(**kwargs) if kwargs else value
+        try:
+            keys = key.split('.')
+            value = self.translations.get(self.current_language, {})
+            for k in keys:
+                if isinstance(value, dict):
+                    value = value.get(k, key)
+                else:
+                    return key  # 如果中間值不是字典，返回原始key
+            return value.format(**kwargs) if kwargs else value
+        except Exception:
+            return key  # 出現任何錯誤時返回原始key
     
     def set_language(self, lang_code):
         """设置当前语言"""
@@ -65,8 +71,9 @@ def print_menu():
     print(f"{Fore.GREEN}0{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.exit')}")
     print(f"{Fore.GREEN}1{Style.RESET_ALL}. {EMOJI['RESET']} {translator.get('menu.reset')}")
     print(f"{Fore.GREEN}2{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register')}")
-    print(f"{Fore.GREEN}3{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.quit')}")
-    print(f"{Fore.GREEN}4{Style.RESET_ALL}. {EMOJI['LANG']} {translator.get('menu.select_language')}")
+    print(f"{Fore.GREEN}3{Style.RESET_ALL}. {EMOJI['SUCCESS']} {translator.get('menu.register_manual')}")
+    print(f"{Fore.GREEN}4{Style.RESET_ALL}. {EMOJI['ERROR']} {translator.get('menu.quit')}")
+    print(f"{Fore.GREEN}5{Style.RESET_ALL}. {EMOJI['LANG']} {translator.get('menu.select_language')}")
     print(f"{Fore.YELLOW}{'─' * 40}{Style.RESET_ALL}")
 
 def select_language():
@@ -111,10 +118,14 @@ def main():
                 cursor_register.main(translator)
                 break
             elif choice == "3":
+                import cursor_register_manual
+                cursor_register_manual.main(translator)
+                break
+            elif choice == "4":
                 import quit_cursor
                 quit_cursor.quit_cursor(translator)
                 break
-            elif choice == "4":
+            elif choice == "5":
                 if select_language():
                     print_menu()
                 continue

new_signup.py

@@ -0,0 +1,588 @@
+from DrissionPage import ChromiumOptions, ChromiumPage
+import time
+import os
+import signal
+import random
+from colorama import Fore, Style
+
+# 在文件开头添加全局变量
+_translator = None
+
+def cleanup_chrome_processes(translator=None):
+    """清理所有Chrome相关进程"""
+    print("\n正在清理Chrome进程...")
+    try:
+        if os.name == 'nt':
+            os.system('taskkill /F /IM chrome.exe /T 2>nul')
+            os.system('taskkill /F /IM chromedriver.exe /T 2>nul')
+        else:
+            os.system('pkill -f chrome')
+            os.system('pkill -f chromedriver')
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.cleanup_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"清理进程时出错: {e}")
+
+def signal_handler(signum, frame):
+    """处理Ctrl+C信号"""
+    global _translator
+    if _translator:
+        print(f"{Fore.CYAN}{_translator.get('register.exit_signal')}{Style.RESET_ALL}")
+    else:
+        print("\n接收到退出信号，正在关闭...")
+    cleanup_chrome_processes(_translator)
+    os._exit(0)
+
+def simulate_human_input(page, url, translator=None):
+    """访问网址"""
+    if translator:
+        print(f"{Fore.CYAN}🚀 {translator.get('register.visiting_url')}: {url}{Style.RESET_ALL}")
+    else:
+        print("正在访问网址...")
+    
+    # 先访问空白页面
+    page.get('about:blank')
+    time.sleep(random.uniform(1.0, 2.0))
+    
+    # 访问目标页面
+    page.get(url)
+    time.sleep(random.uniform(2.0, 3.0))  # 等待页面加载
+
+def fill_signup_form(page, first_name, last_name, email, translator=None):
+    """填写注册表单"""
+    try:
+        if translator:
+            print(f"{Fore.CYAN}📧 {translator.get('register.filling_form')}{Style.RESET_ALL}")
+        else:
+            print("\n正在填写注册表单...")
+        
+        # 填写名字
+        first_name_input = page.ele("@name=first_name")
+        if first_name_input:
+            first_name_input.input(first_name)
+            time.sleep(random.uniform(0.5, 1.0))
+        
+        # 填写姓氏
+        last_name_input = page.ele("@name=last_name")
+        if last_name_input:
+            last_name_input.input(last_name)
+            time.sleep(random.uniform(0.5, 1.0))
+        
+        # 填写邮箱
+        email_input = page.ele("@name=email")
+        if email_input:
+            email_input.input(email)
+            time.sleep(random.uniform(0.5, 1.0))
+        
+        # 点击提交按钮
+        submit_button = page.ele("@type=submit")
+        if submit_button:
+            submit_button.click()
+            time.sleep(random.uniform(2.0, 3.0))
+            
+        if translator:
+            print(f"{Fore.GREEN}✅ {translator.get('register.form_success')}{Style.RESET_ALL}")
+        else:
+            print("表单填写完成")
+        return True
+        
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.form_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"填写表单时出错: {e}")
+        return False
+
+def setup_driver(translator=None):
+    """设置浏览器驱动"""
+    co = ChromiumOptions()
+    
+    # 使用无痕模式
+    co.set_argument("--incognito")
+    
+    # 设置随机端口
+    co.auto_port()
+    
+    # 使用有头模式(一定要设置为False，模擬人類操作)
+    co.headless(False)
+    
+    try:
+        # 加载插件
+        extension_path = os.path.join(os.getcwd(), "turnstilePatch")
+        if os.path.exists(extension_path):
+            co.set_argument("--allow-extensions-in-incognito")
+            co.add_extension(extension_path)
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.extension_load_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"加载插件失败: {e}")
+    
+    if translator:
+        print(f"{Fore.CYAN}🚀 {translator.get('register.starting_browser')}{Style.RESET_ALL}")
+    else:
+        print("正在启动浏览器...")
+    page = ChromiumPage(co)
+    
+    return page
+
+def handle_turnstile(page, translator=None):
+    """处理 Turnstile 验证"""
+    try:
+        if translator:
+            print(f"{Fore.CYAN}🔄 {translator.get('register.handling_turnstile')}{Style.RESET_ALL}")
+        else:
+            print("\n正在处理 Turnstile 验证...")
+        
+        max_retries = 2
+        retry_count = 0
+
+        while retry_count < max_retries:
+            retry_count += 1
+            if translator:
+                print(f"{Fore.CYAN}🔄 {translator.get('register.retry_verification', attempt=retry_count)}{Style.RESET_ALL}")
+            else:
+                print(f"第 {retry_count} 次尝试验证...")
+
+            try:
+                # 尝试重置 turnstile
+                page.run_js("try { turnstile.reset() } catch(e) { }")
+                time.sleep(2)
+
+                # 定位验证框元素
+                challenge_check = (
+                    page.ele("@id=cf-turnstile", timeout=2)
+                    .child()
+                    .shadow_root.ele("tag:iframe")
+                    .ele("tag:body")
+                    .sr("tag:input")
+                )
+
+                if challenge_check:
+                    if translator:
+                        print(f"{Fore.CYAN}🔄 {translator.get('register.detect_turnstile')}{Style.RESET_ALL}")
+                    else:
+                        print("检测到验证框...")
+                    
+                    # 随机延时后点击验证
+                    time.sleep(random.uniform(1, 3))
+                    challenge_check.click()
+                    time.sleep(2)
+
+                    # 检查验证结果
+                    if check_verification_success(page, translator):
+                        if translator:
+                            print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                        else:
+                            print("验证通过！")
+                        return True
+
+            except Exception as e:
+                if translator:
+                    print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
+                else:
+                    print(f"验证尝试失败: {e}")
+
+            # 检查是否已经验证成功
+            if check_verification_success(page, translator):
+                if translator:
+                    print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                else:
+                    print("验证通过！")
+                return True
+
+            time.sleep(random.uniform(1, 2))
+
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
+        else:
+            print("超出最大重试次数")
+        return False
+
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.verification_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"验证过程出错: {e}")
+        return False
+
+def check_verification_success(page, translator=None):
+    """检查验证是否成功"""
+    try:
+        # 检查是否存在后续表单元素，这表示验证已通过
+        if (page.ele("@name=password", timeout=0.5) or 
+            page.ele("@name=email", timeout=0.5) or
+            page.ele("@data-index=0", timeout=0.5) or
+            page.ele("Account Settings", timeout=0.5)):
+            return True
+        
+        # 检查是否出现错误消息
+        error_messages = [
+            'xpath://div[contains(text(), "Can\'t verify the user is human")]',
+            'xpath://div[contains(text(), "Error: 600010")]',
+            'xpath://div[contains(text(), "Please try again")]'
+        ]
+        
+        for error_xpath in error_messages:
+            if page.ele(error_xpath):
+                return False
+            
+        return False
+    except:
+        return False
+
+def generate_password(length=12):
+    """生成随机密码"""
+    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*"
+    return ''.join(random.choices(chars, k=length))
+
+def fill_password(page, password, translator=None):
+    """填写密码"""
+    try:
+        if translator:
+            print(f"{Fore.CYAN}🔑 {translator.get('register.setting_password')}{Style.RESET_ALL}")
+        else:
+            print("\n正在设置密码...")
+        password_input = page.ele("@name=password")
+        if password_input:
+            password_input.input(password)
+            time.sleep(random.uniform(0.5, 1.0))
+            
+            submit_button = page.ele("@type=submit")
+            if submit_button:
+                submit_button.click()
+                time.sleep(random.uniform(2.0, 3.0))
+                
+            if translator:
+                print(f"{Fore.GREEN}✅ {translator.get('register.password_success')}{Style.RESET_ALL}")
+            else:
+                print(f"密码设置完成: {password}")
+            return True
+            
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.password_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"设置密码时出错: {e}")
+        return False
+
+def handle_verification_code(browser_tab, email_tab, controller, email, password, translator=None):
+    """处理验证码"""
+    try:
+        if translator:
+            print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_verification_code')}{Style.RESET_ALL}")
+        else:
+            print("\n等待并获取验证码...")
+            
+        # 检查是否使用手动输入验证码
+        if hasattr(controller, 'get_verification_code') and email_tab is None:  # 手动模式
+            verification_code = controller.get_verification_code()
+            if verification_code:
+                # 在注册页面填写验证码
+                for i, digit in enumerate(verification_code):
+                    browser_tab.ele(f"@data-index={i}").input(digit)
+                    time.sleep(random.uniform(0.1, 0.3))
+                
+                print("验证码填写完成")
+                time.sleep(3)
+                
+                # 处理最后一次 Turnstile 验证
+                if handle_turnstile(browser_tab, translator):
+                    if translator:
+                        print(f"{translator.get('register.verification_success')}")
+                    else:
+                        print("最后一次验证通过！")
+                    time.sleep(2)
+                    
+                    # 访问设置页面
+                    print("访问设置页面...")
+                    browser_tab.get("https://www.cursor.com/settings")
+                    time.sleep(3)  # 等待页面加载
+                    return True, browser_tab
+                    
+                return False, None
+                
+        # 自动获取验证码逻辑
+        elif email_tab:
+            print("等待验证码邮件...")
+            time.sleep(5)  # 等待验证码邮件
+
+            # 使用已有的 email_tab 刷新邮箱
+            email_tab.refresh_inbox()
+            time.sleep(3)
+
+            # 检查邮箱是否有验证码邮件
+            if email_tab.check_for_cursor_email():
+                verification_code = email_tab.get_verification_code()
+                if verification_code:
+                    # 在注册页面填写验证码
+                    for i, digit in enumerate(verification_code):
+                        browser_tab.ele(f"@data-index={i}").input(digit)
+                        time.sleep(random.uniform(0.1, 0.3))
+                    if translator:
+                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                    else:
+                        print("验证码填写完成")
+                    time.sleep(3)
+                    
+                    # 处理最后一次 Turnstile 验证
+                    if handle_turnstile(browser_tab, translator):
+                        if translator:
+                            print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                        else:
+                            print("最后一次验证通过！")
+                        time.sleep(2)
+                        
+                        # 访问设置页面
+                        if translator:
+                            print(f"{Fore.CYAN}🔑 {translator.get('register.visiting_url')}: https://www.cursor.com/settings{Style.RESET_ALL}")
+                        else:
+                            print("访问设置页面...")
+                        browser_tab.get("https://www.cursor.com/settings")
+                        time.sleep(3)  # 等待页面加载
+                        return True, browser_tab
+                        
+                    else:
+                        if translator:
+                            print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
+                        else:
+                            print("最后一次验证失败")
+                        return False, None
+                        
+            # 获取验证码，设置超时
+            verification_code = None
+            max_attempts = 20
+            retry_interval = 10
+            start_time = time.time()
+            timeout = 160
+
+            if translator:
+                print(f"{Fore.CYAN}{translator.get('register.start_getting_verification_code')}{Style.RESET_ALL}")
+            else:
+                print("开始获取验证码...")
+            
+            for attempt in range(max_attempts):
+                # 检查是否超时
+                if time.time() - start_time > timeout:
+                    if translator:
+                        print(f"{Fore.RED}❌ {translator.get('register.verification_timeout')}{Style.RESET_ALL}")
+                    else:
+                        print("获取验证码超时...")
+                    break
+                    
+                verification_code = controller.get_verification_code()
+                if verification_code:
+                    if translator:
+                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                    else:
+                        print(f"成功获取验证码: {verification_code}")
+                    break
+                    
+                remaining_time = int(timeout - (time.time() - start_time))
+                if translator:
+                    print(f"{Fore.CYAN}{translator.get('register.try_get_code', attempt=attempt + 1, time=remaining_time)}{Style.RESET_ALL}")
+                else:
+                    print(f"第 {attempt + 1} 次尝试获取验证码，剩余时间: {remaining_time}秒...")
+                
+                # 刷新邮箱
+                email_tab.refresh_inbox()
+                time.sleep(retry_interval)
+            
+            if verification_code:
+                # 在注册页面填写验证码
+                for i, digit in enumerate(verification_code):
+                    browser_tab.ele(f"@data-index={i}").input(digit)
+                    time.sleep(random.uniform(0.1, 0.3))
+                
+                if translator:
+                    print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                else:
+                    print("验证码填写完成")
+                time.sleep(3)
+                
+                # 处理最后一次 Turnstile 验证
+                if handle_turnstile(browser_tab, translator):
+                    if translator:
+                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
+                    else:
+                        print("最后一次验证通过！")
+                    time.sleep(2)
+                    
+                    # 直接访问设置页面
+                    if translator:
+                        print(f"{Fore.CYAN}{translator.get('register.visiting_url')}: https://www.cursor.com/settings{Style.RESET_ALL}")
+                    else:
+                        print("访问设置页面...")
+                    browser_tab.get("https://www.cursor.com/settings")
+                    time.sleep(3)  # 等待页面加载
+                    
+                    # 直接返回成功，让 cursor_register.py 处理账户信息获取
+                    return True, browser_tab
+                    
+                else:
+                    if translator:
+                        print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
+                    else:
+                        print("最后一次验证失败")
+                    return False, None
+                
+            return False, None
+            
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.verification_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"处理验证码时出错: {e}")
+        return False, None
+
+def handle_sign_in(browser_tab, email, password, translator=None):
+    """处理登录流程"""
+    try:
+        # 检查是否在登录页面
+        sign_in_header = browser_tab.ele('xpath://h1[contains(text(), "Sign in")]')
+        if not sign_in_header:
+            return True  # 如果不是登录页面，说明已经登录成功
+            
+        print(f"{Fore.CYAN}检测到登录页面，开始登录...{Style.RESET_ALL}")
+        
+        # 填写邮箱
+        email_input = browser_tab.ele('@name=email')
+        if email_input:
+            email_input.input(email)
+            time.sleep(1)
+            
+            # 点击 Continue
+            continue_button = browser_tab.ele('xpath://button[contains(@class, "BrandedButton") and text()="Continue"]')
+            if continue_button:
+                continue_button.click()
+                time.sleep(2)
+                
+                # 处理 Turnstile 验证
+                if handle_turnstile(browser_tab, translator):
+                    # 填写密码
+                    password_input = browser_tab.ele('@name=password')
+                    if password_input:
+                        password_input.input(password)
+                        time.sleep(1)
+                        
+                        # 点击 Sign in
+                        sign_in_button = browser_tab.ele('xpath://button[@name="intent" and @value="password"]')
+                        if sign_in_button:
+                            sign_in_button.click()
+                            time.sleep(2)
+                            
+                            # 处理最后一次 Turnstile 验证
+                            if handle_turnstile(browser_tab, translator):
+                                print(f"{Fore.GREEN}登录成功！{Style.RESET_ALL}")
+                                time.sleep(3)
+                                return True
+                                
+        print(f"{Fore.RED}登录失败{Style.RESET_ALL}")
+        return False
+        
+    except Exception as e:
+        print(f"{Fore.RED}登录过程出错: {str(e)}{Style.RESET_ALL}")
+        return False
+
+def main(email=None, password=None, first_name=None, last_name=None, email_tab=None, controller=None, translator=None):
+    """主函数，可以接收账号信息、邮箱标签页和翻译器"""
+    global _translator
+    _translator = translator  # 保存到全局变量
+    
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+    
+    page = None
+    success = False
+    try:
+        page = setup_driver(translator)
+        if translator:
+            print(f"{Fore.CYAN}🚀 {translator.get('register.browser_started')}{Style.RESET_ALL}")
+        else:
+            print("浏览器已启动")
+        
+        # 访问注册页面
+        url = "https://authenticator.cursor.sh/sign-up"
+        if translator:
+            print(f"\n{Fore.CYAN}{translator.get('register.visiting_url')}: {url}{Style.RESET_ALL}")
+        else:
+            print(f"\n正在访问: {url}")
+        
+        # 访问页面
+        simulate_human_input(page, url, translator)
+        if translator:
+            print(f"{Fore.CYAN}{translator.get('register.waiting_for_page_load')}{Style.RESET_ALL}")
+        else:
+            print("等待页面加载...")
+        time.sleep(5)
+        
+        # 如果没有提供账号信息，则生成随机信息
+        if not all([email, password, first_name, last_name]):
+            first_name = ''.join(random.choices('abcdefghijklmnopqrstuvwxyz', k=6)).capitalize()
+            last_name = ''.join(random.choices('abcdefghijklmnopqrstuvwxyz', k=6)).capitalize()
+            email = f"{first_name.lower()}{random.randint(100,999)}@example.com"
+            password = generate_password()
+            
+            # 保存账号信息
+            with open('test_accounts.txt', 'a', encoding='utf-8') as f:
+                f.write(f"\n{'='*50}\n")
+                f.write(f"Email: {email}\n")
+                f.write(f"Password: {password}\n")
+                f.write(f"{'='*50}\n")
+        
+        # 填写表单
+        if fill_signup_form(page, first_name, last_name, email, translator):
+            if translator:
+                print(f"\n{Fore.GREEN}{translator.get('register.form_submitted')}{Style.RESET_ALL}")
+            else:
+                print("\n表单已提交，开始验证...")
+            
+            # 处理第一次 Turnstile 验证
+            if handle_turnstile(page, translator):
+                if translator:
+                    print(f"\n{Fore.GREEN}{translator.get('register.first_verification_passed')}{Style.RESET_ALL}")
+                else:
+                    print("\n第一阶段验证通过！")
+                
+                # 填写密码
+                if fill_password(page, password, translator):
+                    if translator:
+                        print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_second_verification')}{Style.RESET_ALL}")
+                    else:
+                        print("\n等待第二次验证...")
+                    time.sleep(2)
+                    
+                    # 处理第二次 Turnstile 验证
+                    if handle_turnstile(page, translator):
+                        if translator:
+                            print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_verification_code')}{Style.RESET_ALL}")
+                        else:
+                            print("\n开始处理验证码...")
+                        if handle_verification_code(page, email_tab, controller, email, password, translator):
+                            success = True
+                            return True, page  # 返回浏览器实例
+                        else:
+                            print("\n验证码处理失败")
+                    else:
+                        print("\n第二次验证失败")
+                else:
+                    print("\n密码设置失败")
+            else:
+                print("\n第一次验证失败")
+        
+        return False, None
+        
+    except Exception as e:
+        print(f"发生错误: {e}")
+        return False, None
+    finally:
+        if page and not success:  # 只在失败时清理
+            try:
+                page.quit()
+            except:
+                pass
+            cleanup_chrome_processes(translator)
+
+if __name__ == "__main__":
+    main()  # 直接运行时不传参数，使用随机生成的信息 

new_tempemail.py

@@ -0,0 +1,226 @@
+from DrissionPage import ChromiumPage, ChromiumOptions
+import time
+import os
+import sys
+from colorama import Fore, Style, init
+
+# 初始化 colorama
+init()
+
+class NewTempEmail:
+    def __init__(self, translator=None):
+        self.translator = translator
+        self.page = None
+        self.setup_browser()
+        
+    def get_extension_block(self):
+        """获取插件路径"""
+        root_dir = os.getcwd()
+        extension_path = os.path.join(root_dir, "PBlock")
+        
+        if hasattr(sys, "_MEIPASS"):
+            extension_path = os.path.join(sys._MEIPASS, "PBlock")
+
+        if not os.path.exists(extension_path):
+            raise FileNotFoundError(f"插件不存在: {extension_path}")
+
+        return extension_path
+        
+    def setup_browser(self):
+        """设置浏览器"""
+        try:
+            if self.translator:
+                print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.starting_browser')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.CYAN}ℹ️ 正在启动浏览器...{Style.RESET_ALL}")
+            
+            # 创建浏览器选项
+            co = ChromiumOptions()
+            co.set_argument("--headless=new")
+            
+            co.auto_port()  # 自动设置端口
+            
+            # 加载 uBlock 插件
+            try:
+                extension_path = self.get_extension_block()
+                co.set_argument("--allow-extensions-in-incognito")
+                co.add_extension(extension_path)
+            except Exception as e:
+                if self.translator:
+                    print(f"{Fore.YELLOW}⚠️ {self.translator.get('email.extension_load_error')}: {str(e)}{Style.RESET_ALL}")
+                else:
+                    print(f"{Fore.YELLOW}⚠️ 加载插件失败: {str(e)}{Style.RESET_ALL}")
+            
+            self.page = ChromiumPage(co)
+            return True
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.browser_start_error')}: {str(e)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 启动浏览器失败: {str(e)}{Style.RESET_ALL}")
+            return False
+            
+    def create_email(self):
+        """创建临时邮箱"""
+        try:
+            if self.translator:
+                print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.visiting_site')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.CYAN}ℹ️ 正在访问 smailpro.com...{Style.RESET_ALL}")
+            
+            # 访问网站
+            self.page.get("https://smailpro.com/")
+            time.sleep(2)
+            
+            # 点击创建邮箱按钮
+            create_button = self.page.ele('xpath://button[@title="Create temporary email"]')
+            if create_button:
+                create_button.click()
+                time.sleep(1)
+                
+                # 点击弹窗中的 Create 按钮
+                modal_create_button = self.page.ele('xpath://button[contains(text(), "Create")]')
+                if modal_create_button:
+                    modal_create_button.click()
+                    time.sleep(2)
+                    
+                    # 获取邮箱地址 - 修改选择器
+                    email_div = self.page.ele('xpath://div[@class="text-base sm:text-lg md:text-xl text-gray-700"]')
+                    if email_div:
+                        email = email_div.text.strip()
+                        if '@' in email:  # 验证是否是有效的邮箱地址
+                            if self.translator:
+                                print(f"{Fore.GREEN}✅ {self.translator.get('email.create_success')}: {email}{Style.RESET_ALL}")
+                            else:
+                                print(f"{Fore.GREEN}✅ 创建邮箱成功: {email}{Style.RESET_ALL}")
+                            return email
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.create_failed')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 创建邮箱失败{Style.RESET_ALL}")
+            return None
+            
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.create_error')}: {str(e)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 创建邮箱出错: {str(e)}{Style.RESET_ALL}")
+            return None
+            
+    def close(self):
+        """关闭浏览器"""
+        if self.page:
+            self.page.quit()
+
+    def refresh_inbox(self):
+        """刷新邮箱"""
+        try:
+            if self.translator:
+                print(f"{Fore.CYAN}🔄 {self.translator.get('email.refreshing')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.CYAN}🔄 正在刷新邮箱...{Style.RESET_ALL}")
+            
+            # 点击刷新按钮
+            refresh_button = self.page.ele('xpath://button[@id="refresh"]')
+            if refresh_button:
+                refresh_button.click()
+                time.sleep(2)  # 等待刷新完成
+                if self.translator:
+                    print(f"{Fore.GREEN}✅ {self.translator.get('email.refresh_success')}{Style.RESET_ALL}")
+                else:
+                    print(f"{Fore.GREEN}✅ 邮箱刷新成功{Style.RESET_ALL}")
+                return True
+            
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.refresh_button_not_found')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 未找到刷新按钮{Style.RESET_ALL}")
+            return False
+            
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.refresh_error')}: {str(e)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 刷新邮箱出错: {str(e)}{Style.RESET_ALL}")
+            return False
+
+    def check_for_cursor_email(self):
+        """检查是否有 Cursor 的验证邮件"""
+        try:
+            # 查找验证邮件 - 使用更精确的选择器
+            email_div = self.page.ele('xpath://div[contains(@class, "p-2") and contains(@class, "cursor-pointer") and contains(@class, "bg-white") and contains(@class, "shadow") and .//b[text()="no-reply@cursor.sh"] and .//span[text()="Verify your email address"]]')
+            if email_div:
+                if self.translator:
+                    print(f"{Fore.GREEN}✅ {self.translator.get('email.verification_found')}{Style.RESET_ALL}")
+                else:
+                    print(f"{Fore.GREEN}✅ 找到验证邮件{Style.RESET_ALL}")
+                # 使用 JavaScript 点击元素
+                self.page.run_js('arguments[0].click()', email_div)
+                time.sleep(2)  # 等待邮件内容加载
+                return True
+            if self.translator:
+                print(f"{Fore.YELLOW}⚠️ {self.translator.get('email.verification_not_found')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.YELLOW}⚠️ 未找到验证邮件{Style.RESET_ALL}")
+            return False
+            
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.verification_error')}: {str(e)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 检查验证邮件出错: {str(e)}{Style.RESET_ALL}")
+            return False
+
+    def get_verification_code(self):
+        """获取验证码"""
+        try:
+            # 查找验证码元素
+            code_element = self.page.ele('xpath://td//div[contains(@style, "font-size:28px") and contains(@style, "letter-spacing:2px")]')
+            if code_element:
+                code = code_element.text.strip()
+                if code.isdigit() and len(code) == 6:
+                    if self.translator:
+                        print(f"{Fore.GREEN}✅ {self.translator.get('email.verification_code_found')}: {code}{Style.RESET_ALL}")
+                    else:
+                        print(f"{Fore.GREEN}✅ 获取验证码成功: {code}{Style.RESET_ALL}")
+                    return code
+            if self.translator:
+                print(f"{Fore.YELLOW}⚠️ {self.translator.get('email.verification_code_not_found')}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.YELLOW}⚠️ 未找到有效的验证码{Style.RESET_ALL}")
+            return None
+            
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.RED}❌ {self.translator.get('email.verification_code_error')}: {str(e)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.RED}❌ 获取验证码出错: {str(e)}{Style.RESET_ALL}")
+            return None
+
+def main(translator=None):
+    temp_email = NewTempEmail(translator)
+    
+    try:
+        email = temp_email.create_email()
+        if email:
+            if translator:
+                print(f"\n{Fore.CYAN}📧 {translator.get('email.address')}: {email}{Style.RESET_ALL}")
+            else:
+                print(f"\n{Fore.CYAN}📧 临时邮箱地址: {email}{Style.RESET_ALL}")
+            
+            # 测试刷新功能
+            while True:
+                if translator:
+                    choice = input(f"\n{translator.get('email.refresh_prompt')}: ").lower()
+                else:
+                    choice = input("\n按 R 刷新邮箱，按 Q 退出: ").lower()
+                if choice == 'r':
+                    temp_email.refresh_inbox()
+                elif choice == 'q':
+                    break
+                    
+    finally:
+        temp_email.close()
+
+if __name__ == "__main__":
+    main() 

recaptchaPatch/manifest.json

@@ -1,22 +0,0 @@
-{
-    "manifest_version": 3,
-    "name": "Recaptcha Blocker",
-    "version": "1.0",
-    "description": "Blocks reCAPTCHA from loading",
-    "content_scripts": [
-        {
-            "matches": ["*://yopmail.com/zh/wm*"],
-            "js": ["script.js"],
-            "run_at": "document_start",
-            "all_frames": true
-        }
-    ],
-    "permissions": [
-        "webNavigation",
-         "activeTab"
-    ],
-    "host_permissions": [
-    "*://yopmail.com/*",
-    "*://*.google.com/*"
-    ]
-}

recaptchaPatch/script.js

@@ -1,123 +0,0 @@
-// Debug logging function
-function log(message) {
-    console.log(`[reCAPTCHA Bypass] ${new Date().toISOString()}: ${message}`);
-}
-
-// Function to get element by selector
-function qSelector(selector) {
-    return document.querySelector(selector);
-}
-
-// Constants
-const MAX_ATTEMPTS = 1;
-const SELECTORS = {
-    CHECK_BOX: ".recaptcha-checkbox-border",
-    AUDIO_BUTTON: "#recaptcha-audio-button",
-    PLAY_BUTTON: ".rc-audiochallenge-play-button .rc-button-default",
-    AUDIO_SOURCE: "#audio-source",
-    IMAGE_SELECT: "#rc-imageselect",
-    RESPONSE_FIELD: ".rc-audiochallenge-response-field",
-    AUDIO_ERROR_MESSAGE: ".rc-audiochallenge-error-message",
-    AUDIO_RESPONSE: "#audio-response",
-    RELOAD_BUTTON: "#recaptcha-reload-button",
-    RECAPTCHA_STATUS: "#recaptcha-accessible-status",
-    DOSCAPTCHA: ".rc-doscaptcha-body",
-    VERIFY_BUTTON: "#recaptcha-verify-button"
-};
-
-// Function to check if element is hidden
-function isHidden(el) {
-    return (el.offsetParent === null);
-}
-
-// Function to handle the bypass process
-async function bypassRecaptcha() {
-    try {
-        log('Starting bypass process...');
-        log('Waiting 3 seconds before starting...');
-        await new Promise(resolve => setTimeout(resolve, 3000));
-        
-        let solved = false;
-        let checkBoxClicked = false;
-        let requestCount = 0;
-        
-        const recaptchaInitialStatus = qSelector(SELECTORS.RECAPTCHA_STATUS) ? 
-            qSelector(SELECTORS.RECAPTCHA_STATUS).innerText : "";
-        
-        log('Initial reCAPTCHA status: ' + recaptchaInitialStatus);
-
-        // Main bypass logic
-        try {
-            if (!checkBoxClicked && qSelector(SELECTORS.CHECK_BOX) && 
-                !isHidden(qSelector(SELECTORS.CHECK_BOX))) {
-                log('Clicking checkbox...');
-                qSelector(SELECTORS.CHECK_BOX).click();
-                checkBoxClicked = true;
-            }
-
-            // Check if the captcha is solved
-            if (qSelector(SELECTORS.RECAPTCHA_STATUS) && 
-                (qSelector(SELECTORS.RECAPTCHA_STATUS).innerText != recaptchaInitialStatus)) {
-                solved = true;
-                log('SOLVED!');
-            }
-
-            if (requestCount > MAX_ATTEMPTS) {
-                log('Attempted Max Retries. Stopping the solver');
-                solved = true;
-            }
-
-            // Stop solving when Automated queries message is shown
-            if (qSelector(SELECTORS.DOSCAPTCHA) && 
-                qSelector(SELECTORS.DOSCAPTCHA).innerText.length > 0) {
-                log('Automated Queries Detected');
-            }
-
-        } catch (err) {
-            log(`Error in main bypass logic: ${err.message}`);
-        }
-
-        log('Bypass process completed');
-        
-        // If not solved, retry after delay
-        if (!solved && requestCount < MAX_ATTEMPTS) {
-            requestCount++;
-            log(`Retrying... Attempt ${requestCount} of ${MAX_ATTEMPTS}`);
-            setTimeout(bypassRecaptcha, 2000);
-        }
-
-    } catch (e) {
-        log(`Bypass failed: ${e.message}`);
-    }
-}
-
-// Create a MutationObserver to watch for reCAPTCHA elements
-log('Setting up MutationObserver...');
-const observer = new MutationObserver((mutations) => {
-    mutations.forEach((mutation) => {
-        mutation.addedNodes.forEach((node) => {
-            if (node.nodeType === 1 && // Element node
-                ((node.tagName === 'SCRIPT' && node.src && node.src.includes('recaptcha')) ||
-                 (node.tagName === 'IFRAME' && node.src && node.src.includes('recaptcha')))) {
-                log(`Detected new reCAPTCHA element: ${node.tagName} - ${node.src}`);
-                bypassRecaptcha();
-            }
-        });
-    });
-});
-
-// Start observing
-observer.observe(document, {
-    childList: true,
-    subtree: true
-});
-log('MutationObserver started');
-
-// Run on page load
-if (document.readyState === 'loading') {
-    log('Document still loading, waiting for DOMContentLoaded');
-    document.addEventListener('DOMContentLoaded', bypassRecaptcha);
-} else {
-    log('Document already loaded, starting bypass process');
-    bypassRecaptcha();
-}

reset_machine_manual.py

@@ -5,7 +5,11 @@ import uuid
 import hashlib
 import shutil
 import sqlite3
+import platform
+import re
+import tempfile
 from colorama import Fore, Style, init
+from typing import Tuple
 
 # 初始化colorama
 init()
@@ -20,6 +24,173 @@ EMOJI = {
     "RESET": "🔄",
 }
 
+def get_cursor_paths(translator=None) -> Tuple[str, str]:
+    """根据不同操作系统获取 Cursor 相关路径"""
+    system = platform.system()
+
+    paths_map = {
+        "Darwin": {
+            "base": "/Applications/Cursor.app/Contents/Resources/app",
+            "package": "package.json",
+            "main": "out/main.js",
+        },
+        "Windows": {
+            "base": os.path.join(
+                os.getenv("LOCALAPPDATA", ""), "Programs", "Cursor", "resources", "app"
+            ),
+            "package": "package.json",
+            "main": "out/main.js",
+        },
+        "Linux": {
+            "bases": ["/opt/Cursor/resources/app", "/usr/share/cursor/resources/app"],
+            "package": "package.json",
+            "main": "out/main.js",
+        },
+    }
+
+    if system not in paths_map:
+        raise OSError(translator.get('reset.unsupported_os', system=system) if translator else f"不支持的操作系统: {system}")
+
+    if system == "Linux":
+        for base in paths_map["Linux"]["bases"]:
+            pkg_path = os.path.join(base, paths_map["Linux"]["package"])
+            if os.path.exists(pkg_path):
+                return (pkg_path, os.path.join(base, paths_map["Linux"]["main"]))
+        raise OSError(translator.get('reset.linux_path_not_found') if translator else "在 Linux 系统上未找到 Cursor 安装路径")
+
+    base_path = paths_map[system]["base"]
+    return (
+        os.path.join(base_path, paths_map[system]["package"]),
+        os.path.join(base_path, paths_map[system]["main"]),
+    )
+
+def version_check(version: str, min_version: str = "", max_version: str = "", translator=None) -> bool:
+    """版本号检查"""
+    version_pattern = r"^\d+\.\d+\.\d+$"
+    try:
+        if not re.match(version_pattern, version):
+            print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.invalid_version_format', version=version)}{Style.RESET_ALL}")
+            return False
+
+        def parse_version(ver: str) -> Tuple[int, ...]:
+            return tuple(map(int, ver.split(".")))
+
+        current = parse_version(version)
+
+        if min_version and current < parse_version(min_version):
+            print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.version_too_low', version=version, min_version=min_version)}{Style.RESET_ALL}")
+            return False
+
+        if max_version and current > parse_version(max_version):
+            print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.version_too_high', version=version, max_version=max_version)}{Style.RESET_ALL}")
+            return False
+
+        return True
+
+    except Exception as e:
+        print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.version_check_error', error=str(e))}{Style.RESET_ALL}")
+        return False
+
+def check_cursor_version(translator) -> bool:
+    """检查 Cursor 版本"""
+    try:
+        pkg_path, _ = get_cursor_paths(translator)
+        with open(pkg_path, "r", encoding="utf-8") as f:
+            version = json.load(f)["version"]
+        return version_check(version, min_version="0.45.0", translator=translator)
+    except Exception as e:
+        print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.check_version_failed', error=str(e))}{Style.RESET_ALL}")
+        return False
+
+def modify_main_js(main_path: str, translator) -> bool:
+    """修改 main.js 文件"""
+    try:
+        original_stat = os.stat(main_path)
+        original_mode = original_stat.st_mode
+        original_uid = original_stat.st_uid
+        original_gid = original_stat.st_gid
+
+        with tempfile.NamedTemporaryFile(mode="w", delete=False) as tmp_file:
+            with open(main_path, "r", encoding="utf-8") as main_file:
+                content = main_file.read()
+
+            patterns = {
+                r"async getMachineId\(\)\{return [^??]+\?\?([^}]+)\}": r"async getMachineId(){return \1}",
+                r"async getMacMachineId\(\)\{return [^??]+\?\?([^}]+)\}": r"async getMacMachineId(){return \1}",
+            }
+
+            for pattern, replacement in patterns.items():
+                content = re.sub(pattern, replacement, content)
+
+            tmp_file.write(content)
+            tmp_path = tmp_file.name
+
+        shutil.copy2(main_path, main_path + ".old")
+        shutil.move(tmp_path, main_path)
+
+        os.chmod(main_path, original_mode)
+        if os.name != "nt":
+            os.chown(main_path, original_uid, original_gid)
+
+        print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {translator.get('reset.file_modified')}{Style.RESET_ALL}")
+        return True
+
+    except Exception as e:
+        print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.modify_file_failed', error=str(e))}{Style.RESET_ALL}")
+        if "tmp_path" in locals():
+            os.unlink(tmp_path)
+        return False
+
+def patch_cursor_get_machine_id(translator) -> bool:
+    """修补 Cursor getMachineId 函数"""
+    try:
+        print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('reset.start_patching')}...{Style.RESET_ALL}")
+        
+        # 获取路径
+        pkg_path, main_path = get_cursor_paths(translator)
+        
+        # 检查文件权限
+        for file_path in [pkg_path, main_path]:
+            if not os.path.isfile(file_path):
+                print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.file_not_found', path=file_path)}{Style.RESET_ALL}")
+                return False
+            if not os.access(file_path, os.W_OK):
+                print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.no_write_permission', path=file_path)}{Style.RESET_ALL}")
+                return False
+
+        # 获取版本号
+        try:
+            with open(pkg_path, "r", encoding="utf-8") as f:
+                version = json.load(f)["version"]
+            print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('reset.current_version', version=version)}{Style.RESET_ALL}")
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.read_version_failed', error=str(e))}{Style.RESET_ALL}")
+            return False
+
+        # 检查版本
+        if not version_check(version, min_version="0.45.0", translator=translator):
+            print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.version_not_supported')}{Style.RESET_ALL}")
+            return False
+
+        print(f"{Fore.CYAN}{EMOJI['INFO']} {translator.get('reset.version_check_passed')}{Style.RESET_ALL}")
+
+        # 备份文件
+        backup_path = main_path + ".bak"
+        if not os.path.exists(backup_path):
+            shutil.copy2(main_path, backup_path)
+            print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {translator.get('reset.backup_created', path=backup_path)}{Style.RESET_ALL}")
+
+        # 修改文件
+        if not modify_main_js(main_path, translator):
+            return False
+
+        print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {translator.get('reset.patch_completed')}{Style.RESET_ALL}")
+        return True
+
+    except Exception as e:
+        print(f"{Fore.RED}{EMOJI['ERROR']} {translator.get('reset.patch_failed', error=str(e))}{Style.RESET_ALL}")
+        return False
+
 class MachineIDResetter:
     def __init__(self, translator=None):
         self.translator = translator
@@ -98,7 +269,7 @@ class MachineIDResetter:
                     INSERT OR REPLACE INTO ItemTable (key, value) 
                     VALUES (?, ?)
                 """, (key, value))
-                print(f"{EMOJI['INFO']} {Fore.CYAN}{self.translator.get('reset.updating_pair')}: {key}{Style.RESET_ALL}")
+                print(f"{EMOJI['INFO']} {Fore.CYAN} {self.translator.get('reset.updating_pair')}: {key}{Style.RESET_ALL}")
 
             conn.commit()
             conn.close()
@@ -109,6 +280,59 @@ class MachineIDResetter:
             print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('reset.sqlite_error', error=str(e))}{Style.RESET_ALL}")
             return False
 
+    def update_system_ids(self, new_ids):
+        """更新系统级别的ID"""
+        try:
+            print(f"{Fore.CYAN}{EMOJI['INFO']} {self.translator.get('reset.updating_system_ids')}...{Style.RESET_ALL}")
+            
+            if sys.platform.startswith("win"):
+                self._update_windows_machine_guid()
+            elif sys.platform == "darwin":
+                self._update_macos_platform_uuid(new_ids)
+                
+            print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('reset.system_ids_updated')}{Style.RESET_ALL}")
+            return True
+        except Exception as e:
+            print(f"{Fore.RED}{EMOJI['ERROR']} {self.translator.get('reset.system_ids_update_failed', error=str(e))}{Style.RESET_ALL}")
+            return False
+
+    def _update_windows_machine_guid(self):
+        """更新Windows MachineGuid"""
+        try:
+            import winreg
+            key = winreg.OpenKey(
+                winreg.HKEY_LOCAL_MACHINE,
+                "SOFTWARE\\Microsoft\\Cryptography",
+                0,
+                winreg.KEY_WRITE | winreg.KEY_WOW64_64KEY
+            )
+            new_guid = str(uuid.uuid4())
+            winreg.SetValueEx(key, "MachineGuid", 0, winreg.REG_SZ, new_guid)
+            winreg.CloseKey(key)
+            print("Windows MachineGuid updated successfully")
+        except PermissionError:
+            print("Permission denied: Run as administrator to update Windows MachineGuid")
+            raise
+        except Exception as e:
+            print(f"Failed to update Windows MachineGuid: {e}")
+            raise
+
+    def _update_macos_platform_uuid(self, new_ids):
+        """更新macOS Platform UUID"""
+        try:
+            uuid_file = "/var/root/Library/Preferences/SystemConfiguration/com.apple.platform.uuid.plist"
+            if os.path.exists(uuid_file):
+                # 使用sudo来执行plutil命令
+                cmd = f'sudo plutil -replace "UUID" -string "{new_ids["telemetry.macMachineId"]}" "{uuid_file}"'
+                result = os.system(cmd)
+                if result == 0:
+                    print("macOS Platform UUID updated successfully")
+                else:
+                    raise Exception("Failed to execute plutil command")
+        except Exception as e:
+            print(f"Failed to update macOS Platform UUID: {e}")
+            raise
+
     def reset_machine_ids(self):
         """重置机器ID并备份原文件"""
         try:
@@ -136,14 +360,27 @@ class MachineIDResetter:
             print(f"{Fore.CYAN}{EMOJI['RESET']} {self.translator.get('reset.generating')}...{Style.RESET_ALL}")
             new_ids = self.generate_new_ids()
 
+            # 更新配置文件
             config.update(new_ids)
 
             print(f"{Fore.CYAN}{EMOJI['FILE']} {self.translator.get('reset.saving_json')}...{Style.RESET_ALL}")
             with open(self.db_path, "w", encoding="utf-8") as f:
                 json.dump(config, f, indent=4)
 
+            # 更新SQLite数据库
             self.update_sqlite_db(new_ids)
 
+            # 更新系统ID
+            self.update_system_ids(new_ids)
+
+            # 检查 Cursor 版本并执行相应的操作
+            greater_than_0_45 = check_cursor_version(self.translator)
+            if greater_than_0_45:
+                print(f"{Fore.CYAN}{EMOJI['INFO']} 检测到 Cursor 版本 >= 0.45.0，正在修补 getMachineId...{Style.RESET_ALL}")
+                patch_cursor_get_machine_id(self.translator)
+            else:
+                print(f"{Fore.YELLOW}{EMOJI['INFO']} Cursor 版本 < 0.45.0，跳过 getMachineId 修补{Style.RESET_ALL}")
+
             print(f"{Fore.GREEN}{EMOJI['SUCCESS']} {self.translator.get('reset.success')}{Style.RESET_ALL}")
             print(f"\n{Fore.CYAN}{self.translator.get('reset.new_id')}:{Style.RESET_ALL}")
             for key, value in new_ids.items():
@@ -160,18 +397,17 @@ class MachineIDResetter:
             return False
 
 def run(translator=None):
-    """Main function to be called from main.py"""
+    """便捷函数，用于直接调用重置功能"""
     print(f"\n{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
     print(f"{Fore.CYAN}{EMOJI['RESET']} {translator.get('reset.title')}{Style.RESET_ALL}")
     print(f"{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
 
-    resetter = MachineIDResetter(translator)
+    resetter = MachineIDResetter(translator)  # 正確傳遞 translator
     resetter.reset_machine_ids()
 
     print(f"\n{Fore.CYAN}{'='*50}{Style.RESET_ALL}")
     input(f"{EMOJI['INFO']} {translator.get('reset.press_enter')}...")
 
 if __name__ == "__main__":
-    # 如果直接运行，使用默认翻译器
     from main import translator as main_translator
     run(main_translator)

uBlock0.chromium/1p-filters.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>uBlock — Your filters</title>
-
-<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="lib/codemirror/addon/hint/show-hint.css">
-<link rel="stylesheet" href="lib/codemirror/addon/search/matchesonscrollbar.css">
-
-<link rel="stylesheet" href="css/themes/default.css">
-<link rel="stylesheet" href="css/common.css">
-<link rel="stylesheet" href="css/fa-icons.css">
-<link rel="stylesheet" href="css/dashboard-common.css">
-<link rel="stylesheet" href="css/cloud-ui.css">
-<link rel="stylesheet" href="css/1p-filters.css">
-<link rel="stylesheet" href="css/codemirror.css">
-</head>
-
-<body>
-
-<div class="body">
-    <div id="cloudWidget" class="hide" data-cloud-entry="myFiltersPane"></div>
-    <p>
-        <button id="userFiltersApply" class="preferred iconified" type="button" disabled><span class="fa-icon">check</span><span data-i18n="1pApplyChanges">_</span><span class="hover"></span></button>
-        <button id="userFiltersRevert" class="iconified" type="button" disabled><span class="fa-icon">undo</span><span data-i18n="genericRevert">_</span><span class="hover"></span></button>
-        &emsp;
-        <button id="importUserFiltersFromFile" class="iconified" type="button"><span class="fa-icon">download-alt</span><span data-i18n="1pImport">_</span><span class="hover"></span></button>
-        <button id="exportUserFiltersToFile" class="iconified" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="1pExport">_</span><span class="hover"></span></button>
-    </p>
-    <p data-i18n="1pTrustWarning"></p>
-    <div class="li"><label><span id="enableMyFilters" class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span data-i18n="1pEnableMyFiltersLabel"></span></label></div>
-    <div id="trustMyFilters" class="li"><label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span data-i18n="1pTrustMyFiltersLabel"></span></label></div>
-</div>
-<div id="userFilters" class="codeMirrorContainer codeMirrorBreakAll cm-theme-override" spellcheck="false"></div>
-<div class="hidden">
-    <input id="importFilePicker" type="file" accept="text/plain">
-</div>
-
-<script src="lib/codemirror/lib/codemirror.js"></script>
-<script src="lib/codemirror/addon/comment/comment.js"></script>
-<script src="lib/codemirror/addon/display/panel.js"></script>
-<script src="lib/codemirror/addon/edit/closebrackets.js"></script>
-<script src="lib/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="lib/codemirror/addon/fold/foldcode.js"></script>
-<script src="lib/codemirror/addon/hint/show-hint.js"></script>
-<script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
-<script src="lib/codemirror/addon/search/searchcursor.js"></script>
-<script src="lib/codemirror/addon/selection/active-line.js"></script>
-<script src="lib/diff/swatinem_diff.js"></script>
-<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
-
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
-
-<script src="js/codemirror/search.js" type="module"></script>
-<script src="js/codemirror/search-thread.js"></script>
-
-<script src="js/fa-icons.js" type="module"></script>
-<script src="js/theme.js" type="module"></script>
-<script src="js/i18n.js" type="module"></script>
-<script src="js/dashboard-common.js" type="module"></script>
-<script src="js/cloud-ui.js" type="module"></script>
-<script src="js/1p-filters.js" type="module"></script>
-
-</body>
-</html>

uBlock0.chromium/3p-filters.html

@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
-<title>uBlock — Filter lists</title>
-<link rel="stylesheet" type="text/css" href="css/themes/default.css">
-<link rel="stylesheet" type="text/css" href="css/common.css">
-<link rel="stylesheet" type="text/css" href="css/fa-icons.css">
-<link rel="stylesheet" type="text/css" href="css/dashboard-common.css">
-<link rel="stylesheet" type="text/css" href="css/cloud-ui.css">
-<link rel="stylesheet" type="text/css" href="css/3p-filters.css">
-</head>
-
-<body>
-
-<div class="body">
-
-<div id="cloudWidget" class="hide" data-cloud-entry="tpFiltersPane"></div>
-<p id="actions">
-    <button id="buttonApply" class="preferred disabled iconified dontshrink" type="button" data-i18n-title="3pApplyChanges"><span class="fa-icon">check</span><span data-i18n="3pApplyChanges">_</span><span class="hover"></span></button>
-    <button id="buttonUpdate" class="preferred disabled iconified" type="button" data-i18n-title="3pUpdateNow"><span class="fa-icon">refresh</span><span data-i18n="3pUpdateNow">_</span><span class="hover"></span></button>
-</p>
-
-<div>
-    <div class="li">
-        <label><span class="input checkbox"><input type="checkbox" id="autoUpdate"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span data-i18n="3pAutoUpdatePrompt1"></span></label>
-    </div>
-    <div class="li">
-        <label><span class="input checkbox"><input type="checkbox" id="suspendUntilListsAreLoaded"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span data-i18n="3pSuspendUntilListsAreLoaded"></span></label>
-    </div>
-    <div class="li">
-        <label><span class="input checkbox"><input type="checkbox" id="parseCosmeticFilters"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span data-i18n="3pParseAllABPHideFiltersPrompt1"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pParseAllABPHideFiltersInfo">question-circle</span></span></label>
-    </div>
-    <div class="li">
-        <label><span class="input checkbox"><input type="checkbox" id="ignoreGenericCosmeticFilters"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span data-i18n="3pIgnoreGenericCosmeticFilters"></span>&nbsp;<span class="fa-icon info" data-i18n-title="3pIgnoreGenericCosmeticFiltersInfo">question-circle</span></span></label>
-    </div>
-</div>
-
-<div>
-</div>
-
-<div id="lists">
-    <div class="rootstats expandable" data-key="*">
-        <span class="fa-icon listExpander">angle-up</span><span id="listsOfBlockedHostsPrompt"></span>
-    </div>
-    <div class="searchfield"><input type="search" spellcheck="false" placeholder="" /><span class="fa-icon">search</span></div>
-    <div class="listEntries"></div>
-    <div class="li listEntry expandable" data-role="import">
-        <span class="detailbar">
-            <label><span class="fa-icon listExpander">angle-up</span><span class="listname" data-i18n="3pImport"></span></label>
-            <a class="fa-icon info towiki" href="https://github.com/gorhill/uBlock/wiki/Filter-lists-from-around-the-web" target="_blank">info-circle</a>
-        </span>
-        <textarea dir="ltr" spellcheck="false" placeholder="3pExternalListsHint"></textarea>
-    </div>
-</div>
-
-</div>
-
-<div id="templates" style="display: none;">
-    <div class="listEntries"></div>
-    <div class="li listEntry" data-role="leaf">
-        <span class="detailbar">
-            <label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span><span class="listname forinput"></span>
-            </span></label>
-            <span class="iconbar"><!--
-             --><a class="fa-icon content" href="#" type="text/plain" target="_blank" data-i18n-title="3pViewContent">eye-open</a><!--
-             --><a class="fa-icon support" href="#" target="_blank">home</a><!--
-             --><span class="fa-icon remove">trash-o</span><!--
-             --><a class="fa-icon mustread" href="#" target="_blank">info-circle</a><!--
-             --><span class="fa-icon status unsecure" title="http">unlock-alt</span><!--
-             --><span class="fa-icon status obsolete" data-i18n-title="3pExternalListObsolete">exclamation-triangle</span><!--
-             --><span class="fa-icon status cache">clock-o</span><!--
-             --><span class="fa-icon status updating" data-i18n-title="3pUpdating">spinner</span><!--
-             --><span class="fa-icon status failed" data-i18n-title="3pNetworkError">unlink</span>
-            </span>
-            <span class="leafstats"></span>
-        </span>
-    </div>
-    <div class="li listEntry expandable" data-role="node">
-        <span class="detailbar">
-            <label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span><span class="listname forinput"></span></label>
-            <span class="nodestats"></span>
-            <span class="fa-icon listExpander">angle-up</span>
-            <span class="iconbar"><!--
-             --><a class="fa-icon support" href="#" target="_blank">home</a><!--
-             --><a class="fa-icon mustread" href="#" target="_blank">info-circle</a><!--
-             --><span class="fa-icon status obsolete" data-i18n-title="3pExternalListObsolete">exclamation-triangle</span><!--
-             --><span class="fa-icon status cache">clock-o</span><!--
-             --><span class="fa-icon status updating" data-i18n-title="3pUpdating">spinner</span><!--
-             --><span class="fa-icon status failed" data-i18n-title="3pNetworkError">unlink</span>
-            </span>
-            <span class="leafstats"></span>
-        </span>
-    </div>
-    <div class="li listEntry expandable" data-parent="root" data-role="node">
-        <span class="detailbar">
-            <label><span class="fa-icon listExpander">angle-up</span><span class="listname"></span></label>
-            <span class="nodestats"></span>
-        </span>
-    </div>
-</div>
-
-<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
-
-<script src="js/fa-icons.js" type="module"></script>
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
-<script src="js/theme.js" type="module"></script>
-<script src="js/i18n.js" type="module"></script>
-<script src="js/dashboard-common.js" type="module"></script>
-<script src="js/cloud-ui.js" type="module"></script>
-<script src="js/3p-filters.js" type="module"></script>
-
-</body>
-</html>

uBlock0.chromium/LICENSE.txt

@@ -1,674 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                      Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/}
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see {http://www.gnu.org/licenses/}.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {{project}}  Copyright (C) {{year}}  {{fullname}}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-{http://www.gnu.org/licenses/}.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-{http://www.gnu.org/philosophy/why-not-lgpl.html}.

uBlock0.chromium/about.html

@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>uBlock — About</title>
-<link rel="stylesheet" type="text/css" href="css/themes/default.css">
-<link rel="stylesheet" type="text/css" href="css/common.css">
-<link rel="stylesheet" type="text/css" href="css/dashboard-common.css">
-<link rel="stylesheet" type="text/css" href="css/about.css">
-</head>
-
-<body>
-
-<div class="body">
-    <div id="aboutNameVer" class="li"></div>
-    <div class="liul">
-        <div class="li">Copyright &copy; Raymond Hill 2014-present</div>
-    </div>
-    <div class="li"><a href="https://github.com/gorhill/uBlock/wiki/Privacy-policy" data-i18n="aboutPrivacyPolicy"></a></div>
-    <div class="li"><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a></div>
-    <div class="li"><a href="https://github.com/gorhill/uBlock" data-i18n="aboutCode"></a></div>
-    <div class="li"><span data-i18n="aboutContributors"></span></div>
-    <div class="liul">
-        <div class="li"><a href="https://github.com/gorhill/uBlock/graphs/contributors" data-i18n="aboutSourceCode"></a></div>
-        <div class="li"><a href="https://crowdin.com/project/ublock" data-i18n="aboutTranslations"></a></div>
-        <div class="li"><a href="https://github.com/uBlockOrigin/uAssets/graphs/contributors" data-i18n="aboutFilterLists"></a></div>
-    </div>
-    <div class="li"><span data-i18n="aboutDependencies"></span></div>
-    <div class="liul">
-        <div class="li"><span><a href="https://codemirror.net/" target="_blank">CodeMirror</a> by <a href="https://github.com/marijnh">Marijn Haverbeke</a></span></div>
-        <div class="li"><span><a href="https://github.com/mathiasbynens/punycode.js" target="_blank">Punycode.js</a> by <a href="https://github.com/mathiasbynens">Mathias Bynens</a></span></div>
-        <div class="li"><span><a href="https://web.archive.org/web/20201013225635/https://github.com/chrismsimpson/Metropolis" target="_blank">Metropolis font family</a> by <a href="https://github.com/chrismsimpson">Chris Simpson</a></span></div>
-        <div class="li"><span><a href="https://github.com/rsms/inter" target="_blank">Inter font family</a> by <a href="https://github.com/rsms">Rasmus Andersson</a></span></div>
-        <div class="li"><span><a href="https://fontawesome.com/" target="_blank">FontAwesome font family</a> by <a href="https://github.com/davegandy">Dave Gandy</a></span></div>
-        <div class="li"><span><a href="https://github.com/Swatinem/diff" target="_blank">An implementation of Myers' diff algorithm</a> by <a href="https://github.com/Swatinem">Arpad Borsos</a></span></div>
-        <div class="li"><span><a href="https://github.com/foo123/RegexAnalyzer" target="_blank">Regular Expression Analyzer</a> by <a href="https://github.com/foo123">Nikos M.</a></span></div>
-        <div class="li"><span><a href="https://github.com/hsluv/hsluv" target="_blank">HSLuv - Human-friendly HSL</a> by <a href="https://github.com/boronine">Alexei Boronine</a></span></div>
-        <div class="li"><span><a href="https://searchfox.org/mozilla-central/rev/d317e93d9a59c9e4c06ada85fbff9f6a1ceaaad1/browser/extensions/webcompat/shims/google-ima.js" target="_blank">google-ima.js</a> by <a href="https://www.mozilla.org/">Mozilla</a></span></div>
-        <div class="li"><span><a href="https://github.com/csstree/csstree" target="_blank">CSSTree</a> by <a href="https://github.com/lahmatiy">Roman Dvornov</a></span></div>
-        <div class="li"><span><a href="https://github.com/beautify-web/js-beautify" target="_blank">js-beautify</a> by <a href="https://github.com/einars">Einar Lielmanis</a>, <a href="https://github.com/bitwiseman">Liam Newman</a>, et al.</span></div>
-        <div class="li"><span><a href="https://flagpedia.net/" target="_blank">Flags of the World</a> by <a href="https://www.davidkrmela.com/">David Krmela</a></span></div>
-    </div>
-    <div class="li"><span data-i18n="aboutCDNs"></span></div>
-    <div class="liul">
-        <div class="li"><span><a href="https://pages.cloudflare.com/" target="_blank">Cloudflare Pages</a>, <a href="https://pages.github.com/" target="_blank">GitHub Pages</a>, <a href="https://www.jsdelivr.com/" target="_blank">jsDelivr</a>, <a href="https://statically.io/" target="_blank">Statically</a></span>
-        </div>
-        <div class="li" data-i18n="aboutCDNsInfo"></div>
-    </div>
-</div>
-
-<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
-
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
-<script src="js/theme.js" type="module"></script>
-<script src="js/i18n.js" type="module"></script>
-<script src="js/dashboard-common.js" type="module"></script>
-<script src="js/about.js" type="module"></script>
-
-</body>
-</html>

uBlock0.chromium/advanced-settings.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title data-i18n="advancedSettingsPageName"></title>
-
-<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
-
-<link rel="stylesheet" href="css/themes/default.css">
-<link rel="stylesheet" href="css/common.css">
-<link rel="stylesheet" href="css/fa-icons.css">
-<link rel="stylesheet" href="css/dashboard-common.css">
-<link rel="stylesheet" href="css/advanced-settings.css">
-<link rel="stylesheet" href="css/codemirror.css">
-<link rel="shortcut icon" type="image/png" href="img/icon_64.png">
-</head>
-
-<body>
-<div class="body">
-    <p><span data-i18n="advancedSettingsWarning"></span> <a class="fa-icon info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-settings" target="_blank">info-circle</a>
-    <p>
-        <button id="advancedSettingsApply" class="preferred" type="button" disabled data-i18n="genericApplyChanges">_<span class="hover"></span></button>&ensp;
-</div>
-
-<div id="advancedSettings" class="codeMirrorContainer cm-theme-override"></div>
-
-<script src="lib/codemirror/lib/codemirror.js"></script>
-<script src="lib/codemirror/addon/selection/active-line.js"></script>
-<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
-
-<script src="js/fa-icons.js" type="module"></script>
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
-<script src="js/theme.js" type="module"></script>
-<script src="js/i18n.js" type="module"></script>
-<script src="js/dashboard-common.js" type="module"></script>
-<script src="js/advanced-settings.js" type="module"></script>
-
-</body>
-</html>

uBlock0.chromium/asset-viewer.html

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title data-i18n="assetViewerPageName"></title>
-<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="lib/codemirror/addon/search/matchesonscrollbar.css">
-<link rel="stylesheet" href="css/themes/default.css">
-<link rel="stylesheet" href="css/common.css">
-<link rel="stylesheet" href="css/fa-icons.css">
-<link rel="stylesheet" href="css/codemirror.css">
-<link rel="stylesheet" href="css/asset-viewer.css">
-<link rel="shortcut icon" type="image/png" href="img/icon_64.png">
-</head>
-<body class="loading">
-
-<section id="subscribe" class="hide notice">
-    <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="logo"></span>
-    <span id="subscribePrompt"><span></span><a></a></span>
-    <span class="fa-icon">spinner</span>
-    <button id="subscribeButton" type="button" data-i18n="subscribeButton">_<span class="hover"></span></button>
-</section>
-
-<div id="content" class="codeMirrorContainer codeMirrorBreakAll cm-theme-override"></div>
-
-<script src="lib/codemirror/lib/codemirror.js"></script>
-<script src="lib/codemirror/addon/display/panel.js"></script>
-<script src="lib/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="lib/codemirror/addon/fold/foldcode.js"></script>
-<script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
-<script src="lib/codemirror/addon/search/searchcursor.js"></script>
-<script src="lib/codemirror/addon/selection/active-line.js"></script>
-<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
-
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
-
-<script src="js/codemirror/search.js" type="module"></script>
-<script src="js/codemirror/search-thread.js"></script>
-
-<script src="js/fa-icons.js" type="module"></script>
-<script src="js/theme.js" type="module"></script>
-<script src="js/i18n.js" type="module"></script>
-<script src="js/dashboard-common.js" type="module"></script>
-<script src="js/asset-viewer.js" type="module"></script>
-
-</body>
-</html>

uBlock0.chromium/assets/assets.json

@@ -1,922 +0,0 @@
-{
-	"assets.json": {
-		"content": "internal",
-		"updateAfter": 13,
-		"contentURL": [
-			"https://raw.githubusercontent.com/gorhill/uBlock/master/assets/assets.json",
-			"assets/assets.json"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/ublock/assets.json",
-			"https://ublockorigin.pages.dev/ublock/assets.json",
-			"https://cdn.jsdelivr.net/gh/gorhill/uBlock@master/assets/assets.json",
-			"https://cdn.statically.io/gh/gorhill/uBlock/master/assets/assets.json"
-		]
-	},
-	"public_suffix_list.dat": {
-		"content": "internal",
-		"updateAfter": 19,
-		"contentURL": [
-			"https://publicsuffix.org/list/public_suffix_list.dat",
-			"assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat"
-		]
-	},
-	"ublock-badlists": {
-		"content": "internal",
-		"updateAfter": 29,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/badlists.txt",
-			"assets/ublock/badlists.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/badlists.txt",
-			"https://ublockorigin.pages.dev/filters/badlists.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badlists.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badlists.txt"
-		]
-	},
-	"ublock-filters": {
-		"content": "filters",
-		"group": "default",
-		"parent": "uBlock filters",
-		"title": "uBlock filters – Ads",
-		"tags": "ads",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/filters.txt",
-			"assets/ublock/filters.min.txt",
-			"assets/ublock/filters.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/filters.min.txt",
-			"https://ublockorigin.pages.dev/filters/filters.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/filters.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/filters.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"ublock-badware": {
-		"content": "filters",
-		"group": "default",
-		"parent": "uBlock filters",
-		"title": "uBlock filters – Badware risks",
-		"tags": "malware security",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/badware.txt",
-			"assets/ublock/badware.min.txt",
-			"assets/ublock/badware.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/badware.min.txt",
-			"https://ublockorigin.pages.dev/filters/badware.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badware.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badware.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets",
-		"instructionURL": "https://github.com/gorhill/uBlock/wiki/Badware-risks"
-	},
-	"ublock-privacy": {
-		"content": "filters",
-		"group": "default",
-		"parent": "uBlock filters",
-		"title": "uBlock filters – Privacy",
-		"tags": "privacy",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/privacy.txt",
-			"assets/ublock/privacy.min.txt",
-			"assets/ublock/privacy.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/privacy.min.txt",
-			"https://ublockorigin.pages.dev/filters/privacy.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/privacy.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/privacy.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"ublock-unbreak": {
-		"content": "filters",
-		"group": "default",
-		"parent": "uBlock filters",
-		"title": "uBlock filters – Unbreak",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/unbreak.txt",
-			"assets/ublock/unbreak.min.txt",
-			"assets/ublock/unbreak.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.min.txt",
-			"https://ublockorigin.pages.dev/filters/unbreak.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/unbreak.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/unbreak.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"ublock-quick-fixes": {
-		"content": "filters",
-		"group": "default",
-		"parent": "uBlock filters",
-		"title": "uBlock filters – Quick fixes",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt",
-			"assets/ublock/quick-fixes.min.txt",
-			"assets/ublock/quick-fixes.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.min.txt",
-			"https://ublockorigin.pages.dev/filters/quick-fixes.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/quick-fixes.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"adguard-generic": {
-		"content": "filters",
-		"group": "ads",
-		"off": true,
-		"title": "AdGuard – Ads",
-		"tags": "ads",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"adguard-mobile": {
-		"content": "filters",
-		"group": "ads",
-		"off": true,
-		"title": "AdGuard – Mobile Ads",
-		"tags": "ads mobile",
-		"ua": "mobile",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"easylist": {
-		"content": "filters",
-		"group": "ads",
-		"title": "EasyList",
-		"tags": "ads",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
-			"assets/thirdparties/easylist/easylist.txt"
-		],
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
-	"adguard-spyware-url": {
-		"content": "filters",
-		"group": "privacy",
-		"off": true,
-		"title": "AdGuard URL Tracking Protection",
-		"tags": "privacy",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/17.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"adguard-spyware": {
-		"content": "filters",
-		"group": "privacy",
-		"off": true,
-		"title": "AdGuard Tracking Protection",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"block-lan": {
-		"content": "filters",
-		"group": "privacy",
-		"off": true,
-		"title": "Block Outsider Intrusion into LAN",
-		"tags": "privacy security",
-		"contentURL": "https://ublockorigin.github.io/uAssets/filters/lan-block.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/lan-block.txt",
-			"https://ublockorigin.pages.dev/filters/lan-block.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/lan-block.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/lan-block.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"easyprivacy": {
-		"content": "filters",
-		"group": "privacy",
-		"title": "EasyPrivacy",
-		"tags": "privacy",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
-			"assets/thirdparties/easylist/easyprivacy.txt"
-		],
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easyprivacy.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
-	"urlhaus-1": {
-		"content": "filters",
-		"group": "malware",
-		"title": "Online Malicious URL Blocklist",
-		"contentURL": [
-			"https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-ag-online.txt",
-			"assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt"
-		],
-		"cdnURLs": [
-			"https://curbengh.github.io/malware-filter/urlhaus-filter-ag-online.txt",
-			"https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-ag-online.txt",
-			"https://malware-filter.pages.dev/urlhaus-filter-ag-online.txt"
-		],
-		"supportURL": "https://gitlab.com/malware-filter/urlhaus-filter#malicious-url-blocklist"
-	},
-	"curben-phishing": {
-		"content": "filters",
-		"group": "malware",
-		"off": true,
-		"title": "Phishing URL Blocklist",
-		"contentURL": "https://malware-filter.gitlab.io/phishing-filter/phishing-filter.txt",
-		"cdnURLs": [
-			"https://curbengh.github.io/phishing-filter/phishing-filter.txt",
-			"https://malware-filter.gitlab.io/phishing-filter/phishing-filter.txt",
-			"https://phishing-filter.pages.dev/phishing-filter.txt"
-		],
-		"supportURL": "https://gitlab.com/malware-filter/phishing-filter#phishing-url-blocklist"
-	},
-	"adguard-cookies": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "cookies",
-		"parent": "AdGuard/uBO – Cookie Notices",
-		"off": true,
-		"title": "AdGuard – Cookie Notices",
-		"tags": "annoyances cookies",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/18.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"ublock-cookies-adguard": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "cookies",
-		"parent": "AdGuard/uBO – Cookie Notices",
-		"off": true,
-		"title": "uBlock filters – Cookie Notices",
-		"tags": "annoyances cookies",
-		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
-			"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"fanboy-cookiemonster": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "cookies",
-		"parent": "EasyList/uBO – Cookie Notices",
-		"off": true,
-		"title": "EasyList – Cookie Notices",
-		"tags": "annoyances cookies",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
-			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt",
-			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
-		],
-		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
-	},
-	"ublock-cookies-easylist": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "cookies",
-		"parent": "EasyList/uBO – Cookie Notices",
-		"off": true,
-		"title": "uBlock filters – Cookie Notices",
-		"tags": "annoyances cookies",
-		"preferred": true,
-		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
-			"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"adguard-social": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "social",
-		"parent": null,
-		"off": true,
-		"title": "AdGuard – Social Widgets",
-		"tags": "annoyances social",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"fanboy-social": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "social",
-		"parent": null,
-		"off": true,
-		"title": "EasyList – Social Widgets",
-		"tags": "annoyances social",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
-			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-social.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt",
-			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
-	"fanboy-thirdparty_social": {
-		"content": "filters",
-		"group": "annoyances",
-		"group2": "social",
-		"off": true,
-		"title": "Fanboy – Anti-Facebook",
-		"tags": "privacy",
-		"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
-		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
-	},
-	"adguard-popup-overlays": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
-		"off": true,
-		"title": "AdGuard – Popup Overlays",
-		"tags": "annoyances",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/19.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"adguard-mobile-app-banners": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
-		"off": true,
-		"title": "AdGuard – Mobile App Banners",
-		"tags": "annoyances mobile",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/20.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"adguard-other-annoyances": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
-		"off": true,
-		"title": "AdGuard – Other Annoyances",
-		"tags": "annoyances",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/21.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"adguard-widgets": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
-		"off": true,
-		"title": "AdGuard – Widgets",
-		"tags": "annoyances",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/22.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"easylist-annoyances": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
-		"off": true,
-		"title": "EasyList – Other Annoyances",
-		"tags": "annoyances",
-		"preferred": true,
-		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-annoyances.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-annoyances.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-annoyances.txt"
-		],
-		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
-	},
-	"easylist-chat": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
-		"off": true,
-		"title": "EasyList – Chat Widgets",
-		"tags": "annoyances",
-		"preferred": true,
-		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-chat.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-chat.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-chat.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-chat.txt"
-		],
-		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
-	},
-	"easylist-newsletters": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
-		"off": true,
-		"title": "EasyList – Newsletter Notices",
-		"tags": "annoyances",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-newsletters.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-newsletters.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-newsletters.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-newsletters.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
-	"easylist-notifications": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
-		"off": true,
-		"title": "EasyList – Notifications",
-		"tags": "annoyances",
-		"preferred": true,
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-notifications.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-notifications.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-notifications.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-notifications.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
-	"ublock-annoyances": {
-		"content": "filters",
-		"group": "annoyances",
-		"off": true,
-		"title": "uBlock filters – Annoyances",
-		"tags": "annoyances",
-		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances.min.txt",
-			"https://ublockorigin.pages.dev/filters/annoyances.min.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances.min.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances.min.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
-	"dpollock-0": {
-		"content": "filters",
-		"group": "multipurpose",
-		"updateAfter": 13,
-		"off": true,
-		"title": "Dan Pollock’s hosts file",
-		"tags": "ads privacy security",
-		"contentURL": "https://someonewhocares.org/hosts/hosts",
-		"supportURL": "https://someonewhocares.org/hosts/"
-	},
-	"plowe-0": {
-		"content": "filters",
-		"group": "multipurpose",
-		"updateAfter": 13,
-		"title": "Peter Lowe’s Ad and tracking server list",
-		"tags": "ads privacy security",
-		"preferred": true,
-		"contentURL": [
-			"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
-			"assets/thirdparties/pgl.yoyo.org/as/serverlist.txt",
-			"assets/thirdparties/pgl.yoyo.org/as/serverlist"
-		],
-		"supportURL": "https://pgl.yoyo.org/adservers/"
-	},
-	"ALB-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇦🇱al 🇽🇰xk: Adblock List for Albania",
-		"tags": "ads albania shqipja",
-		"lang": "sq",
-		"contentURL": "https://raw.githubusercontent.com/AnXh3L0/blocklist/master/albanian-easylist-addition/Albania.txt",
-		"supportURL": "https://github.com/AnXh3L0/blocklist"
-	},
-	"ara-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇪🇬eg 🇸🇦sa 🇲🇦ma 🇩🇿dz: Liste AR",
-		"tags": "ads arabic اَلْعَرَبِيَّةُ‎",
-		"lang": "ar",
-		"contentURL": "https://easylist-downloads.adblockplus.org/Liste_AR.txt",
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=98"
-	},
-	"BGR-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇧🇬bg: Bulgarian Adblock list",
-		"tags": "ads bulgarian България macedonian Македонија",
-		"lang": "bg mk",
-		"contentURL": "https://stanev.org/abp/adblock_bg.txt",
-		"supportURL": "https://stanev.org/abp/"
-	},
-	"CHN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇨🇳cn 🇹🇼tw: AdGuard Chinese (中文)",
-		"tags": "ads chinese 中文",
-		"lang": "ug zh",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/224.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"CZE-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇨🇿cz 🇸🇰sk: EasyList Czech and Slovak",
-		"tags": "ads czech česká slovak slovenská",
-		"lang": "cs sk",
-		"contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt",
-		"supportURL": "https://github.com/tomasko126/easylistczechandslovak"
-	},
-	"DEU-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇩🇪de 🇨🇭ch 🇦🇹at: EasyList Germany",
-		"tags": "ads german deutschland luxembourgish lëtzebuerg romansh",
-		"lang": "de dsb hsb lb rm",
-		"contentURL": [
-			"https://easylist.to/easylistgermany/easylistgermany.txt",
-			"https://easylist-downloads.adblockplus.org/easylistgermany.txt"
-		],
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=90"
-	},
-	"EST-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇪🇪ee: Eesti saitidele kohandatud filter",
-		"tags": "ads estonian",
-		"lang": "et",
-		"contentURL": "https://adblock.ee/list.txt",
-		"supportURL": "https://adblock.ee"
-	},
-	"FIN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇫🇮fi: Adblock List for Finland",
-		"tags": "ads finnish",
-		"lang": "fi",
-		"contentURL": "https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/gh-pages/Finland_adb.txt",
-		"supportURL": "https://github.com/finnish-easylist-addition/finnish-easylist-addition"
-	},
-	"FRA-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇫🇷fr 🇨🇦ca: AdGuard Français",
-		"tags": "ads french",
-		"lang": "ar br ff fr lb oc son",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/16.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"GRC-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇬🇷gr 🇨🇾cy: Greek AdBlock Filter",
-		"tags": "ads greek",
-		"lang": "el",
-		"contentURL": "https://www.void.gr/kargig/void-gr-filters.txt",
-		"supportURL": "https://github.com/kargig/greek-adblockplus-filter"
-	},
-	"HRV-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇭🇷hr 🇷🇸rs: Dandelion Sprout's Serbo-Croatian filters",
-		"tags": "ads croatian serbian bosnian",
-		"lang": "bs hr sr",
-		"contentURL": [
-			"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/SerboCroatianList.txt",
-			"https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/SerboCroatianList.txt",
-			"https://cdn.statically.io/gl/DandelionSprout/adfilt/master/SerboCroatianList.txt"
-		],
-		"supportURL": "https://github.com/DandelionSprout/adfilt#readme"
-	},
-	"HUN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇭🇺hu: hufilter",
-		"tags": "ads hungarian",
-		"lang": "hu",
-		"contentURL": "https://cdn.jsdelivr.net/gh/hufilter/hufilter@gh-pages/hufilter-ublock.txt",
-		"supportURL": "https://github.com/hufilter/hufilter"
-	},
-	"IDN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇩id 🇲🇾my: ABPindo",
-		"tags": "ads indonesian malay",
-		"lang": "id ms",
-		"contentURL": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt",
-		"supportURL": "https://github.com/ABPindo/indonesianadblockrules"
-	},
-	"IND-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇳in 🇱🇰lk 🇳🇵np: IndianList",
-		"tags": "ads assamese bengali gujarati hindi kannada malayalam marathi nepali punjabi sinhala tamil telugu",
-		"lang": "as bn gu hi kn ml mr ne pa si ta te",
-		"contentURL": "https://easylist-downloads.adblockplus.org/indianlist.txt",
-		"supportURL": "https://github.com/mediumkreation/IndianList"
-	},
-	"IRN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇷ir: PersianBlocker",
-		"tags": "ads af ir persian pashto tajik tj",
-		"lang": "fa ps tg",
-		"contentURL": [
-			"https://raw.githubusercontent.com/MasterKia/PersianBlocker/main/PersianBlocker.txt",
-			"https://cdn.statically.io/gh/MasterKia/PersianBlocker/main/PersianBlocker.txt"
-		],
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/MasterKia/PersianBlocker@main/PersianBlocker.txt",
-			"https://cdn.statically.io/gh/MasterKia/PersianBlocker/main/PersianBlocker.txt"
-		],
-		"supportURL": "https://github.com/MasterKia/PersianBlocker"
-	},
-	"ISL-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇸is: Icelandic ABP List",
-		"tags": "ads icelandic",
-		"lang": "is",
-		"contentURL": "https://raw.githubusercontent.com/brave/adblock-lists/master/custom/is.txt",
-		"supportURL": "https://github.com/brave/adblock-lists/issues"
-	},
-	"ISR-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇱il: EasyList Hebrew",
-		"tags": "ads hebrew",
-		"lang": "he",
-		"contentURL": "https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt",
-		"supportURL": "https://github.com/easylist/EasyListHebrew"
-	},
-	"ITA-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇮🇹it: EasyList Italy",
-		"tags": "ads italian",
-		"lang": "it lij",
-		"contentURL": "https://easylist-downloads.adblockplus.org/easylistitaly.txt",
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=96"
-	},
-	"JPN-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇯🇵jp: AdGuard Japanese",
-		"tags": "ads japanese 日本語",
-		"lang": "ja",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"KOR-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇰🇷kr: List-KR",
-		"tags": "ads korean 한국어",
-		"lang": "ko",
-		"contentURL": "https://cdn.jsdelivr.net/gh/List-KR/List-KR@latest/filter-uBlockOrigin.txt",
-		"supportURL": "https://github.com/List-KR/List-KR#readme"
-	},
-	"LTU-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇱🇹lt: EasyList Lithuania",
-		"tags": "ads lithuanian",
-		"lang": "lt",
-		"contentURL": "https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt",
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/EasyList-Lithuania/easylist_lithuania@master/easylistlithuania.txt",
-			"https://cdn.statically.io/gh/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt"
-		],
-		"supportURL": "https://github.com/EasyList-Lithuania/easylist_lithuania"
-	},
-	"LVA-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇱🇻lv: Latvian List",
-		"tags": "ads latvian",
-		"lang": "lv",
-		"contentURL": "https://raw.githubusercontent.com/Latvian-List/adblock-latvian/master/lists/latvian-list.txt",
-		"supportURL": "https://github.com/Latvian-List/adblock-latvian"
-	},
-	"MKD-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇲🇰mk: Macedonian adBlock Filters",
-		"tags": "ads macedonian",
-		"lang": "mk",
-		"contentURL": "https://raw.githubusercontent.com/DeepSpaceHarbor/Macedonian-adBlock-Filters/master/Filters",
-		"supportURL": "https://github.com/DeepSpaceHarbor/Macedonian-adBlock-Filters"
-	},
-	"NLD-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇳🇱nl 🇧🇪be: AdGuard Dutch",
-		"tags": "ads afrikaans be belgië frisian dutch flemish nederlands netherlands nl sr suriname za",
-		"lang": "af fy nl",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/8.txt",
-		"cdnURLs": null,
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"NOR-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇳🇴no 🇩🇰dk 🇮🇸is: Dandelion Sprouts nordiske filtre",
-		"tags": "ads norwegian danish icelandic",
-		"lang": "nb nn no da is",
-		"contentURL": [
-			"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt",
-			"https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/NorwegianList.txt",
-			"https://cdn.statically.io/gl/DandelionSprout/adfilt/master/NorwegianList.txt"
-		],
-		"supportURL": "https://github.com/DandelionSprout/adfilt"
-	},
-	"POL-0": {
-		"content": "filters",
-		"group": "regions",
-		"parent": "🇵🇱pl: Oficjalne Polskie Filtry",
-		"off": true,
-		"title": "🇵🇱pl: Oficjalne Polskie Filtry do uBlocka Origin",
-		"tags": "ads polish polski",
-		"lang": "szl pl",
-		"contentURL": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt",
-		"supportURL": "https://github.com/MajkiIT/polish-ads-filter/issues",
-		"instructionURL": "https://github.com/MajkiIT/polish-ads-filter#polish-filters-for-adblock-ublock-origin--adguard"
-	},
-	"POL-2": {
-		"content": "filters",
-		"group": "regions",
-		"parent": "🇵🇱pl: Oficjalne Polskie Filtry",
-		"off": true,
-		"title": "🇵🇱pl: Oficjalne polskie filtry przeciwko alertom o Adblocku",
-		"tags": "ads polish polski",
-		"lang": "szl pl",
-		"contentURL": "https://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/anti-adblock.txt",
-		"supportURL": "https://github.com/olegwukr/polish-privacy-filters/issues"
-	},
-	"ROU-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇷🇴ro 🇲🇩md: Romanian Ad (ROad) Block List Light",
-		"tags": "ads romanian română moldavian moldovenească молдовеняскэ",
-		"lang": "ro",
-		"contentURL": [
-			"https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-block-filters-light.txt"
-		],
-		"supportURL": "https://github.com/tcptomato/ROad-Block"
-	},
-	"RUS-0": {
-		"content": "filters",
-		"group": "regions",
-		"parent": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
-		"off": true,
-		"title": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
-		"tags": "ads belarusian беларуская kazakh tatar russian русский ukrainian українська uzbek",
-		"lang": "be kk tt ru uk uz",
-		"contentURL": "https://raw.githubusercontent.com/easylist/ruadlist/master/RuAdList-uBO.txt",
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/dimisa-RUAdList/RUAdListCDN@main/lists/ruadlist.ubo.min.txt",
-			"https://cdn.statically.io/gh/dimisa-RUAdList/RUAdListCDN/main/lists/ruadlist.ubo.min.txt",
-			"https://raw.githubusercontent.com/dimisa-RUAdList/RUAdListCDN/main/lists/ruadlist.ubo.min.txt"
-		],
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
-		"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
-	},
-	"RUS-1": {
-		"content": "filters",
-		"group": "regions",
-		"parent": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
-		"off": true,
-		"title": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList: Counters",
-		"tags": "ads belarusian беларуская kazakh tatar russian русский ukrainian українська uzbek be kk tt ru uk uz",
-		"contentURL": "https://raw.githubusercontent.com/easylist/ruadlist/master/cntblock.txt",
-		"cdnURLs": [
-			"https://cdn.jsdelivr.net/gh/easylist/ruadlist@master/cntblock.txt",
-			"https://cdn.statically.io/gh/easylist/ruadlist/master/cntblock.txt",
-			"https://raw.githubusercontent.com/easylist/ruadlist/master/cntblock.txt"
-		],
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
-		"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
-	},
-	"spa-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇪🇸es 🇦🇷ar 🇲🇽mx 🇨🇴co: EasyList Spanish",
-		"tags": "ads aragonese basque catalan spanish español galician guarani",
-		"lang": "an ast ca cak es eu gl gn trs quz",
-		"contentURL": "https://easylist-downloads.adblockplus.org/easylistspanish.txt",
-		"supportURL": "https://forums.lanik.us/viewforum.php?f=103"
-	},
-	"spa-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇪🇸es 🇦🇷ar 🇧🇷br 🇵🇹pt: AdGuard Spanish/Portuguese",
-		"tags": "ads aragonese basque catalan spanish español galician guarani portuguese português",
-		"lang": "an ast ca cak es eu gl gn trs pt quz",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"SVN-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇸🇮si: Slovenian List",
-		"tags": "ads slovenian slovenski",
-		"lang": "sl",
-		"contentURL": "https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt",
-		"supportURL": "https://github.com/betterwebleon/slovenian-list"
-	},
-	"SWE-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇸🇪se: Frellwit's Swedish Filter",
-		"tags": "ads swedish svenska",
-		"lang": "sv",
-		"contentURL": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt",
-		"cdnURLs": [
-			"https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/swefilter/swefilter.min.txt",
-			"https://cdn.jsdelivr.net/gh/lassekongo83/Frellwits-filter-lists@swefilter/swefilter.min.txt"
-		],
-		"supportURL": "https://github.com/lassekongo83/Frellwits-filter-lists"
-	},
-	"THA-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇹🇭th: EasyList Thailand",
-		"tags": "ads thai ไทย",
-		"lang": "th",
-		"contentURL": "https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt",
-		"supportURL": "https://github.com/easylist-thailand/easylist-thailand"
-	},
-	"TUR-0": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇹🇷tr: AdGuard Turkish",
-		"tags": "ads turkish türkçe",
-		"lang": "tr",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
-	},
-	"VIE-1": {
-		"content": "filters",
-		"group": "regions",
-		"off": true,
-		"title": "🇻🇳vn: ABPVN List",
-		"tags": "ads vietnamese việt",
-		"lang": "vi",
-		"contentURL": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn_ublock.txt",
-		"supportURL": "https://abpvn.com/"
-	}
-}