Merge branch 'master' of github.com:EQEmu/Server

Conflicts:
	changelog.txt
This commit is contained in:
Michael Cook
2013-12-14 16:44:04 -05:00
8 changed files with 54 additions and 24 deletions
+1
View File
@@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
== 12/14/2013 ==
demonstar55: Blocked buffs shouldn't fail, they should just not be applied.
JJ: Changed enable/disable recipe to confirm change made.
== 12/13/2013 ==
Kayen: Implemented additional functionality for SE_CurrentHP utilizing base2 values. (ie limit to body type)