--- deliantra/server/Changes	2009/01/25 23:56:13	1.339
+++ deliantra/server/Changes	2009/03/18 11:09:13	1.352
@@ -1,7 +1,6 @@
 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}
@@ -30,17 +29,40 @@
 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-03-14 06:45:26.9431 BUG: kill_object - unable to find skill that killed monster
+2009-03-14 06:45:26.9431+op: {cnt:72777397,uuid:<1.522cc7a2a>,name:"PurpleHaze",flags:[0,11,15],type:1}(on /pup_land/raffle/raffle1_u1@1+9)
+2009-03-14 06:45:26.9431+hitter: {cnt:75846626,uuid:<1.54ad1e25d>,name:"earth elemental",flags:[0,11,14,15],type:0}(on /pup_land/raffle/raffle1_u1@6+15)
+2009-03-14 06:45:26.9431+owner: {cnt:75967614,uuid:<1.54ad3baf9>,name:"goblin",flags:[0,7,8,11,14,54,55,56,57,58,60,89],type:0}(on /pup_land/raffle/raffle1_u1@5+16)
+
+
+	- aggressively merge spell effects and do not allow more than 5 spell
+          effects (w.r.t. put_more) per mapspace, to give the server a chance
+          to survive a hundred deathsheads.
+        - correctly clear op->env when inserting onto map, this was a potentially
+          disastrous bug of unfortunately unknown proportions...
+        - fix cone-spell symmetry that was broken for direction 8.
+	- use gender-neutral place descriptions for invite.
+        - (arch) new faces for alchemist class, wizard class and quetzalcoatl race.
+          Thanks go to Lisa Larsen!
+        - remove support for colour reducing 32x32 images (no cfclient support anymore).
+        - use better dependency tracking for include/keyword.h.
+        - add accept-invitation and suicide to the list of asynchronous commands, so
+          it is possible to invite somebody out of some stck-till-death traps,
+          or simply to commit suicide.
+        - replace the "ignoring delayed commands" message by something more useful
+          (cf. cunning gnome freezeing issue).
+        - various fixes for weapon improvements.
+        - fixed small bug with handling connect errors in the IRC gateway.
+
+2.77 Sun Feb  1 16:30:48 CET 2009
 	- 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.