diff options
| author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
| commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
| tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /npc/scripts.conf | |
| parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
| parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
| download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip | |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
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) ------ |