diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
| commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
| tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /npc/scripts.conf | |
| parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
| parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
| download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/scripts.conf')
| -rw-r--r-- | npc/scripts.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/scripts.conf b/npc/scripts.conf index b8f427ca1..fd16b357b 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -200,6 +200,7 @@ npc: npc/other/powernpc.txt npc: npc/other/pvp.txt // - Turbo Track Arena npc: npc/other/turbo_track.txt +npc: npc/other/item_merge.txt // --------------------------- Quests --------------------------- // - Quests-Tutorials for basic classes (1st class quests) ------ |