a7fb5efb28 
								
							
								 
							
						 
						
							
							
								
								default race attributes values are now decoded and displayed  
							
							
							
						 
						
							2010-05-10 13:11:46 +02:00  
				
					
						
							
							
								 
						
							
							
								c32d9d6d8e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  http://github.com/doomchild/dfhack  
							
							
							
						 
						
							2010-05-06 22:41:11 +02:00  
				
					
						
							
							
								 
						
							
							
								d435313632 
								
							
								 
							
						 
						
							
							
								
								Body parts are decoded  
							
							... 
							
							
							
							Color modifiers parts are decoded 
							
						 
						
							2010-05-05 13:48:01 +02:00  
				
					
						
							
							
								 
						
							
							
								0c0eaa66d8 
								
							
								 
							
						 
						
							
							
								
								Eyes color are now decoded  
							
							
							
						 
						
							2010-05-05 12:57:05 +02:00  
				
					
						
							
							
								 
						
							
							
								735b49e776 
								
							
								 
							
						 
						
							
							
								
								Some changes for mingw  
							
							
							
						 
						
							2010-05-05 20:33:44 +11:00  
				
					
						
							
							
								 
						
							
							
								99b0d7dc1e 
								
							
								 
							
						 
						
							
							
								
								Color modifiers are now decoded for castes  
							
							
							
						 
						
							2010-05-05 11:17:40 +02:00  
				
					
						
							
							
								 
						
							
							
								2356e49768 
								
							
								 
							
						 
						
							
							
								
								proper offsets for sex and caste (they are different things)  
							
							
							
						 
						
							2010-05-04 16:47:40 +02:00  
				
					
						
							
							
								 
						
							
							
								32176875f9 
								
							
								 
							
						 
						
							
							
								
								preliminary improvement system  
							
							
							
						 
						
							2010-05-04 16:46:15 +02:00  
				
					
						
							
							
								 
						
							
							
								f46a7f1213 
								
							
								 
							
						 
						
							
							
								
								Basic code for item handling, now it should be tested :)  
							
							
							
						 
						
							2010-05-02 10:35:23 +02:00  
				
					
						
							
							
								 
						
							
							
								9f939687ec 
								
							
								 
							
						 
						
							
							
								
								Some generic material is decoded, although not well  
							
							
							
						 
						
							2010-04-30 17:42:31 +02:00  
				
					
						
							
							
								 
						
							
							
								c8d0f391fa 
								
							
								 
							
						 
						
							
							
								
								Offset for race extracts  
							
							
							
						 
						
							2010-04-30 17:03:41 +02:00  
				
					
						
							
							
								 
						
							
							
								7b35f976e5 
								
							
								 
							
						 
						
							
							
								
								material types are extracted from items !  
							
							
							
						 
						
							2010-04-30 16:17:10 +02:00  
				
					
						
							
							
								 
						
							
							
								860b0a67af 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'origin' into bartavelle  
							
							
							
						 
						
							2010-04-29 18:13:43 +02:00  
				
					
						
							
							
								 
						
							
							
								f0406f408e 
								
							
								 
							
						 
						
							
							
								
								tentative item reading stuff  
							
							
							
						 
						
							2010-04-29 17:00:34 +02:00  
				
					
						
							
							
								 
						
							
							
								c0ae0840db 
								
							
								 
							
						 
						
							
							
								
								stones.py sort-of works  
							
							
							
						 
						
							2010-04-28 23:48:50 +02:00  
				
					
						
							
							
								 
						
							
							
								df3efe23fb 
								
							
								 
							
						 
						
							
							
								
								Fix creature moods on 0.31.01 and 0.31.02  
							
							
							
						 
						
							2010-04-27 20:18:46 +02:00  
				
					
						
							
							
								 
						
							
							
								ff9a4d6091 
								
							
								 
							
						 
						
							
							
								
								test description of metal bars  
							
							
							
						 
						
							2010-04-26 17:33:17 +02:00  
				
					
						
							
							
								 
						
							
							
								bc08be3cbb 
								
							
								 
							
						 
						
							
							
								
								Another flag is useful here  
							
							
							
						 
						
							2010-04-26 17:19:20 +02:00  
				
					
						
							
							
								 
						
							
							
								2188ab1122 
								
							
								 
							
						 
						
							
							
								
								Add support for reading those strange flags in the mood materials  
							
							
							
						 
						
							2010-04-26 15:34:07 +02:00  
				
					
						
							
							
								 
						
							
							
								2c4aa5a970 
								
							
								 
							
						 
						
							
							
								
								fixed offset  
							
							
							
						 
						
							2010-04-26 15:20:27 +02:00  
				
					
						
							
							
								 
						
							
							
								b59b552f93 
								
							
								 
							
						 
						
							
							
								
								Mood reading preliminary support  
							
							
							
						 
						
							2010-04-26 13:23:57 +02:00  
				
					
						
							
							
								 
						
							
							
								80d10a9748 
								
							
								 
							
						 
						
							
							
								
								mood offset  
							
							
							
						 
						
							2010-04-23 20:12:32 +02:00  
				
					
						
							
							
								 
						
							
							
								ddc2dd354d 
								
							
								 
							
						 
						
							
							
								
								operator precedence!  
							
							
							
						 
						
							2010-04-23 04:00:41 +02:00  
				
					
						
							
							
								 
						
							
							
								494cc49b51 
								
							
								 
							
						 
						
							
							
								
								new offsets and data related to mood  
							
							
							
						 
						
							2010-04-21 16:12:14 +02:00  
				
					
						
							
							
								 
						
							
							
								06cb869940 
								
							
								 
							
						 
						
							
							
								
								an appearance vector location  
							
							
							
						 
						
							2010-04-21 11:00:10 +02:00  
				
					
						
							
							
								 
						
							
							
								0b782333ca 
								
							
								 
							
						 
						
							
							
								
								offsets for RGB color descriptors, and shapes  
							
							
							
						 
						
							2010-04-20 18:25:15 +02:00  
				
					
						
							
							
								 
						
							
							
								8676ba5f07 
								
							
								 
							
						 
						
							
							
								
								Extremely basic map feature reading, lives in vector check ...  
							
							
							
						 
						
							2010-04-20 04:37:45 +02:00  
				
					
						
							
							
								 
						
							
							
								1ff7f6e478 
								
							
								 
							
						 
						
							
							
								
								Add civilization support :  
							
							... 
							
							
							
							* field in creature structure
