Commit 7309edaa authored by nanahira's avatar nanahira

Merge branch 'master' of github.com:moecube/ygopro-database

parents 49127589 aba0cbea
No preview for this file type
...@@ -471,10 +471,10 @@ ...@@ -471,10 +471,10 @@
!system 1429 Ineligible Place. !system 1429 Ineligible Place.
!system 1430 Ineligible Position. !system 1430 Ineligible Position.
!system 1431 Ineligible Counter. !system 1431 Ineligible Counter.
!system 1440 Close Large Image !system 1440 Close picture
!system 1441 Zoom In !system 1441 Zoom in
!system 1442 Zoom Out !system 1442 Zoom out
!system 1443 Original !system 1443 Restore size
!system 1450 Pack Showcase !system 1450 Pack Showcase
!system 1451 AI Decks !system 1451 AI Decks
!system 1452 Uncategorized !system 1452 Uncategorized
...@@ -635,6 +635,7 @@ ...@@ -635,6 +635,7 @@
!counter 0x55 Counter(Cauldron of the Old Man) !counter 0x55 Counter(Cauldron of the Old Man)
!counter 0x56 Fire Fist Counter !counter 0x56 Fire Fist Counter
!counter 0x57 Phantasm Counter !counter 0x57 Phantasm Counter
!counter 0x58 Counter(Nezumihanabi)
#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
...@@ -666,7 +667,7 @@ ...@@ -666,7 +667,7 @@
!setname 0x12 Frog !setname 0x12 Frog
!setname 0x13 Meklord !setname 0x13 Meklord
!setname 0x3013 Meklord Emperor !setname 0x3013 Meklord Emperor
!setname 0x5013 Meklord Emperor !setname 0x5013 Meklord Astro
!setname 0x6013 Meklord Army !setname 0x6013 Meklord Army
!setname 0x15 B.E.S. !setname 0x15 B.E.S.
!setname 0x16 Roid !setname 0x16 Roid
...@@ -1031,7 +1032,7 @@ ...@@ -1031,7 +1032,7 @@
!setname 0x137 Ancient Warriors !setname 0x137 Ancient Warriors
!setname 0x138 Megalith !setname 0x138 Megalith
!setname 0x139 Palladium Oracle !setname 0x139 Palladium Oracle
!setname 0x13a Onomato !setname 0x13a Onomat
!setname 0x13b Rebellion !setname 0x13b Rebellion
!setname 0x13c Codebreaker !setname 0x13c Codebreaker
!setname 0x13d Nemesis !setname 0x13d Nemesis
...@@ -1054,8 +1055,12 @@ ...@@ -1054,8 +1055,12 @@
!setname 0x14b Appliancer !setname 0x14b Appliancer
#setname 0x14c Spiritual Art #setname 0x14c Spiritual Art
!setname 0x314c Spiritual Earth Art !setname 0x314c Spiritual Earth Art
#setname 0x514c Spiritual Water Art !setname 0x514c Spiritual Water Art
!setname 0x614c Spiritual Fire Art !setname 0x614c Spiritual Fire Art
#setname 0x914c Spiritual Wind Art !setname 0x914c Spiritual Wind Art
#setname 0xa14c Spiritual Light Art #setname 0xa14c Spiritual Light Art
#setname 0xc14c Dark Spirit Art #setname 0xc14c Dark Spirit Art
!setname 0x14d Tribrigade
!setname 0x14e Datascape
!setname 0x114e Datascape Gate
!setname 0x14f Souten
No preview for this file type
...@@ -631,6 +631,7 @@ ...@@ -631,6 +631,7 @@
!counter 0x55 指示物(隐居者的大釜) !counter 0x55 指示物(隐居者的大釜)
!counter 0x56 炎星指示物 !counter 0x56 炎星指示物
!counter 0x57 幻魔指示物 !counter 0x57 幻魔指示物
!counter 0x58 指示物(祢须三破鸣比)
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 正义盟军 AOJ !setname 0x1 正义盟军 AOJ
!setname 0x2 次世代 ジェネクス !setname 0x2 次世代 ジェネクス
...@@ -1057,8 +1058,12 @@ ...@@ -1057,8 +1058,12 @@
!setname 0x14b 机块 機塊 !setname 0x14b 机块 機塊
#setname 0x14c 灵术 霊術 #setname 0x14c 灵术 霊術
!setname 0x314c 地灵术 地霊術 !setname 0x314c 地灵术 地霊術
#setname 0x514c 水灵术 水霊術 !setname 0x514c 水灵术 水霊術
!setname 0x614c 火灵术 火霊術 !setname 0x614c 火灵术 火霊術
#setname 0x914c 风灵术 風霊術 !setname 0x914c 风灵术 風霊術
#setname 0xa14c 光灵术 光霊術 #setname 0xa14c 光灵术 光霊術
#setname 0xc14c 暗灵术 闇霊術 #setname 0xc14c 暗灵术 闇霊術
!setname 0x14d 铁兽 トライブリゲード
!setname 0x14e 电脑堺 電脳堺
!setname 0x114e 电脑堺门 電脳堺門
!setname 0x14f 双天
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