--- deliantra/server/Changes	2009/02/21 06:30:34	1.347
+++ deliantra/server/Changes	2009/03/02 22:25:18	1.350
@@ -29,6 +29,9 @@
 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'.
 
+	- 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.
@@ -40,6 +43,7 @@
         - 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.
+        - various fixes for weapon improvements.
 
 2.77 Sun Feb  1 16:30:48 CET 2009
 	- convert me command from per-map to chat, which makes more sense, also