Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Fluorohydride/ygopro
Browse files Browse the repository at this point in the history
  • Loading branch information
mercury233 committed Oct 18, 2020
2 parents e754d65 + a1f658b commit 662aa6a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions strings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@
!setname 0x12f 蜂军 B・F(ビー・フォース)
!setname 0x130 破械
!setname 0x1130 破械神
!setname 0x131 梦镜 Dream Mirror
!setname 0x131 梦魔镜 夢魔鏡
!setname 0x132 斩机 斬機
!setname 0x133 半龙女仆 ドラゴンメイド
!setname 0x134 王战 ジェネレイド
Expand All @@ -1009,7 +1009,7 @@
!setname 0x13c 代码破坏者 コードブレイカー
!setname 0x13d 星义 ネメシス
!setname 0x13e 巴巴罗斯 バルバロス
!setname 0x13f 巡掠海魔 Plunder Patroll
!setname 0x13f 海造贼 海造賊
!setname 0x140 魔救 アダマシア
!setname 0x141 六花
#setname 0x142 黄金国 エルド
Expand Down

0 comments on commit 662aa6a

Please sign in to comment.