2023.05.25 07:34:48 更新订阅

2025-11-03 22:22:13 +00:00 · 2023-05-25 07:34:48 +08:00
parent 02c2ffe4a6
commit 746e9a28aa
5 changed files with 63 additions and 69 deletions
--- a/Clash.yaml
+++ b/Clash.yaml
@@ -228,12 +228,11 @@ proxies:
  - {name: unknown 7 → TG@SCINV, server: gzyd2.52147.top, port: 30150, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: unknown 8 → TG@SCINV, server: gzyd1.52147.top, port: 30150, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: unknown 9 → TG@SCINV, server: hinet1.52147.top, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 1 → TG@SCINV, server: 165.154.246.49, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 2 → TG@SCINV, server: 165.154.246.229, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 3 → TG@SCINV, server: bgptw5.cnamazon.sbs, port: 443, type: trojan, password: b31eb45e-7f95-465f-8229-716058f6dc49, sni: tlsdata.cnamazon.sbs, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 4 → TG@SCINV, server: stw4-tg-data.amazonwebservicess.com, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 5 → TG@SCINV, server: 165.154.253.111, port: 443, type: trojan, password: 4aeda200-44c9-4168-8f2a-a00a72176d35, skip-cert-verify: true, udp: true}
-  - {name: 🇨🇦 CA 6 → TG@SCINV, server: 165.154.246.207, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
+  - {name: 🇨🇦 CA 1 → TG@SCINV, server: stw7-tg-data.amazonwebservicess.com, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
+  - {name: 🇨🇦 CA 2 → TG@SCINV, server: bgptw5.cnamazon.sbs, port: 443, type: trojan, password: b31eb45e-7f95-465f-8229-716058f6dc49, sni: tlsdata.cnamazon.sbs, skip-cert-verify: true, udp: true}
+  - {name: 🇨🇦 CA 3 → TG@SCINV, server: 165.154.246.229, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
+  - {name: 🇨🇦 CA 4 → TG@SCINV, server: 165.154.246.207, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
+  - {name: 🇨🇦 CA 5 → TG@SCINV, server: 165.154.246.49, port: 443, type: trojan, password: ca7febc2-bb45-4e6d-810e-ab0af6009c4e, skip-cert-verify: true, udp: true}
  - {name: 🇨🇳 CN 1 → TG@SCINV, server: official.taipeicitygovernment.kiev.ua, port: 8443, type: trojan, password: 5505f6ba-cd37-30ce-8f92-be4120c83d7f, sni: 66.42.40.132, skip-cert-verify: true, udp: true}
  - {name: 🇨🇳 CN 2 → TG@SCINV, server: 36.139.115.163, port: 30150, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: 🇨🇳 CN 3 → TG@SCINV, server: 36.139.115.163, port: 30010, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
@@ -243,13 +242,13 @@ proxies:
  - {name: 🇩🇪 DE 1 → TG@SCINV, server: 80.78.132.177, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: 🇭🇰 HK 1 → TG@SCINV, server: hkt.52147.top, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: 🇯🇵 JP 1 → TG@SCINV, server: awsjp14-data.amazon-azure.com, port: 443, type: trojan, password: 4aeda200-44c9-4168-8f2a-a00a72176d35, skip-cert-verify: true, udp: true}
-  - {name: 🇯🇵 JP 2 → TG@SCINV, server: awshk1.gsjc.cfd, port: 443, type: trojan, password: 04a34bba-af51-431d-b46e-a05b36c81a43, sni: 4-193-105-141.nhost.00cdn.com, skip-cert-verify: true, udp: true}
-  - {name: 🇯🇵 JP 3 → TG@SCINV, server: awsjp1.gsjc.cfd, port: 443, type: trojan, password: 04a34bba-af51-431d-b46e-a05b36c81a43, sni: 4-193-105-141.nhost.00cdn.com, skip-cert-verify: true, udp: true}
+  - {name: 🇯🇵 JP 2 → TG@SCINV, server: hk2.downloadvip.cfd, port: 443, type: trojan, password: a58ee451-368e-46d5-a57d-7d6dab1b4c42, sni: download.xn--mes358a9urctx.com, skip-cert-verify: true, udp: true}
+  - {name: 🇯🇵 JP 3 → TG@SCINV, server: awshk1.gsjc.cfd, port: 443, type: trojan, password: 04a34bba-af51-431d-b46e-a05b36c81a43, sni: 4-193-105-141.nhost.00cdn.com, skip-cert-verify: true, udp: true}
  - {name: 🇯🇵 JP 4 → TG@SCINV, server: kr1.microsoft-orgwly.vip, port: 443, type: trojan, password: edccc909-b7d2-42b2-8bb1-fd74854f66b1, sni: tls.microsoft-orgwly.vip, skip-cert-verify: true, udp: true}
  - {name: 🇯🇵 JP 5 → TG@SCINV, server: 203.138.98.199, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: 🇺🇸 US 1 → TG@SCINV, server: 170.187.134.190, port: 8443, type: trojan, password: cf4295378e209e70d12c5bdd017144dfd1c772d3, sni: 170-187-134-190.ipv4.rush.ml, skip-cert-verify: true, udp: true}
  - {name: 🇺🇸 US 2 → TG@SCINV, server: us.blazeppn.info, port: 443, type: trojan, password: xxoo, skip-cert-verify: true, udp: true}
-  - {name: 🇺🇸 US 3 → TG@SCINV, server: hk2.downloadvip.cfd, port: 443, type: trojan, password: a58ee451-368e-46d5-a57d-7d6dab1b4c42, sni: download.xn--mes358a9urctx.com, skip-cert-verify: true, udp: true}
+  - {name: 🇺🇸 US 3 → TG@SCINV, server: awsjp1.gsjc.cfd, port: 443, type: trojan, password: 04a34bba-af51-431d-b46e-a05b36c81a43, sni: 4-193-105-141.nhost.00cdn.com, skip-cert-verify: true, udp: true}
  - {name: 🇺🇸 US 4 → TG@SCINV, server: 152.70.74.66, port: 443, type: trojan, password: d906afe5-7c3c-4ddc-aaa4-61c154a82e5e, skip-cert-verify: true, udp: true}
  - {name: 🇺🇸 US 5 → TG@SCINV, server: 212.90.123.130, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
  - {name: 🇺🇸 US 6 → TG@SCINV, server: 45.82.253.234, port: 28443, type: trojan, password: 96d2badf-4ef7-41a9-be8b-19bb09468d28, sni: download.windowsupdate1.com, skip-cert-verify: true, udp: true}
@@ -309,7 +308,6 @@ proxy-groups:
      - 🇨🇦 CA 3 → TG@SCINV
      - 🇨🇦 CA 4 → TG@SCINV
      - 🇨🇦 CA 5 → TG@SCINV
-      - 🇨🇦 CA 6 → TG@SCINV
      - 🇨🇳 CN 1 → TG@SCINV
      - 🇨🇳 CN 2 → TG@SCINV
      - 🇨🇳 CN 3 → TG@SCINV
@@ -374,7 +372,6 @@ proxy-groups:
      - 🇨🇦 CA 3 → TG@SCINV
      - 🇨🇦 CA 4 → TG@SCINV
      - 🇨🇦 CA 5 → TG@SCINV
-      - 🇨🇦 CA 6 → TG@SCINV
      - 🇨🇳 CN 1 → TG@SCINV
      - 🇨🇳 CN 2 → TG@SCINV
      - 🇨🇳 CN 3 → TG@SCINV
@@ -493,7 +490,6 @@ proxy-groups:
      - 🇨🇦 CA 3 → TG@SCINV
      - 🇨🇦 CA 4 → TG@SCINV
      - 🇨🇦 CA 5 → TG@SCINV
-      - 🇨🇦 CA 6 → TG@SCINV
      - 🇨🇳 CN 1 → TG@SCINV
      - 🇨🇳 CN 2 → TG@SCINV
      - 🇨🇳 CN 3 → TG@SCINV
@@ -558,7 +554,6 @@ proxy-groups:
      - 🇨🇦 CA 3 → TG@SCINV
      - 🇨🇦 CA 4 → TG@SCINV
      - 🇨🇦 CA 5 → TG@SCINV
-      - 🇨🇦 CA 6 → TG@SCINV
      - 🇨🇳 CN 1 → TG@SCINV
      - 🇨🇳 CN 2 → TG@SCINV
      - 🇨🇳 CN 3 → TG@SCINV
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/17
+++ b/17
@@ -1,6 +1,5 @@
-trojan://04a34bba-af51-431d-b46e-a05b36c81a43@awshk1.gsjc.cfd:443?allowInsecure=1&sni=4-193-105-141.nhost.00cdn.com#🇯🇵JP 2 → TG@SCINV
-trojan://04a34bba-af51-431d-b46e-a05b36c81a43@awsjp1.gsjc.cfd:443?allowInsecure=1&sni=4-193-105-141.nhost.00cdn.com#🇯🇵JP 3 → TG@SCINV
-trojan://4aeda200-44c9-4168-8f2a-a00a72176d35@165.154.253.111:443?allowInsecure=1#🇨🇦CA 5 → TG@SCINV
+trojan://04a34bba-af51-431d-b46e-a05b36c81a43@awshk1.gsjc.cfd:443?allowInsecure=1&sni=4-193-105-141.nhost.00cdn.com#🇯🇵JP 3 → TG@SCINV
+trojan://04a34bba-af51-431d-b46e-a05b36c81a43@awsjp1.gsjc.cfd:443?allowInsecure=1&sni=4-193-105-141.nhost.00cdn.com#🇺🇸US 3 → TG@SCINV
 trojan://4aeda200-44c9-4168-8f2a-a00a72176d35@awsjp14-data.amazon-azure.com:443?allowInsecure=1#🇯🇵JP 1 → TG@SCINV
 trojan://5505f6ba-cd37-30ce-8f92-be4120c83d7f@official.taipeicitygovernment.kiev.ua:8443?allowInsecure=1&sni=66.42.40.132#🇨🇳CN 1 → TG@SCINV
 trojan://96d2badf-4ef7-41a9-be8b-19bb09468d28@103.167.135.6:28443?allowInsecure=0&sni=download.windowsupdate1.com#unknown 31 → TG@SCINV
@@ -42,12 +41,12 @@ trojan://96d2badf-4ef7-41a9-be8b-19bb09468d28@hnyd.52147.top:30080?allowInsecure
 trojan://96d2badf-4ef7-41a9-be8b-19bb09468d28@hnyd.52147.top:30150?allowInsecure=0&sni=download.windowsupdate1.com#unknown 6 → TG@SCINV
 trojan://96d2badf-4ef7-41a9-be8b-19bb09468d28@hnyd.52147.top:30180?allowInsecure=0&sni=download.windowsupdate1.com#unknown 16 → TG@SCINV
 trojan://a58ee451-368e-46d5-a57d-7d6dab1b4c42@hinet2.downloadvip.cfd:443?allowInsecure=1&sni=download.xn--mes358a9urctx.com#🇹🇼TW 1 → TG@SCINV
-trojan://a58ee451-368e-46d5-a57d-7d6dab1b4c42@hk2.downloadvip.cfd:443?allowInsecure=1&sni=download.xn--mes358a9urctx.com#🇺🇸US 3 → TG@SCINV
-trojan://b31eb45e-7f95-465f-8229-716058f6dc49@bgptw5.cnamazon.sbs:443?allowInsecure=1&sni=tlsdata.cnamazon.sbs#🇨🇦CA 3 → TG@SCINV
-trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.207:443?allowInsecure=1#🇨🇦CA 6 → TG@SCINV
-trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.229:443?allowInsecure=1#🇨🇦CA 2 → TG@SCINV
-trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.49:443?allowInsecure=1#🇨🇦CA 1 → TG@SCINV
-trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@stw4-tg-data.amazonwebservicess.com:443?allowInsecure=1#🇨🇦CA 4 → TG@SCINV
+trojan://a58ee451-368e-46d5-a57d-7d6dab1b4c42@hk2.downloadvip.cfd:443?allowInsecure=1&sni=download.xn--mes358a9urctx.com#🇯🇵JP 2 → TG@SCINV
+trojan://b31eb45e-7f95-465f-8229-716058f6dc49@bgptw5.cnamazon.sbs:443?allowInsecure=1&sni=tlsdata.cnamazon.sbs#🇨🇦CA 2 → TG@SCINV
+trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.207:443?allowInsecure=1#🇨🇦CA 4 → TG@SCINV
+trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.229:443?allowInsecure=1#🇨🇦CA 3 → TG@SCINV
+trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@165.154.246.49:443?allowInsecure=1#🇨🇦CA 5 → TG@SCINV
+trojan://ca7febc2-bb45-4e6d-810e-ab0af6009c4e@stw7-tg-data.amazonwebservicess.com:443?allowInsecure=1#🇨🇦CA 1 → TG@SCINV
 trojan://cf4295378e209e70d12c5bdd017144dfd1c772d3@170.187.134.190:8443?allowInsecure=1&sni=170-187-134-190.ipv4.rush.ml#🇺🇸US 1 → TG@SCINV
 trojan://d906afe5-7c3c-4ddc-aaa4-61c154a82e5e@152.70.74.66:443?allowInsecure=1#🇺🇸US 4 → TG@SCINV
 trojan://edccc909-b7d2-42b2-8bb1-fd74854f66b1@kr1.microsoft-orgwly.vip:443?allowInsecure=1&sni=tls.microsoft-orgwly.vip#🇯🇵JP 4 → TG@SCINV
--- a/utils/pool/output.yaml
+++ b/utils/pool/output.yaml
@@ -60,7 +60,7 @@ proxies:
  password: 275ec150-da51-11ed-893a-1239d0255272
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 9 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 9 TJN"
  server: kr.stablize.top
  type: trojan
  country: "\U0001F1ED\U0001F1F0HK"
@@ -76,7 +76,7 @@ proxies:
  password: af4dc66a-ec88-4057-9e46-777b584577f7
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 11 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 11 TJN"
  server: sg.stablize.top
  type: trojan
  country: "\U0001F1ED\U0001F1F0HK"
@@ -188,7 +188,7 @@ proxies:
  password: 0d234e81-52f2-44a7-8bcc-b9e737c3830f
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 25 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 25 TJN"
  server: vpnhat.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -204,7 +204,7 @@ proxies:
  password: ee20db28-0e13-4936-96b1-37bfa5244854
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 27 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 27 TJN"
  server: jp.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -220,7 +220,7 @@ proxies:
  password: b00ac480-3e34-4ca9-8b3b-0b4515e4b75d
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 29 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 29 TJN"
  server: aujs.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -228,7 +228,7 @@ proxies:
  password: c0cf56d4-08a7-4436-9e6a-3feebe142706
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 30 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 30 TJN"
  server: sg.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -244,7 +244,7 @@ proxies:
  password: b00ac480-3e34-4ca9-8b3b-0b4515e4b75d
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 32 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 32 TJN"
  server: sg.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -260,7 +260,7 @@ proxies:
  password: 4935d10a-b305-4b3b-8bb0-f8f7feb3640d
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 34 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 34 TJN"
  server: dejs.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -332,7 +332,7 @@ proxies:
  password: 74400921-f59f-4009-b52a-c2789b49fab6
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 43 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 43 TJN"
  server: kr.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -372,7 +372,7 @@ proxies:
  password: 7561d9a0-af44-405d-81ae-f056fbc03675
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 48 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 48 TJN"
  server: aujs.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -508,7 +508,7 @@ proxies:
  password: 9014ea56-3fec-43d8-bed6-af7bcb5e2cb3
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 65 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 65 TJN"
  server: ap.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -532,7 +532,7 @@ proxies:
  password: 8d1e94cd-23cf-4267-b630-c6894e6e1b4d
  skip-cert-verify: true
  udp: true
- name: "\U0001F1FA\U0001F1F8 US 68 TJN"
+- name: "\U0001F1EF\U0001F1F5 JP 68 TJN"
  server: ap.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -540,7 +540,7 @@ proxies:
  password: 9478e27c-6bdd-4f0e-ba46-90d9739e1e34
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 69 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 69 TJN"
  server: uk.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -556,7 +556,7 @@ proxies:
  password: b327d1e6-3abc-4ce5-81f3-620ea3f10647
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 71 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 71 TJN"
  server: sg.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -604,7 +604,7 @@ proxies:
  password: 8d1e94cd-23cf-4267-b630-c6894e6e1b4d
  skip-cert-verify: true
  udp: true
- name: "\U0001F1EF\U0001F1F5 JP 77 TJN"
+- name: "\U0001F1FA\U0001F1F8 US 77 TJN"
  server: jp.stablize.top
  type: trojan
  country: "\U0001F1FA\U0001F1F8US"
@@ -783,9 +783,9 @@ proxy-groups:
  - "\U0001F1EF\U0001F1F5 JP 6 TJN"
  - "\U0001F1EF\U0001F1F5 JP 7 TJN"
  - "\U0001F1F8\U0001F1EC SG 8 TJN"
-  - "\U0001F1FA\U0001F1F8 US 9 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 9 TJN"
  - "\U0001F1FA\U0001F1F8 US 10 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 11 TJN"
+  - "\U0001F1FA\U0001F1F8 US 11 TJN"
  - "\U0001F1FA\U0001F1F8 US 12 TJN"
  - "\U0001F1FA\U0001F1F8 US 13 TJN"
  - "\U0001F1FA\U0001F1F8 US 14 TJN"
@@ -799,16 +799,16 @@ proxy-groups:
  - "\U0001F1FA\U0001F1F8 US 22 TJN"
  - "\U0001F1EF\U0001F1F5 JP 23 TJN"
  - "\U0001F1FA\U0001F1F8 US 24 TJN"
-  - "\U0001F1FA\U0001F1F8 US 25 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 25 TJN"
  - "\U0001F1ED\U0001F1F0 HK 26 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 27 TJN"
+  - "\U0001F1FA\U0001F1F8 US 27 TJN"
  - "\U0001F1FA\U0001F1F8 US 28 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 29 TJN"
-  - "\U0001F1FA\U0001F1F8 US 30 TJN"
+  - "\U0001F1FA\U0001F1F8 US 29 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 30 TJN"
  - "\U0001F1FA\U0001F1F8 US 31 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 32 TJN"
+  - "\U0001F1FA\U0001F1F8 US 32 TJN"
  - "\U0001F1FA\U0001F1F8 US 33 TJN"
-  - "\U0001F1FA\U0001F1F8 US 34 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 34 TJN"
  - "\U0001F1FA\U0001F1F8 US 35 TJN"
  - "\U0001F1EE\U0001F1F3 IN 36 TJN"
  - "\U0001F1FA\U0001F1F8 US 37 TJN"
@@ -817,12 +817,12 @@ proxy-groups:
  - "\U0001F1FA\U0001F1F8 US 40 TJN"
  - "\U0001F1FA\U0001F1F8 US 41 TJN"
  - "\U0001F1FA\U0001F1F8 US 42 TJN"
-  - "\U0001F1FA\U0001F1F8 US 43 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 43 TJN"
  - "\U0001F1FA\U0001F1F8 US 44 TJN"
  - "\U0001F1FA\U0001F1F8 US 45 TJN"
  - "\U0001F1EF\U0001F1F5 JP 46 TJN"
  - "\U0001F1EF\U0001F1F5 JP 47 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 48 TJN"
+  - "\U0001F1FA\U0001F1F8 US 48 TJN"
  - "\U0001F1FA\U0001F1F8 US 49 TJN"
  - "\U0001F1EF\U0001F1F5 JP 50 TJN"
  - "\U0001F1EF\U0001F1F5 JP 51 TJN"
@@ -839,19 +839,19 @@ proxy-groups:
  - "\U0001F1EF\U0001F1F5 JP 62 TJN"
  - "\U0001F1FA\U0001F1F8 US 63 TJN"
  - "\U0001F1FA\U0001F1F8 US 64 TJN"
-  - "\U0001F1FA\U0001F1F8 US 65 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 65 TJN"
  - "\U0001F1ED\U0001F1F0 HK 66 TJN"
  - "\U0001F1ED\U0001F1F0 HK 67 TJN"
-  - "\U0001F1FA\U0001F1F8 US 68 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 69 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 68 TJN"
+  - "\U0001F1FA\U0001F1F8 US 69 TJN"
  - "\U0001F1FA\U0001F1F8 US 70 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 71 TJN"
+  - "\U0001F1FA\U0001F1F8 US 71 TJN"
  - "\U0001F1FA\U0001F1F8 US 72 TJN"
  - "\U0001F1ED\U0001F1F0 HK 73 TJN"
  - "\U0001F1ED\U0001F1F0 HK 74 TJN"
  - "\U0001F1ED\U0001F1F0 HK 75 TJN"
  - "\U0001F1ED\U0001F1F0 HK 76 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 77 TJN"
+  - "\U0001F1FA\U0001F1F8 US 77 TJN"
  - "\U0001F1FA\U0001F1F8 US 78 TJN"
  - "\U0001F1EF\U0001F1F5 JP 79 TJN"
  - "\U0001F1FA\U0001F1F8 US 80 TJN"
@@ -887,9 +887,9 @@ proxy-groups:
  - "\U0001F1EF\U0001F1F5 JP 6 TJN"
  - "\U0001F1EF\U0001F1F5 JP 7 TJN"
  - "\U0001F1F8\U0001F1EC SG 8 TJN"
-  - "\U0001F1FA\U0001F1F8 US 9 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 9 TJN"
  - "\U0001F1FA\U0001F1F8 US 10 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 11 TJN"
+  - "\U0001F1FA\U0001F1F8 US 11 TJN"
  - "\U0001F1FA\U0001F1F8 US 12 TJN"
  - "\U0001F1FA\U0001F1F8 US 13 TJN"
  - "\U0001F1FA\U0001F1F8 US 14 TJN"
@@ -903,16 +903,16 @@ proxy-groups:
  - "\U0001F1FA\U0001F1F8 US 22 TJN"
  - "\U0001F1EF\U0001F1F5 JP 23 TJN"
  - "\U0001F1FA\U0001F1F8 US 24 TJN"
-  - "\U0001F1FA\U0001F1F8 US 25 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 25 TJN"
  - "\U0001F1ED\U0001F1F0 HK 26 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 27 TJN"
+  - "\U0001F1FA\U0001F1F8 US 27 TJN"
  - "\U0001F1FA\U0001F1F8 US 28 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 29 TJN"
-  - "\U0001F1FA\U0001F1F8 US 30 TJN"
+  - "\U0001F1FA\U0001F1F8 US 29 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 30 TJN"
  - "\U0001F1FA\U0001F1F8 US 31 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 32 TJN"
+  - "\U0001F1FA\U0001F1F8 US 32 TJN"
  - "\U0001F1FA\U0001F1F8 US 33 TJN"
-  - "\U0001F1FA\U0001F1F8 US 34 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 34 TJN"
  - "\U0001F1FA\U0001F1F8 US 35 TJN"
  - "\U0001F1EE\U0001F1F3 IN 36 TJN"
  - "\U0001F1FA\U0001F1F8 US 37 TJN"
@@ -921,12 +921,12 @@ proxy-groups:
  - "\U0001F1FA\U0001F1F8 US 40 TJN"
  - "\U0001F1FA\U0001F1F8 US 41 TJN"
  - "\U0001F1FA\U0001F1F8 US 42 TJN"
-  - "\U0001F1FA\U0001F1F8 US 43 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 43 TJN"
  - "\U0001F1FA\U0001F1F8 US 44 TJN"
  - "\U0001F1FA\U0001F1F8 US 45 TJN"
  - "\U0001F1EF\U0001F1F5 JP 46 TJN"
  - "\U0001F1EF\U0001F1F5 JP 47 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 48 TJN"
+  - "\U0001F1FA\U0001F1F8 US 48 TJN"
  - "\U0001F1FA\U0001F1F8 US 49 TJN"
  - "\U0001F1EF\U0001F1F5 JP 50 TJN"
  - "\U0001F1EF\U0001F1F5 JP 51 TJN"
@@ -943,19 +943,19 @@ proxy-groups:
  - "\U0001F1EF\U0001F1F5 JP 62 TJN"
  - "\U0001F1FA\U0001F1F8 US 63 TJN"
  - "\U0001F1FA\U0001F1F8 US 64 TJN"
-  - "\U0001F1FA\U0001F1F8 US 65 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 65 TJN"
  - "\U0001F1ED\U0001F1F0 HK 66 TJN"
  - "\U0001F1ED\U0001F1F0 HK 67 TJN"
-  - "\U0001F1FA\U0001F1F8 US 68 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 69 TJN"
+  - "\U0001F1EF\U0001F1F5 JP 68 TJN"
+  - "\U0001F1FA\U0001F1F8 US 69 TJN"
  - "\U0001F1FA\U0001F1F8 US 70 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 71 TJN"
+  - "\U0001F1FA\U0001F1F8 US 71 TJN"
  - "\U0001F1FA\U0001F1F8 US 72 TJN"
  - "\U0001F1ED\U0001F1F0 HK 73 TJN"
  - "\U0001F1ED\U0001F1F0 HK 74 TJN"
  - "\U0001F1ED\U0001F1F0 HK 75 TJN"
  - "\U0001F1ED\U0001F1F0 HK 76 TJN"
-  - "\U0001F1EF\U0001F1F5 JP 77 TJN"
+  - "\U0001F1FA\U0001F1F8 US 77 TJN"
  - "\U0001F1FA\U0001F1F8 US 78 TJN"
  - "\U0001F1EF\U0001F1F5 JP 79 TJN"
  - "\U0001F1FA\U0001F1F8 US 80 TJN"