--- deliantra/server/Changes	2009/01/02 16:41:31	1.319
+++ deliantra/server/Changes	2009/01/25 23:56:13	1.339
@@ -1,6 +1,7 @@
 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}
@@ -15,18 +16,53 @@
 TODO: no detah messages for arena anymore
 TODO: remove curse should *maybe* work on players themselves
 TODO: remove curse in glyph/rune doesn't have any effect?
-TODO: nothing is written on it -> log-1
 TODO: rewrite highscore code
 
 TODO: greeting message on what to do in dialog after race selection.
 TODO: health bars for earthwalls seem to start at 100% end die at 50%
+
+
+2009-01-23 07:55:29.4659 loading /opt/crossfire/share/deliantra-server/maps//mlab/cdcapart1.map (271878,0)
+2009-01-23 07:55:29.4712 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4713 object refering to nonexistant archetype 'stonefloorred2'.
+2009-01-23 07:55:29.4714 object refering to nonexistant archetype 'stonefloorred2'.
+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-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
+
+	- 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.
+	- add "What" column to body command, showing items in that slot.
+        - redesigned and rebalanced lamps and torches.
+        - add "..." to item names that have been shortened.
+        - fixed "assign" function that squeezes strings into fixed length.
+        - add cursed effect to lamps and (some) torches.
+        - fixed bad assigned crafting skills and their tools.
 	
+2.75 Fri Jan  9 16:13:30 CET 2009
+        - rebalanced lighting w.r.t. outdoor, darkness and see_in_dark.
 	- fix a bug in the nimbus extension that allowed players to cheat.
 	- make monster smell logic dependent on their wisdom stat.
-        - put the detah reason into a separate tab.
+        - put the death reason into a separate tab.
+        - converted "connected" slot to string, cleanly got rid of some ugly
+          hacks such as the path_attuned hack.
         - introduce shstr_tmp for fast temporary shstr passing.
 	- replace one-at-a-time hash by faster than smaller FNV-1a hash
           when hashing strings.
+        - sanitized alchemy-like skills and cauldrons to check earlier
+          whether the right cauldron is used.
         - considerably optimise shared string implementation by
           making its null value a compiletime constant.
         - use shared string matching insteafd of strcmp in a lot of places,
@@ -35,6 +71,12 @@
         - monsters which breed new monsters shouldn't breed new monsters when
           they are sleeping: generators now check for the sleeping flag.
         - tell gcc not to excessively inline some perl interface functions.
+        - remove marking rune length limit.
+        - fix formatting of cfpod when a verbatim block was following
+          a single newline.
+        - move resistances, statistics and showpets command output into tabs.
+        - implement map scripts that can replace the boulder logic without
+          having to write extensions.
 
 2.74 Mon Dec 29 15:23:38 CET 2008
 	- fix a longstanding bug that teared multipart monsters
@@ -467,7 +509,7 @@
         - convert cfutil from Event to EV (forgot to do this earlier...).
         - move tombstone to real map if player died due to cave-in (even if
           it has reset, which is better than putting it on the savebed, also as
-          proof that the palyer didn't use a savebed).
+          proof that the player didn't use a savebed).
 
 2.4  Sun Jan 13 13:41:29 CET 2008
 	- work around perl bug in configure perl module version check.