* offset of the player civilization id 
							
						 
						
							2010-04-19 14:36:21 +02:00  
				
					
						
							
							
								 
						
							
							
								9705e05d8c 
								
							
								 
							
						 
						
							
							
								
								Creature tile description support  
							
							... 
							
							
							
							Reading of the tile character and colors in the race structure, plus
offsets in Memory.xml.
Upgrade of creaturedump 
							
						 
						
							2010-04-19 11:23:11 +02:00  
				
					
						
							
							
								 
						
							
							
								3268b26852 
								
							
								 
							
						 
						
							
							
								
								Veindig can now dig stairs to reach veins on different z-levels  
							
							
							
						 
						
							2010-04-19 04:42:27 +02:00  
				
					
						
							
							
								 
						
							
							
								96b42f8ac1 
								
							
								 
							
						 
						
							
							
								
								Fix linux crashes.  
							
							
							
						 
						
							2010-04-19 00:32:50 +02:00  
				
					
						
							
							
								 
						
							
							
								caa482fbd1 
								
							
								 
							
						 
						
							
							
								
								Support for reading/writing temperature, extended veinlook  
							
							
							
						 
						
							2010-04-17 15:30:25 +02:00  
				
					
						
							
							
								 
						
							
							
								59cdbeefe7 
								
							
								 
							
						 
						
							
							
								
								catsplosion ported, doesn't work  
							
							
							
						 
						
							2010-04-15 13:04:58 +02:00  
				
					
						
							
							
								 
						
							
							
								ab3a842fdb 
								
							
								 
							
						 
						
							
							
								
								Support for creature castes  
							
							
							
						 
						
							2010-04-14 22:12:02 +02:00  
				
					
						
							
							
								 
						
							
							
								e8a3106b10 
								
							
								 
							
						 
						
							
							
								
								Plant/Wood materials reading fixed.  
							
							
							
						 
						
							2010-04-14 12:16:56 +02:00  
				
					
						
							
							
								 
						
							
							
								2594cd4eb3 
								
							
								 
							
						 
						
							
							
								
								Fix language vector for 0.31.03  
							
							
							
						 
						
							2010-04-13 23:21:31 +02:00  
				
					
						
							
							
								 
						
							
							
								81cf60c0e0 
								
							
								 
							
						 
						
							
							
								
								Fixes to creature offsets. Needs more checking.  
							
							
							
						 
						
							2010-04-13 07:36:16 +02:00  
				
					
						
							
							
								 
						
							
							
								88a3d96ef6 
								
							
								 
							
						 
						
							
							
								
								0.31.03 support. Creature soul offsets need a bit of work it seems.  
							
							
							
						 
						
							2010-04-13 05:46:26 +02:00  
				
					
						
							
							
								 
						
							
							
								e85b429127 
								
							
								 
							
						 
						
							
							
								
								Throw exceptions on memory read errors! Fix reading creatures that have no soul.  
							
							
							
						 
						
							2010-04-13 03:11:26 +02:00  
				
					
						
							
							
								 
						
							
							
								549b845738 
								
							
								 
							
						 
						
							
							
								
								Custom buildings (tested)  
							
							
							
						 
						
							2010-04-13 00:03:29 +02:00  
				
					
						
							
							
								 
						
							
							
								da0602dbb1 
								
							
								 
							
						 
						
							
							
								
								Dirty bit for creature equipment pickup on labor setting  
							
							
							
						 
						
							2010-04-12 18:19:53 +02:00  
				
					
						
							
							
								 
						
							
							
								6ba2804b68 
								
							
								 
							
						 
						
							
							
								
								Creature traits, added back map occupancy.  
							
							
							
						 
						
							2010-04-12 00:48:25 +02:00  
				
					
						
							
							
								 
						
							
							
								80ad47c82c 
								
							
								 
							
						 
						
							
							
								
								Fix 'building_windmillstst'  
							
							
							
						 
						
							2010-04-11 13:32:35 +02:00  
				
					
						
							
							
								 
						
							
							
								5ef87773be 
								
							
								 
							
						 
						
							
							
								
								Infinite loop fix related to block events. Added traction bench to known buildings.  
							
							
							
						 
						
							2010-04-11 13:03:00 +02:00  
				
					
						
							
							
								 
						
							
							
								d96d2018a8 
								
							
								 
							
						 
						
							
							
								
								Hotkey reading  
							
							
							
						 
						
							2010-04-11 02:32:50 +02:00  
				
					
						
							
							
								 
						
							
							
								ce279302d5 
								
							
								 
							
						 
						
							
							
								
								Possibly figured out building type offsets.  
							
							... 
							
							
							
							buildingsdump improvements (interacts with cursor, dump all with no parameters) 
							
						 
						
							2010-04-09 15:16:14 +02:00  
				
					
						
							
							
								 
						
							
							
								fb01ecf6c9 
								
							
								 
							
						 
						
							
							
								
								Buildings - names, type offsets and other stuff could be wrong  
							
							
							
						 
						
							2010-04-09 14:44:00 +02:00  
				
					
						
							
							
								 
						
							
							
								c08d696d56 
								
							
								 
							
						 
						
							
							
								
								Creature mental attributes  
							
							
							
						 
						
							2010-04-09 03:21:42 +02:00  
				
					
						
							
							
								 
						
							
							
								409e3ffcf0 
								
							
								 
							
						 
						
							
							
								
								More creature stuff  
							
							
							
						 
						
							2010-04-09 02:08:46 +02:00  
				
					
						
							
							
								 
						
							
							
								4bb05d015a 
								
							
								 
							
						 
						
							
							
								
								Support for v0.31.02  
							
							
							
						 
						
							2010-04-08 19:48:06 +02:00  
				
					
						
							
							
								 
						
							
							
								9180b77b89 
								
							
								 
							
						 
						
							
							
								
								Quick fix  
							
							
							
						 
						
							2010-04-08 02:55:08 +02:00  
				
					
						
							
							
								 
						
							
							
								659e57e3c4 
								
							
								 
							
						 
						
							
							
								
								Added missing file, small changes  
							
							
							
						 
						
							2010-04-08 02:20:54 +02:00  
				
					
						
							
							
								 
						
							
							
								62fc5bd677 
								
							
								 
							
						 
						
							
							
								
								Spatter veins, spatterdump tool  
							
							
							
						 
						
							2010-04-07 22:28:05 +02:00  
				
					
						
							
							
								 
						
							
							
								9589617d98 
								
							
								 
							
						 
						
							
							
								
								Moved some common bits of the examples to a header file  
							
							... 
							
							
							
							treedump utility 
							
						 
						
							2010-04-07 16:45:38 +02:00  
				
					
						
							
							
								 
						
							
							
								839e255d17 
								
							
								 
							
						 
						
							
							
								
								Vegetation reading  
							
							
							
						 
						
							2010-04-07 12:49:37 +02:00  
				
					
						
							
							
								 
						
							
							
								01383fd8b7 
								
							
								 
							
						 
						
							
							
								
								Dwarf labors work, added to creaturedump  
							
							
							
						 
						
							2010-04-07 03:38:22 +02:00  
				
					
						
							
							
								 
						
							
							
								f81c66d9ea 
								
							
								 
							
						 
						
							
							
								
								Reading creature skills  
							
							
							
						 
						
							2010-04-07 02:46:46 +02:00  
				
					
						
							
							
								 
						
							
							
								5ee584b372 
								
							
								 
							
						 
						
							
							
								
								Name translation for real  
							
							
							
						 
						
							2010-04-07 01:17:03 +02:00  
				
					
						
							
							
								 
						
							
							
								216cfa74e6 
								
							
								 
							
						 
						
							
							
								
								Offsets, assorted funstuff  
							
							
							
						 
						
							2010-04-06 22:47:50 +02:00  
				
					
						
							
							
								 
						
							
							
								d5aa1488a6 
								
							
								 
							
						 
						
							
							
								
								Magma create works  
							
							
							
						 
						
							2010-04-06 13:05:54 +02:00  
				
					
						
							
							
								 
						
							
							
								ea120a6709 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							2010-04-05 05:53:38 +02:00  
				
					
						
							
							
								 
						
							
							
								f8d1c042d7 
								
							
								 
							
						 
						
							
							
								
								Layer stone/geology  
							
							
							
						 
						
							2010-04-05 05:29:46 +02:00  
				
					
						
							
							
								 
						
							
							
								1d513256fd 
								
							
								 
							
						 
						
							
							
								
								Processed profession list  
							
							
							
						 
						
							2010-04-04 12:43:11 +02:00  
				
					
						
							
							
								 
						
							
							
								51a1ec5c1e 
								
							
								 
							
						 
						
							
							
								
								Very basic creature reading  
							
							
							
						 
						
							2010-04-04 12:29:56 +02:00  
				
					
						
							
							
								 
						
							
							
								e9642310de 
								
							
								 
							
						 
						
							
							
								
								Materials - semi-finished  
							
							
							
						 
						
							2010-04-04 10:10:00 +02:00  
				
					
						
							
							
								 
						
							
							
								ef6af19c8d 
								
							
								 
							
						 
						
							
							
								
								Fix t_vein, tiletype offset  
							
							
							
						 
						
							2010-04-03 04:41:21 +02:00  
				
					
						
							
							
								 
						
							
							
								7d48ea49ae 
								
							
								 
							
						 
						
							
							
								
								Reveal and prospector tools work. Basic inorganic matgloss works. Basic map reading works.  
							
							
							
						 
						
							2010-04-03 03:52:46 +02:00  
				
					
						
							
							
								 
						
							
							
								021fb1e0e9 
								
							
								 
							
						 
						
							
							
								
								Small Memory.xml fixes  
							
							
							
						 
						
							2010-04-03 01:17:35 +02:00  
				
					
						
							
							
								 
						
							
							
								265034b9d2 
								
							
								 
							
						 
						
							
							
								
								More stuff to parse.  
							
							
							
						 
						
							2010-04-03 00:50:24 +02:00  
				
					
						
							
							
								 
						
							
							
								ea6c5f726f 
								
							
								 
							
						 
						
							
							
								
								More stuff! Ridiculous amounts of stuff!  
							
							
							
						 
						
							2010-04-03 00:44:17 +02:00  
				
					
						
							
							
								 
						
							
							
								7678ba7b63 
								
							
								 
							
						 
						
							
							
								
								Added back skills  
							
							
							
						 
						
							2010-04-03 00:13:29 +02:00  
				
					
						
							
							
								 
						
							
							
								6b42923f6b 
								
							
								 
							
						 
						
							
							
								
								Added back labors, base meta entry is connected to 0.31.01  
							
							
							
						 
						
							2010-04-03 00:04:38 +02:00  
				
					
						
							
							
								 
						
							
							
								5b8fa0ffa6 
								
							
								 
							
						 
						
							
							
								
								Added material addresses to veccheck and Memory.xml  
							
							
							
						 
						
							2010-04-02 22:00:33 +02:00  
				
					
						
							
							
								 
						
							
							
								c4ffb0d0b3 
								
							
								 
							
						 
						
							
							
								
								Purge  
							
							
							
						 
						
							2010-04-02 21:09:37 +02:00  
				
					
						
							
							
								 
						
							
							
								c26da9b84c 
								
							
								 
							
						 
						
							
							
								
								More DF 2010 reorganization  
							
							
							
						 
						
							2010-04-02 16:46:33 +02:00  
				
					
						
							
							
								 
						
							
							
								c503808a82 
								
							
								 
							
						 
						
							
							
								
								Offsets from belal  
							
							
							
						 
						
							2010-04-02 15:59:17 +02:00  
				
					
						
							
							
								 
						
							
							
								8137c73b98 
								
							
								 
							
						 
						
							
							
								
								Beginning DF2010 support  
							
							
							
						 
						
							2010-04-02 15:47:08 +02:00  
				
					
						
							
							
								 
						
							
							
								33131754d4 
								
							
								 
							
						 
						
							
							
								
								Prospector detects regionoffsets overflows.  
							
							
							
						 
						
							2010-03-31 17:31:49 +02:00  
				
					
						
							
							
								 
						
							
							
								c631270425 
								
							
								 
							
						 
						
							
							
								
								Fix squads on Linux  
							
							... 
							
							
							
							Sync catsplosion 
							
						 
						
							2010-03-30 20:20:34 +02:00  
				
					
						
							
							
								 
						
							
							
								71fc49897f 
								
							
								 
							
						 
						
							
							
								
								Accelerated creatures work on Windows  
							
							... 
							
							
							
							Refactored vector reading, proper length of vectors from MSVC9 is known (0x18, triplet starts at 0xC) 
							
						 
						
							2010-03-30 02:26:52 +02:00  
				
					
						
							
							
								 
						
							
							
								789c8a473b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'effects_offsets' of git://github.com/belal/dfhack  
							
							... 
							
							
							
							Conflicts:
	output/Memory.xml
