diff options
author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/quests/quests_izlude.txt | |
parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/re/quests/quests_izlude.txt')
-rw-r--r-- | npc/re/quests/quests_izlude.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt index 2bc548b70..9e7b34746 100644 --- a/npc/re/quests/quests_izlude.txt +++ b/npc/re/quests/quests_izlude.txt @@ -12,8 +12,8 @@ //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ -izlude,179,219,2 duplicate(Edgar_izlude) Edgar#izlude 49 -izlude_a,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_a 49 -izlude_b,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_b 49 -izlude_c,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_c 49 -izlude_d,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_d 49 +izlude,179,219,2 duplicate(Edgar_izlude) Edgar#izlude 1_M_03 +izlude_a,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_a 1_M_03 +izlude_b,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_b 1_M_03 +izlude_c,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_c 1_M_03 +izlude_d,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_d 1_M_03 |