diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
| commit | 5bf55eacfdf7cfd0036bf51e78a2f04f9b55feb0 (patch) | |
| tree | 9653ff7011d0b370c1360e09590c09ebec4f7e9a /src/server/game/Miscellaneous/Language.h | |
| parent | e07d3ebe4e6d2d797cb77ba65fb52efbef3462d9 (diff) | |
| parent | 15a9c6729ee274044b2ba78f8b9ad3c167c94bd1 (diff) | |
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
Diffstat (limited to 'src/server/game/Miscellaneous/Language.h')
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index fe38c0dff62..41654f80dd4 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1118,8 +1118,15 @@ enum TrinityStrings LANG_COMMAND_INST_STAT_GROUPSBOUND = 5054, LANG_NOT_DUNGEON = 5055, // Map is not a dungeon. LANG_NO_INSTANCE_DATA = 5056, // Map has no instance data. + LANG_COMMAND_INST_SET_BOSS_STATE = 5057, + LANG_COMMAND_INST_GET_BOSS_STATE = 5058, - // Room for more Trinity strings 5057-9999 + // Mutehistory commands + LANG_COMMAND_MUTEHISTORY = 5059, + LANG_COMMAND_MUTEHISTORY_EMPTY = 5060, + LANG_COMMAND_MUTEHISTORY_OUTPUT = 5061, + + // Room for more Trinity strings 5062-9999 // Level requirement notifications LANG_SAY_REQ = 6604, |