summaryrefslogtreecommitdiff
path: root/conf/messages.conf
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
committershennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
commit7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854 /conf/messages.conf
parenta2405882a4123d6a11d24e895b40148dc7cb455e (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'conf/messages.conf')
-rw-r--r--conf/messages.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index 3a16d8054..7b7a99301 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1532,5 +1532,7 @@
1487: Character cannot be disguised while in monster form.
1488: Transforming into monster is not allowed in Guild Wars.
+//CashShop mapflag
+1489: Cash Shop is disabled in this map
//Custom translations
import: conf/import/msg_conf.txt