Merge branch 'master' into server

c6f76f0a · nanahira · ddac1a1a · 8ac28e8f · c6f76f0a · c6f76f0a
Commit c6f76f0a authored Jul 02, 2020 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 201 additions and 197 deletions

cards.cdb cards.cdb +0 -0

lflist.conf lflist.conf +195 -195

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +4 -0

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ 6969a86b
+++ b/ocgcore @ 6969a86b
-Subproject commit e7572c70fdd526209ccde5bb1b515ddc58f6ddfe
+Subproject commit 6969a86b3726117bc16ee8a95bc8f20ada2043c9
--- a/script @ 2a7871a2
+++ b/script @ 2a7871a2
-Subproject commit 3b3c82ec4bf1ad35b24847672203ba18f730e246
+Subproject commit 2a7871a29313e8dfe7f350c47e7366f0bb7e59b6
--- a/strings.conf
+++ b/strings.conf
@@ -1044,3 +1044,7 @@
 !setname 0x146 童话动物	メルフィー
 !setname 0x147 波波	ポータン
 !setname 0x148 罗兰	ローラン
+!setname 0x149 化石
+!setname 0x14a 源数	ヌメロン
+!setname 0x114a 源数之门	ゲート・オブ・ヌメロン
+!setname 0x14b 机块	機塊