--- deliantra/server/Changes	2008/05/04 15:34:10	1.130
+++ deliantra/server/Changes	2008/05/04 20:40:52	1.133
@@ -1,5 +1,20 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 
+TODO: dragons should not be able to change their title via the settings tab in playerbook
+TODO: emergency swap mode is not working
+08:43:44 -cfbot:#cf- [Larvae] when I had a devourerbow equipped, and then  readied 
+          some spellcasting. if I then started using karate, I would get all the 
+                    stateffects from the bow
+
+<<<<<<< Changes
+	- get rid of costly object_from_name conversion for altar effects.
+        - fix map difficulty calculation for generators.
+
+=======
+2.54
+        - (maps) fixed the death certificate system in nimbus
+
+>>>>>>> 1.132
 2.53  Sun May  4 17:32:48 CEST 2008
 	- bugfix: custom skill settings were not saved by the server.
 	- bugfix: remove did not actually remove items from the inventory, leaving