--- deliantra/server/Changes	2009/01/12 19:12:16	1.332
+++ deliantra/server/Changes	2009/01/25 23:56:13	1.339
@@ -1,6 +1,7 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 Version numbers sort like decimal numbers.
 
+<<<<<<< Changes
 TODO: emergency swap mode is not working
 TODO: xs-warn doesn't end up in server log.
 TODO: 2008-07-13 00:41:27.8762 BUG: process_events(): removed object is on active list: {cnt:8720978,uuid:<1.37c8d364d>,name:"bomb",flags:[2,11],type:102}
@@ -20,12 +21,35 @@
 TODO: greeting message on what to do in dialog after race selection.
 TODO: health bars for earthwalls seem to start at 100% end die at 50%
 
+
+2009-01-23 07:55:29.4659 loading /opt/crossfire/share/deliantra-server/maps//mlab/cdcapart1.map (271878,0)
+2009-01-23 07:55:29.4712 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4713 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4714 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+
+	- convert me command from per-map to chat, which makes more sense, also
+          document it.
+
+=======
+        - more than one spellbooks of same class can now be given
+          in class selection.
+        - adjusted the starting_spell.trs treasure list to the recent
+          spell rebalancements.
+        - the IRC gateway filters IRC colors now.
+
+>>>>>>> 1.338
+2.76 Sat Jan 17 08:36:51 CET 2009
 	- (arch) fix quiver of Holding Bolts.
         - applying unpaid items will now examine them.
 	- add "What" column to body command, showing items in that slot.
         - redesigned and rebalanced lamps and torches.
         - add "..." to item names that have been shortened.
         - fixed "assign" function that squeezes strings into fixed length.
+        - add cursed effect to lamps and (some) torches.
+        - fixed bad assigned crafting skills and their tools.
 	
 2.75 Fri Jan  9 16:13:30 CET 2009
         - rebalanced lighting w.r.t. outdoor, darkness and see_in_dark.