Merge branch 'master' into koishibuild

purerosefallen · Feb 26, 2018 · 4b3f0c9 · 4b3f0c9
2 parents 4f1d8bf + ef93e09
commit 4b3f0c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cards.cdb b/cards.cdb
diff --git a/strings.conf b/strings.conf
@@ -887,3 +887,6 @@
 !setname 0x111 武装龙	アームド・ドラゴン
 !setname 0x112 幻崩	トロイメア
 !setname 0x113 灵神	霊神
+!setname 0x114 空牙团
+!setname 0x115 闪刀
+!setname 0x1115 闪刀姬