Lemongrass3110 e605adbd17 Merge branch 'master' into feature/store_taxes ...

# Conflicts:
#	conf/msg_conf/map_msg.conf
#	src/map/battle.cpp
#	src/map/battle.hpp
#	src/map/vending.cpp
#	src/map/vending.hpp

2018-06-14 22:20:16 +02:00

..

import-tmpl

* Implemented Mora Enchants.

2013-06-03 02:07:41 +00:00

char_msg.conf

Initial support for Star Emperor and Soul Reaper (#3184)

2018-06-14 08:16:10 +02:00

login_msg.conf

- Added svn:eol-style=native property.

2013-03-12 17:23:45 +00:00

map_msg_chn.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_frn.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_grm.conf

Expanded baby jobs (#2039)

2017-04-06 18:00:30 -04:00

map_msg_idn.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_mal.conf

Added map_msg_mal.conf

2018-02-23 11:32:27 +01:00

map_msg_por.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_rus.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_spn.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg_tha.conf

Fixed Endow skills to match official behavior. (#2918)

2018-02-22 16:23:11 -05:00

map_msg.conf

Merge branch 'master' into feature/store_taxes

2018-06-14 22:20:16 +02:00