> Hercules merges:
* 5b37805:
Items are no longer unequipped when a card within them is blacklisted (e.g. item_unequip.txt), instead the card's effect is nullified.

* cc8e005:
item_noequip overhaul.
Items are no longer unequipped when disabled by item_noequip.txt, instead their effects are nullified -- however cards in them, unless also disabled, wont have its effect nullified.
Consumables will be consumed even while disabled, unless you modify the new config item_restricted_consumption_type.

* 7192b10:
SECURE_NPCTIMEOUT should be fully functional now, fixed remaining known issues. (bugreport:5343)

* 63145d6:
Where casting MO_EXTREMITY to untargetable targets causes the caster to move in fixed location/coordinate.

* 17f2e6a:
Fixed clif.c::clif_parse_NpcSelectMenu.  SECURE_NPCTIMEOUT is always defined; the check is wrong.

* 125b758:
Added New Char-Server Rename Packet.

* d6d49c4:
Updated Safety Wall Renewal behavior, when taking damage higher than the health of the safety wall, excess damage will no longer be passed to the player.
Fixes bugreport:6243, bugreport:6697.

* 7626b14:
Fixed wrong 'if' condition in checking CELL_CHKNOPASS for the OFFICIAL_WALKPATH where clear path is considered to be limited to 14 cells it should only be with obstacles. (follow-up r17091, bugreport:7239)

* 0dbbe22:
Fixed magical reflection behavior, user reflecting now visually casts the skill back at the caster, instead of caster casting it on itself.

* 4671a39:
Monsters in stone curse pre-stone state no longer are able to attack.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17119 54d463be-8e91-2dee-dedb-b68131a5f0ec