branch sync

This commit is contained in:
mark 2012-11-11 00:04:51 +00:00
parent e10ca1fe1e
commit 24490dff69
5 changed files with 87 additions and 54 deletions

View file

@ -299,8 +299,10 @@ namespace Server.Engines.ConPVP
new string[]
{
"Bandages",
"Wands",
"Trapped Containers",
"Bolas",
"Mounts",
"Orange Petals",
"Shurikens",
"Fukiya Darts",
@ -326,9 +328,12 @@ namespace Server.Engines.ConPVP
new string[]
{
"Bandages",
"Wands",
"Trapped Containers",
"Bolas",
"Orange Petals"
"Mounts",
"Orange Petals",
"Fire Horns"
} ) );
}