Akkarinage 3bd3b81749 Merge remote-tracking branch 'remotes/rAthena/master' ...

Conflicts:
	src/map/guild.c

2014-01-12 19:19:05 +00:00

..

import-tmpl

Db import3

2014-01-01 21:45:40 -05:00

pre-re

3rd Class 2011 Post Balance Update

2014-01-10 10:36:53 -05:00

re

* Follow up 0f7ecd0, wrong skill state requirement. Thank Elias

2014-01-13 01:17:20 +07:00

abra_db.txt

-Upd abracadabra_db thank to Playtester.

2013-06-19 05:16:24 +00:00

castle_db.txt

Removed unused flag in /db/castle_db.txt

2014-01-12 16:18:53 +00:00

const.txt

Typo

2014-01-11 20:58:10 +07:00

create_arrow_db.txt

Fixed Garms iRO name. (bugreport:5421)

2012-03-12 19:50:51 +00:00

elemental_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

elemental_skill_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

GeoIP.dat

> Hercules merges:

2013-03-27 21:57:45 +00:00

guild_skill_tree.txt

* Random documentation of database files.

2011-10-28 12:37:16 +00:00

homun_skill_tree.txt

Partial fix for bugreport:4337.

2012-11-23 18:15:21 +00:00

item_avail.txt

* Random documentation of database files.

2011-10-28 12:37:16 +00:00

item_findingore.txt

- Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.

2006-12-05 13:23:07 +00:00

item_nouse.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

item_stack.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

job_db2.txt

Follow up 96443cd:

2013-12-29 23:55:13 +07:00

magicmushroom_db.txt

* Follow ups of:

2013-12-30 20:03:21 +07:00

map_index.txt

* Updated mapcache up to 2012-08-08. Adds WoE TE, Malaya, Eclage, Hall of Abyss and Izlude Novice Tutorial maps. (ea:15176, bugreport:5927)

2013-02-19 00:08:22 +00:00

mercenary_db.txt

* Updated mob spawns for Undersea Tunnel floor 6. (ea:15236)

2013-03-21 22:33:07 +00:00

mercenary_skill_db.txt

* Follow-up r17205, added new mercenary skills and scrolls.

2013-03-25 04:17:45 +00:00

mob_avail.txt

* Standardization in some database files, and other minor cleaning

2012-08-27 02:26:35 +00:00

mob_chat_db.txt

-Add max hpsp table, (Offi) thx Daegaladh.

2013-06-29 01:39:07 +00:00

mob_classchange.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

mob_item_ratio.txt

* Standardization in some database files, and other minor cleaning

2012-08-27 02:26:35 +00:00

mob_pouch.txt

Updated summoning items files to episode 13.2 (pre-re) and 13.3 (re).

2012-07-18 04:18:33 +00:00

packet_db.txt

DB Import2

2014-01-01 21:33:08 -05:00

pet_db.txt

* Renewal item database update - 320 items affected.

2013-08-08 01:43:41 -04:00

produce_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

quest_db.txt

Update quest_db.txt

2014-01-12 18:15:39 +00:00

size_fix.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

skill_changematerial_db.txt

Fixed bugreport:6516 where duplicate entry in produce_db.txt is been ignored when both required skills are present in a character (ex. AM_PHARMACY w/ GN_CHANGEMATERIAL)

2012-08-27 11:41:16 +00:00

skill_copyable_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

skill_damage_db.txt

* Updated FRN and RUS map_msg translations. (credits: Capuche, Jarek)

2013-08-30 21:46:45 -04:00

skill_improvise_db.txt

* Standardization in some database files, and other minor cleaning

2012-08-27 02:26:35 +00:00

skill_nonearnpc_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00

spellbook_db.txt

Standardized formatting of database files.

2013-12-29 15:58:17 -05:00