diff options
| author | shennetsind <notind@gmail.com> | 2013-06-08 12:46:37 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-06-08 12:46:37 -0700 |
| commit | 9fdea24a67a39e86c2ae4dd032f08021b35942dc (patch) | |
| tree | feea3cd428cee18be3da9bf0bee6d4570d9cad02 /npc/pre-re/scripts_main.conf | |
| parent | b0f866ca419d87fcb3625b45e2437e0a0bb1810e (diff) | |
| parent | d73783f22b2bb881aab74524d153d89a5932a199 (diff) | |
| download | hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.gz hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.bz2 hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.xz hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.zip | |
Merge pull request #4 from Earisu/master
Attempt to Merge Earisu's Hercules
Diffstat (limited to 'npc/pre-re/scripts_main.conf')
| -rw-r--r-- | npc/pre-re/scripts_main.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index e029447b5..db7ed1411 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt npc: npc/other/CashShop_Functions.txt // ------------------- Common Script Files ---------------------- -import: npc/scripts_athena.conf +import: npc/scripts.conf import: npc/scripts_guild.conf import: npc/scripts_jobs.conf import: npc/scripts_mapflags.conf @@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf import: npc/scripts_warps.conf // ----------------- Pre-Renewal Script Files ------------------- -import: npc/pre-re/scripts_athena.conf +import: npc/pre-re/scripts.conf import: npc/pre-re/scripts_jobs.conf import: npc/pre-re/scripts_monsters.conf import: npc/pre-re/scripts_warps.conf |