Commit 9ad064de authored by nanahira's avatar nanahira

Merge branch 'master' into another

parents 6496ac95 65b09a8c
......@@ -1019,3 +1019,4 @@
!setname 0x138 巨石遗物 メガリス
!setname 0x139 守护神官 守護神官
!setname 0x13a 拟声 オノマト
!setname 0x13b 叛逆 リベリオン
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