diff options
| author | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
| commit | 5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch) | |
| tree | da13821a29480d88dcd872c682b26b75e5191482 /npc/re/quests | |
| parent | 4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff) | |
| parent | fe2f840e5d6cb4230ba02c47132790d067b3814d (diff) | |
| download | hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2 hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/re/quests')
| -rw-r--r-- | npc/re/quests/monstertamers.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_13_1.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_malaya.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_veins.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt index cc95d3749..c2a1388e1 100644 --- a/npc/re/quests/monstertamers.txt +++ b/npc/re/quests/monstertamers.txt @@ -12,4 +12,4 @@ //= 1.0 Duplicates for Monster Tamer //============================================================ -izlude_in,55,105,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125
\ No newline at end of file +izlude_in,55,105,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125 diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt index 107b7c029..f1908874e 100644 --- a/npc/re/quests/quests_13_1.txt +++ b/npc/re/quests/quests_13_1.txt @@ -14,4 +14,4 @@ // Onward to the New World //============================================================ -izlude,102,171,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100
\ No newline at end of file +izlude,102,171,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100 diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 002130ee6..96fb036b0 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -1480,4 +1480,4 @@ ma_fild02,308,262,3 script Guard#buwayacave 570,{ OnInit: disablenpc "Guard#buwayacave"; end; -}
\ No newline at end of file +} diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt index 3478fe16b..0f3df7828 100644 --- a/npc/re/quests/quests_veins.txt +++ b/npc/re/quests/quests_veins.txt @@ -12,4 +12,4 @@ //= 1.0 First version. //============================================================ -ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945
\ No newline at end of file +ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945 |