merge

changelog.txt

@@ -1,5 +1,19 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+
+== 07/16/2014 ==
+Uleat: Initial commit of new client/server 'dictionaries' - work in-progress... Changed equipment slot references to reflect new naming
+conventions. Lua enumerations maintain both the old and new names as to not break existing scripts..but, the old names are deprecated.
+
+
+== 07/14/2014 ==
+KLS: Changes to CMake build
+	-Lua builds by default now
+	-Common has been renamed common
+	-Binary files will now be put into ${CMAKE_BINARY_DIR}/bin instead of ${CMAKE_BINARY_DIR}/Bin
+	The last two are of note to people on non-windows systems as case sensitivity is important.  Edit your scripts accordingly, thank you.
+
+
 == 07/10/2014 ==
 Kayen: Updated table npc_spells to now support defensive and ranged procs. 
 Note: Proc rate modifier work as it does for spell effects (ie 200 = 200% baseline chance modifier)
@@ -33,6 +47,7 @@ Param3: Percent Total Damage modifier
 Required SQL: utils/sql/git/required/2014_07_10_npc_spells.sql
 Optional SQL: utils/sql/git/optional/2014_07_10_AICastingRules.sql
 
+
 == 07/5/2014 ==
 Kayen: Updated SE_Sanctuary - Adjust way hate lowering effect worked to be more accurate
 Kayen: Updated SE_SympatheticProc - Revised proc rate formula to be accurate to live.