--- deliantra/server/Changes	2008/05/04 20:40:52	1.133
+++ deliantra/server/Changes	2008/05/08 20:07:22	1.156
@@ -2,19 +2,48 @@
 
 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
+syncpoints: rules, news, motd, crossfiremail
+""/opt/perl/lib/perl5/unicore/Canonical.pl", "/opt/perl/lib/perl5/unicore/To/Lower.pl" etc...
+
+TODO: you have to unapply the jumping first before you cna raedy spell...
+TODO: re-apply items on log-in
+TODO: rebalance jumping skill speed
+2.55
+
+2.54  Thu May  8 22:01:22 CEST 2008
+	- change floorbox item ordering to enable more efficient protocol and to
+          stay in sync with the 0.9971 client update which also reverses ordering.
+        - bugfix: the jumping skill now gives experience for jumping
+          and for attacking monsters. it also takes about one second to do a jump.
+	- bugfix: players couldn't starve in 2.53 :(
+        - bugfix: correctly send the client a del_spell when a spell gets removed.
+        - bugfix: spell effects like word of recall are removed on death.
+        - bugfix: fix a crash when objects with treasure on top (ground...)
+          were created outside a map.
+        - bugfix: couldn't apply inventory items when levitating, but ground items
+          (fixed by reversing the logic).
+        - bugfix: fixed a mismatched '"' in the debugging description of objects
+        - bugfix: the random map generator no longer leaks key objects.
+        - bugfix: support random maps >127x127.
+        - (maps) fixed the death certificate system in nimbus.
+        - (maps( rebalance onefang, build a road to onefang, temporarily closed zorn.
+        - (arch) the material 'wood' was undefined, it's now a burnable material.
+        - (arch) give ball lightning a real name.
+        - (arch) fixed material of bones (was 'wood', is now 'bone')
+        - support cfpod in ex replies (client item tooltips).
+        - unapply item in range slow when readying a spell.
+        - bugfix: account for rounding errors in weight updates.
+        - remove synchronous mkdir in chargen_race_done.
+        - fix per-race starting maps.
+        - check hiscore on suicide and quit as well.
+        - tell players when they are starving.
 	- get rid of costly object_from_name conversion for altar effects.
         - fix map difficulty calculation for generators.
+        - slightly more intelligent handling of "is_animated" flag.
+        - support no_drop map header flag (before it was only available internally).
+        - make random-map-generated keys crumble after one hour, use more unique slaying.
 
-=======
-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