Srsly, wtf? Why the reformat? 
							
						 
						
							2010-03-26 04:32:04 +01:00  
				
					
						
							
							
								 
						
							
							
								517aa0e6e3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Zhentar/dfhack  
							
							... 
							
							
							
							Conflicts:
	examples/CMakeLists.txt
	library/DFHackAPI.cpp
Also added offsets for all supported versions 
							
						 
						
							2010-03-26 02:40:17 +01:00  
				
					
						
							
							
								 
						
							
							
								7ad2debf40 
								
							
								 
							
						 
						
							
							
								
								The real content of this is just adding effects vector offsets for all the linux versions.  There are lots of changes though because I used my addtoXML script to add the offsets and XML::Twig removes whitespaces, and changed the indentation of the files  
							
							
							
						 
						
							2010-03-25 10:39:09 -04:00  
				
					
						
							
							
								 
						
							
							
								9cbdb27432 
								
							
								 
							
						 
						
							
							
								
								Change windows d11 to have the correct base of d10, rather than d9  
							
							
							
						 
						
							2010-03-25 09:45:32 -04:00  
				
					
						
							
							
								 
						
							
							
								bc29b2d6c0 
								
							
								 
							
						 
						
							
							
								
								effects vector for all windows 40d# versions and 40d  
							
							
							
						 
						
							2010-03-22 15:32:04 -04:00  
				
					
						
							
							
								 
						
							
							
								24d969791b 
								
							
								 
							
						 
						
							
							
								
								Fixes for d18 and 19 on Linux  
							
							
							
						 
						
							2010-03-22 15:14:36 +01:00  
				
					
						
							
							
								 
						
							
							
								4287abbc94 
								
							
								 
							
						 
						
							
							
								
								Add pregnancy and blood stuff to the creature struct  
							
							
							
						 
						
							2010-03-21 15:47:24 -05:00  
				
					
						
							
							
								 
						
							
							
								849fafdc87 
								
							
								 
							
						 
						
							
							
								
								Effects vector for d17-d19_2 on Windows.  
							
							
							
						 
						
							2010-03-21 14:33:02 +01:00  
				
					
						
							
							
								 
						
							
							
								353ca44d31 
								
							
								 
							
						 
						
							
							
								
								Effect vector for windows 40d16, don't try to use it with versions>40d16!  
							
							
							
						 
						
							2010-03-21 13:22:59 +01:00  
				
					
						
							
							
								 
						
							
							
								71f8474e11 
								
							
								 
							
						 
						
							
							
								
								Added reading/writing support for effects like mist  
							
							... 
							
							
							
							Veinlook shows effects for it's middle block
