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 /conf | |
| 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 'conf')
| -rw-r--r-- | conf/atcommand.conf | 2 | ||||
| -rw-r--r-- | conf/battle/feature.conf | 2 | ||||
| -rw-r--r-- | conf/battle/items.conf | 2 | ||||
| -rw-r--r-- | conf/battle/player.conf | 2 | ||||
| -rw-r--r-- | conf/battle/skill.conf | 2 | ||||
| -rw-r--r-- | conf/battlegrounds.conf | 2 | ||||
| -rw-r--r-- | conf/readme.txt | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/conf/atcommand.conf b/conf/atcommand.conf index 3b3a156eb..fc2a1af73 100644 --- a/conf/atcommand.conf +++ b/conf/atcommand.conf @@ -68,4 +68,4 @@ nolog: { /* Commands help file */ help: { @include "conf/help.txt" -}
\ No newline at end of file +} diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf index 7e1f83707..440dbb31a 100644 --- a/conf/battle/feature.conf +++ b/conf/battle/feature.conf @@ -17,4 +17,4 @@ feature.search_stores: on // Atcommand suggestions (Note 1) // If one type incomplete atcommand, it will suggest the complete ones. -feature.atcommand_suggestions: off
\ No newline at end of file +feature.atcommand_suggestions: off diff --git a/conf/battle/items.conf b/conf/battle/items.conf index 05aadfecd..3a4eb8083 100644 --- a/conf/battle/items.conf +++ b/conf/battle/items.conf @@ -85,4 +85,4 @@ item_restricted_consumption_type:1 // Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt) // 1 : yes(official) // 0 : no -item_enabled_npc:1
\ No newline at end of file +item_enabled_npc:1 diff --git a/conf/battle/player.conf b/conf/battle/player.conf index ccad0afc0..436399469 100644 --- a/conf/battle/player.conf +++ b/conf/battle/player.conf @@ -147,4 +147,4 @@ min_npc_vendchat_distance: 3 // Super Novice's fury is enabled to increments of 10%, such as at 10.0%, 20.0% - 80.0%, 90.0% // Changing snovice_call_type config to 1 enables its use at 0%, for maxed super novices. // default: 0 -snovice_call_type: 0
\ No newline at end of file +snovice_call_type: 0 diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf index bc107f3d7..9f0b98f90 100644 --- a/conf/battle/skill.conf +++ b/conf/battle/skill.conf @@ -279,4 +279,4 @@ skill_trap_type: 0 // Max Possible Level of Monster skills // Note: If your MVPs are too tough, reduce it to 10. -mob_max_skilllvl: 100
\ No newline at end of file +mob_max_skilllvl: 100 diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf index 9412829b2..6864d1584 100644 --- a/conf/battlegrounds.conf +++ b/conf/battlegrounds.conf @@ -108,4 +108,4 @@ battlegrounds: ( pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ } ) -})
\ No newline at end of file +}) diff --git a/conf/readme.txt b/conf/readme.txt index 24b113983..3323b5689 100644 --- a/conf/readme.txt +++ b/conf/readme.txt @@ -19,4 +19,4 @@ and you'll eliminate any problems updating in the future. Neat, isn't it? -- Semi-guide by Ajarn / Euphy
\ No newline at end of file +- Semi-guide by Ajarn / Euphy |