--- deliantra/server/Changes	2008/04/20 18:48:51	1.100
+++ deliantra/server/Changes	2008/04/21 21:32:32	1.105
@@ -1,32 +1,38 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 
+TODO: ridify us from FLAG_NO_FIX_PLAYER
 TODO: picking up the torches in nimbus seemingly works, but after
       a while (used up?) they seem to be gone from the inv but the client doesn't know about that.
 TODO: dragons should not be able to change their title via the settings tab in playerbook
 
-2.51  
+	- reloading archetypes while a user was in the character creation phase
+          could crash the server.
+        - merge items with different arch pointers refering to the same arch
+          (due to archetype reloads).
+        - completely rewrite the weight handling, fixing a number of bugs.
+        - refactored the object remove/insert functions.
+        - make it compile better on freebsd (reported by pippijn).
+
+2.51  Sun Apr 20 21:27:37 CEST 2008
 	- properly link against libgthread as that is needed to make the slice
           allocator thread-safe.
 	- support perls not compiled with 64 bit support (though this is not a
           recommended configuration) (reported by Samuel Gondouin).
-        - match archetypes by name, not by ptr, in treasure.C, this makes archetypes
-          finally reloadable at runtime.
         - always put godgiven items into the player inventory, never any containers.
-        - changed archetype loading algorithm to only require one pass and
-          use delayed resolving of references.
-        - implement an "incremental garbage collector" for archetypes.
+        - (arch)
         - (maps, arch) the scorn go club was founded!
         - (arch) do no longer support player abilities, they didn't work anyways.
-<<<<<<< Changes
         - (arch) the alchemy spell is now of the alchemy spell school, which
           became a real spell-class.
-        - examine comamnd now uses the examine infobox.
-        - enable slice allocator again, was accidentally disabled in 2.5.
-=======
-        - (arch) the alchemy spell is now of the alchemy spell school.
         - (arch) the alchemist class now get an alchemy spell book for new characters.
+        - (arch) considerably strengthened spark shower and destruction.
+        - match archetypes by name, not by ptr, in treasure.C, this makes archetypes
+          finally reloadable at runtime.
+        - changed archetype loading algorithm to only require one pass and
+          use delayed resolving of references.
+        - examine command now uses the examine infobox.
+        - implement an "incremental garbage collector" for archetypes.
         - enable slice allocator again.
->>>>>>> 1.99
         - implement optional free memory poisoning.
 
 2.5  Wed Apr 16 15:06:53 CEST 2008