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 /db/re | |
| 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 'db/re')
| -rw-r--r-- | db/re/exp_guild.txt | 2 | ||||
| -rw-r--r-- | db/re/item_chain.conf | 2 | ||||
| -rw-r--r-- | db/re/item_db.txt | 2 | ||||
| -rw-r--r-- | db/re/item_group.conf | 2 | ||||
| -rw-r--r-- | db/re/map_zone_db.conf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/db/re/exp_guild.txt b/db/re/exp_guild.txt index dcf57d159..928047600 100644 --- a/db/re/exp_guild.txt +++ b/db/re/exp_guild.txt @@ -48,4 +48,4 @@ 220900000 230400000 240100000 -250000000
\ No newline at end of file +250000000 diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf index f7591b934..bedb33d73 100644 --- a/db/re/item_chain.conf +++ b/db/re/item_chain.conf @@ -101,4 +101,4 @@ ITMCHAIN_FOOD: { Sweet_Potato: 100 Banana: 100 Apple: 600 -}
\ No newline at end of file +} diff --git a/db/re/item_db.txt b/db/re/item_db.txt index b9c3c8c09..b4c2ca654 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -8295,4 +8295,4 @@ 21004,Alca_Bringer_,Alca Bringer,4,20,,3400,280,,2,2,0x00004080,56,2,34,3,100,1,3,{},{},{} 21005,Metal_Two_Hand_Sword,Metal Two-Handed Sword,4,20,,0,95,,1,1,0x00004082,63,2,34,3,0,1,3,{},{},{} 22514,Candy_Holder,Candy Holder,11,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} -22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
\ No newline at end of file +22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{} diff --git a/db/re/item_group.conf b/db/re/item_group.conf index 92a98fedc..85d2610fb 100644 --- a/db/re/item_group.conf +++ b/db/re/item_group.conf @@ -4741,4 +4741,4 @@ Lucky_Bag: ( ("Taiwan_Luk_Coin",3), "Big_Luk_Bookmark" ) -*/
\ No newline at end of file +*/ diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index f51fd8fc6..384384fec 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -334,4 +334,4 @@ zones: ( Greed_Scroll: true } } -)
\ No newline at end of file +) |