Veinlook now uses wide-character ncurses 
							
						 
						
							2010-03-20 17:30:13 +01:00  
				
					
						
							
							
								 
						
							
							
								e18828e466 
								
							
								 
							
						 
						
							
							
								
								s/Intimitador/Intimidator/ in Memory.xml  
							
							
							
						 
						
							2010-03-17 01:34:40 +01:00  
				
					
						
							
							
								 
						
							
							
								1797fef7b4 
								
							
								 
							
						 
						
							
							
								
								add correct offsets for squad_name artifact_name and mood to linux creatures, and update the creature vectors to use the proper address  
							
							
							
						 
						
							2010-03-16 13:21:17 -04:00  
				
					
						
							
							
								 
						
							
							
								a2972af971 
								
							
								 
							
						 
						
							
							
								
								Add missing hothey_size hexval on 40d2+  
							
							
							
						 
						
							2010-03-16 13:21:16 -04:00  
				
					
						
							
							
								 
						
							
							
								76939afe50 
								
							
								 
							
						 
						
							
							
								
								fix incorrect squad name offset  
							
							
							
						 
						
							2010-03-14 20:05:11 -04:00  
				
					
						
							
							
								 
						
							
							
								5fe279d8ec 
								
							
								 
							
						 
						
							
							
								
								Added a cache mechanism to vtable lookups  
							
							... 
							
							
							
							Fixed python bindings (build, not actual functionality)
