Commit d3641498 authored by Dark Zane's avatar Dark Zane Committed by GitHub

Merge branch 'mycard:master' into master

parents 8288a178 1954335b
No preview for this file type
...@@ -658,6 +658,7 @@ ...@@ -658,6 +658,7 @@
!counter 0x69 Counter(Veda Upanishad) !counter 0x69 Counter(Veda Upanishad)
!counter 0x6a Resonance Counter !counter 0x6a Resonance Counter
!counter 0x6b Deranged Counter !counter 0x6b Deranged Counter
!counter 0x6c Access Counter
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 Ally of Justice !setname 0x1 Ally of Justice
!setname 0x2 Genex !setname 0x2 Genex
...@@ -1206,3 +1207,9 @@ ...@@ -1206,3 +1207,9 @@
!setname 0x1ab Ragnaraika !setname 0x1ab Ragnaraika
!setname 0x1ac Salamandra !setname 0x1ac Salamandra
!setname 0x1ad Ashened !setname 0x1ad Ashened
!setname 0x1ae Millennium
!setname 0x1af Exodo
!setname 0x1b0 Fiendsmith
!setname 0x1b1 White Woods
!setname 0x1b2 Multchummy
!setname 0x1b3 Emblema
No preview for this file type
...@@ -658,6 +658,7 @@ ...@@ -658,6 +658,7 @@
!counter 0x69 指示物(吠陀-优婆尼沙昙) !counter 0x69 指示物(吠陀-优婆尼沙昙)
!counter 0x6a 响鸣指示物 !counter 0x6a 响鸣指示物
!counter 0x6b 狂乱指示物 !counter 0x6b 狂乱指示物
!counter 0x6c 访问指示物
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 正义盟军 AOJ !setname 0x1 正义盟军 AOJ
!setname 0x2 次世代 ジェネクス !setname 0x2 次世代 ジェネクス
...@@ -1213,3 +1214,9 @@ ...@@ -1213,3 +1214,9 @@
!setname 0x1ab 蕾祸 蕾禍 !setname 0x1ab 蕾祸 蕾禍
!setname 0x1ac 飞龙炎 Salamandra !setname 0x1ac 飞龙炎 Salamandra
!setname 0x1ad 灰尽 Ashened !setname 0x1ad 灰尽 Ashened
!setname 0x1ae 千年
!setname 0x1af 艾格佐德
!setname 0x1b0 刻魔
!setname 0x1b1 白森林
!setname 0x1b2 欢聚友伴
!setname 0x1b3 徽记
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment