diff options
| author | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
| commit | 8bed1531de1deceae20e09bc2d59470f586a94f6 (patch) | |
| tree | 5909c98606ebb26a70c15e16b6a26c8cac081088 /conf | |
| parent | e4b0f270ad0fabab869c1a803fa8e4a73f198760 (diff) | |
| parent | f8f073bc7ebd1bc5cf19e8ea9b72a54bba7fab8b (diff) | |
| download | hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.gz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.bz2 hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.xz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/help.txt | 2 | ||||
| -rw-r--r-- | conf/messages.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/help.txt b/conf/help.txt index 18630bf59..211ed5b19 100644 --- a/conf/help.txt +++ b/conf/help.txt @@ -102,7 +102,7 @@ jobchange: "Params: <job name|ID>\n" "Changes your job.\n" " 23 Super Novice 24 Gunslinger 25 Ninja 4045 Super Baby\n" "4046 Taekwon 4047 Star Gladiator 4049 Soul Linker 4050 Gangsi\n" "4051 Death Knight 4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby\n" - "4211 Kagerou 4212 Oboro\n" + "4211 Kagerou 4212 Oboro 4215 Rebellion\n" "----- Baby Novice And Baby 1st Class -----\n" "4023 Baby Novice 4024 Baby Swordman 4025 Baby Magician 4026 Baby Archer\n" "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief\n" diff --git a/conf/messages.conf b/conf/messages.conf index d7b25a258..fc8599f5b 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -652,6 +652,7 @@ 691: Sura T 692: Genetic T 693: Shadow Chaser T +694: Rebellion //------------------------------------ |