Fixed building subtypes on linux 
							
						 
						
							2010-03-14 22:58:28 +01:00  
				
					
						
							
							
								 
						
							
							
								34a2f238b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'version_compatiblity' of git://github.com/belal/dfhack  
							
							
							
						 
						
							2010-03-14 20:15:54 +01:00  
				
					
						
							
							
								 
						
							
							
								607bad2bf8 
								
							
								 
							
						 
						
							
							
								
								Fix settlement offsets for 40d, everything should work of 40d now  
							
							
							
						 
						
							2010-03-14 13:32:19 -04:00  
				
					
						
							
							
								 
						
							
							
								12abef8ace 
								
							
								 
							
						 
						
							
							
								
								used different creature vector than before, this is the correct one, the old one was missing some creatures, and the current_creature index was not right,  also found the offsets for mood and artifacts for 40d  
							
							... 
							
							
							
							Everything should work now from 40d,40d2->40d19 on windows, linux was already done before
I also modified creaturedump.cpp to show mood and aritifacts if a creature has one, also the mood is now a int rather than a uint, as we check for -1 
							
						 
						
							2010-03-14 13:21:52 -04:00  
				
					
						
							
							
								 
						
							
							
								d0531c2925 
								
							
								 
							
						 
						
							
							
								
								Add class entries to meta-40d for stonesense  
							
							
							
						 
						
							2010-03-14 13:37:39 +01:00  
				
					
						
							
							
								 
						
							
							
								0582354191 
								
							
								 
							
						 
						
							
							
								
								Merge remote branch 'remotes/peterix/master' into version_compatiblity  
							
							... 
							
							
							
							trying merge
Conflicts:
	examples/creaturedump.cpp
	output/Memory.xml 
							
						 
						
							2010-03-13 08:45:30 -05:00