Merge remote-tracking branch 'upstream/master' into server

c0d89cc9 · wind2009 · c39ce2dc · 2f0cae84 · c0d89cc9 · 710b415a
Commit c0d89cc9 authored Dec 31, 2025 by wind2009
Expand all Show whitespace changes
Inline Side-by-side

Showing with 191 additions and 190 deletions

lflist.conf lflist.conf +189 -189

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/lflist.conf
+++ b/lflist.conf
--- a/script @ 710b415a
+++ b/script @ 710b415a
-Subproject commit 2e35b6bef542d26f25a6fbb7c72fec612ba9a39e
+Subproject commit 710b415accc778bbeb333a178dded0e12ce590be
--- a/strings.conf
+++ b/strings.conf
@@ -1277,3 +1277,4 @@
 !setname 0x1d7 艾克莉西娅	エクレシア
 !setname 0x1d8 耀圣	エルフェンノーツ
 !setname 0x1d9 磁力	マグネット
+!setname 0x1da 世界末日	エンド・オブ・ザ・ワールド