Commit Graph
12 Commits
Author SHA1 Message Date
asdlokj1qpi23 e88f8fd485 Merge remote-tracking branch 'fork/master' into dev
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/docker.yml
#	.gitignore
#	base/pref.example.toml
#	base/snippets/emoji.toml
#	base/snippets/emoji.txt
#	scripts/build.macos.release.sh
#	scripts/build.windows.release.sh
#	scripts/rules_config.conf
#	src/generator/config/subexport.cpp
#	src/handler/interfaces.cpp
#	src/handler/settings.cpp
#	src/parser/config/proxy.h
#	src/parser/subparser.cpp
#	src/parser/subparser.h
#	src/utils/map_extra.h
#	src/version.h
2025-03-25 14:08:43 +08:00
Fanx 05910ac5dd Update Flag category (#810) 2024-12-31 15:37:24 +08:00
Fanx ad47d18a23 Update Flag category 2024-10-25 19:09:18 +08:00
TAKO 6974910734 Update Flag category (#744)
* Update emoji.toml

* Update emoji.txt
2024-04-18 15:47:39 +08:00
TAKO 25b25f669d Fix wrong flag identification When converting Nigeria node (#654)
* Update emoji.toml

* Update emoji.txt
2023-11-06 21:58:11 +08:00
FeliiiciaWen f6e77b7706 Update emoji rules (#493) 2022-07-10 14:04:13 +08:00
Tindy X cf485873f9 Update Emoji rules (#452 #453 #456) 2022-04-03 02:05:46 +08:00
Jim Lee be420f765b Update Emoji rules (#439)
- 向部分地域添加地域代码匹配规则。
- 使用 \b 定位符来全字匹配地域与接入点英文缩写,避免匹配错误。(emoji.toml 中使用 \\b 转义)
- 前置高频地域匹配规则,并后置CN规则,以尽可能避免匹配错误。
- 同步 emoji.toml 与 emoji.txt 规则内容与顺序。
- 优化 CHN、IND、DEU 的匹配规则。
2022-01-14 00:26:57 +08:00
Leilei Chui 217891f150 Update Emojis (#433)
* Update emoji.toml

Add emoji rules for Canada

* Update emoji.txt

Add emoji rules for Canada
2022-01-06 01:53:56 +08:00
TAMAKOandhypenekoR 3fe9725553 Update Emoji (#396)
* change route.toml

Thanks to v1.mk

* Revert "change route.toml"

This reverts commit 3487792a0482d9da721c4eb0afbb3f22a9880916.

* change emoji.toml

Thanks to v1.mk

* Update emoji.toml

Co-authored-by: hypenekoR <20227709+SNSLogty@users.noreply.github.com>
2021-10-18 00:04:01 +08:00
TAMAKO f3571e35f8 Update Flags (#376)
* Add New Country Flags Rule

瑞典 冰岛 马恩岛 新西兰 以色列

* new flags
2021-09-22 13:07:46 +08:00
Tindy X 9797197c85 Add support for using TOML as configuration file format
Add basic support for trojan-grpc nodes.
Refactor codes.
2021-09-20 17:02:13 +08:00