2e379c4d3f 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/Falconne/dfhack  
							
							... 
							
							
							
							Conflicts:
	plugins/CMakeLists.txt
	plugins/stonesense 
							
						 
						
							2013-04-24 17:24:03 +02:00  
				
					
						
							
							
								 
						
							
							
								df6355a092 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2013-04-24 16:24:14 +02:00  
				
					
						
							
							
								 
						
							
							
								0efbc74ac2 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/quietust/dfhack  
							
							... 
							
							
							
							Conflicts:
	NEWS 
							
						 
						
							2013-04-24 16:21:59 +02:00  
				
					
						
							
							
								 
						
							
							
								3d6cbd9256 
								
							
								 
							
						 
						
							
							
								
								Add restrictice/liquid to readme and NEWS  
							
							
							
						 
						
							2013-04-24 16:20:10 +02:00  
				
					
						
							
							
								 
						
							
							
								aad5296f91 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/rampaging-poet/dfhack  
							
							
							
						 
						
							2013-04-24 16:14:30 +02:00  
				
					
						
							
							
								 
						
							
							
								3e59794733 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/cherrydev/dfhack  
							
							... 
							
							
							
							Conflicts:
	Readme.html 
							
						 
						
							2013-04-24 16:13:27 +02:00  
				
					
						
							
							
								 
						
							
							
								94ceb752d8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/NickHu/dfhack  
							
							
							
						 
						
							2013-04-24 16:11:48 +02:00  
				
					
						
							
							
								 
						
							
							
								300b24b401 
								
							
								 
							
						 
						
							
							
								
								Add example keybindings  
							
							
							
						 
						
							2013-04-24 23:47:37 +12:00  
				
					
						
							
							
								 
						
							
							
								ce47033190 
								
							
								 
							
						 
						
							
							
								
								fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.  
							
							
							
						 
						
							2013-04-24 23:37:05 +12:00  
				
					
						
							
							
								 
						
							
							
								024a3d766b 
								
							
								 
							
						 
						
							
							
								
								Added some more commands to autobutcher UI script.  
							
							... 
							
							
							
							Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits. 
							
						 
						
							2013-04-24 23:37:05 +12:00  
				
					
						
							
							
								 
						
							
							
								fd265b37d6 
								
							
								 
							
						 
						
							
							
								
								Added lua GUI front-end for autobutcher.  
							
							
							
						 
						
							2013-04-24 23:37:05 +12:00  
				
					
						
							
							
								 
						
							
							
								80de3c05fa 
								
							
								 
							
						 
						
							
							
								
								Stocks plugin: Add keywords to search for flags.  
							
							
							
						 
						
							2013-04-24 23:31:37 +12:00  
				
					
						
							
							
								 
						
							
							
								eb8b2faf66 
								
							
								 
							
						 
						
							
							
								
								Stocks plugin: fix inventory check, add trade assignments, better hotkets.  
							
							
							
						 
						
							2013-04-23 22:15:25 +12:00  
				
					
						
							
							
								 
						
							
							
								c9776f481c 
								
							
								 
							
						 
						
							
							
								
								ruby: add construction/siegeengine bld subtypes in building_alloc  
							
							
							
						 
						
							2013-04-21 22:29:51 +02:00  
				
					
						
							
							
								 
						
							
							
								ba4f649b3c 
								
							
								 
							
						 
						
							
							
								
								scripts: switch to windows lineendings  
							
							
							
						 
						
							2013-04-21 14:21:53 +02:00  
				
					
						
							
							
								 
						
							
							
								d7f5f06d18 
								
							
								 
							
						 
						
							
							
								
								fix/stuckdoors: handle prone units + items too  
							
							
							
						 
						
							2013-04-21 11:27:35 +02:00  
				
					
						
							
							
								 
						
							
							
								fce4a2d21a 
								
							
								 
							
						 
						
							
							
								
								drainaquifer: improved clearing  
							
							
							
						 
						
							2013-04-21 10:56:09 +02:00  
				
					
						
							
							
								 
						
							
							
								e70d7b404a 
								
							
								 
							
						 
						
							
							
								
								Don't exclude webs, check for items in inventory before discarding those without a valid position.  
							
							
							
						 
						
							2013-04-20 12:09:07 +12:00  
				
					
						
							
							
								 
						
							
							
								3d82629da9 
								
							
								 
							
						 
						
							
							
								
								rename magmasource to source, add water+drain capabilities  
							
							
							
						 
						
							2013-04-16 23:25:53 +02:00  
				
					
						
							
							
								 
						
							
							
								de5e713c51 
								
							
								 
							
						 
						
							
							
								
								ruby: add rb dfhack command shortcut  
							
							
							
						 
						
							2013-04-16 21:54:03 +02:00  
				
					
						
							
							
								 
						
							
							
								811bd191d5 
								
							
								 
							
						 
						
							
							
								
								Add wear filter  
							
							
							
						 
						
							2013-04-15 20:43:13 +12:00  
				
					
						
							
							
								 
						
							
							
								d99b930f58 
								
							
								 
							
						 
						
							
							
								
								Better Stocks - Quality & Wear filters  
							
							
							
						 
						
							2013-04-14 16:39:21 +12:00  
				
					
						
							
							
								 
						
							
							
								d8c140602b 
								
							
								 
							
						 
						
							
							
								
								locate-ore: add message  
							
							
							
						 
						
							2013-04-14 02:20:22 +02:00  
				
					
						
							
							
								 
						
							
							
								13451bd487 
								
							
								 
							
						 
						
							
							
								
								ruby: fix crash on Compound#_cpp_delete  
							
							
							
						 
						
							2013-04-14 01:17:44 +02:00  
				
					
						
							
							
								 
						
							
							
								17513283d4 
								
							
								 
							
						 
						
							
							
								
								Better Stocks screen - WIP  
							
							
							
						 
						
							2013-04-14 00:45:06 +12:00  
				
					
						
							
							
								 
						
							
							
								40f9f06360 
								
							
								 
							
						 
						
							
							
								
								dig: ignore tile shape if hidden  
							
							
							
						 
						
							2013-04-12 15:23:16 +02:00  
				
					
						
							
							
								 
						
							
							
								2375f12fb7 
								
							
								 
							
						 
						
							
							
								
								add multicmd script  
							
							
							
						 
						
							2013-04-12 15:23:16 +02:00  
				
					
						
							
							
								 
						
							
							
								b2e22a2c42 
								
							
								 
							
						 
						
							
							
								
								ruby: add facility to queue dfhack commands  
							
							
							
						 
						
							2013-04-12 15:23:13 +02:00  
				
					
						
							
							
								 
						
							
							
								d0ba4f5881 
								
							
								 
							
						 
						
							
							
								
								Better Stocks screen - WIP  
							
							
							
						 
						
							2013-04-11 20:52:46 +12:00  
				
					
						
							
							
								 
						
							
							
								2776123274 
								
							
								 
							
						 
						
							
							
								
								add scripts/devel/unforbidall and scanitemother  
							
							
							
						 
						
							2013-04-08 23:16:49 +02:00  
				
					
						
							
							
								 
						
							
							
								399fd107e4 
								
							
								 
							
						 
						
							
							
								
								Make createitem create shoes in pairs (as well as gloves)  
							
							
							
						 
						
							2013-04-08 08:29:50 -05:00  
				
					
						
							
							
								 
						
							
							
								658e64c1b2 
								
							
								 
							
						 
						
							
							
								
								Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense  
							
							
							
						 
						
							2013-04-07 20:25:38 +02:00  
				
					
						
							
							
								 
						
							
							
								fc6cb3ae42 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger'  
							
							
							
						 
						
							2013-04-07 14:00:24 -04:00  
				
					
						
							
							
								 
						
							
							
								959321ec22 
								
							
								 
							
						 
						
							
							
								
								syndromeTrigger: logic tweak.  
							
							
							
						 
						
							2013-04-07 13:56:12 -04:00  
				
					
						
							
							
								 
						
							
							
								1c78f06a1c 
								
							
								 
							
						 
						
							
							
								
								syndromeTrigger: only complain once.  
							
							
							
						 
						
							2013-04-07 13:22:38 -04:00  
				
					
						
							
							
								 
						
							
							
								b057a0d82a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'once' into syndromeTrigger  
							
							
							
						 
						
							2013-04-07 13:19:18 -04:00  
				
					
						
							
							
								 
						
							
							
								ddc4cad73b 
								
							
								 
							
						 
						
							
							
								
								autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index.  
							
							
							
						 
						
							2013-04-07 13:17:00 -04:00  
				
					
						
							
							
								 
						
							
							
								329538edfd 
								
							
								 
							
						 
						
							
							
								
								digsmart temp commit.  
							
							
							
						 
						
							2013-04-07 13:08:32 -04:00  
				
					
						
							
							
								 
						
							
							
								3b921feb61 
								
							
								 
							
						 
						
							
							
								
								Skip ice and brook floors.  
							
							
							
						 
						
							2013-04-06 17:07:46 +05:30  
				
					
						
							
							
								 
						
							
							
								b4f8ac5562 
								
							
								 
							
						 
						
							
							
								
								Amended readme to reflect new release locations following GitHub's download feature deprecation  
							
							
							
						 
						
							2013-04-06 10:34:08 +01:00  
				
					
						
							
							
								 
						
							
							
								efaa247d2a 
								
							
								 
							
						 
						
							
							
								
								Stocks start  
							
							
							
						 
						
							2013-04-06 17:40:07 +13:00  
				
					
						
							
							
								 
						
							
							
								660ce50542 
								
							
								 
							
						 
						
							
							
								
								Floors are loaded one level below solid blocks.  
							
							
							
						 
						
							2013-04-06 02:42:51 +05:30  
				
					
						
							
							
								 
						
							
							
								541e4f0947 
								
							
								 
							
						 
						
							
							
								
								Changed liquids to use an enum.  
							
							
							
						 
						
							2013-04-04 14:28:43 +05:30  
				
					
						
							
							
								 
						
							
							
								7ba1f9e612 
								
							
								 
							
						 
						
							
							
								
								Compile.rst: add comment about libstdc++ version bug (fix bug  #176 )  
							
							
							
						 
						
							2013-04-03 22:28:11 +02:00  
				
					
						
							
							
								 
						
							
							
								f1410c10c6 
								
							
								 
							
						 
						
							
							
								
								digcircle: fix bug  #181  (help: radius -> diameter)  
							
							
							
						 
						
							2013-04-03 22:16:36 +02:00  
				
					
						
							
							
								 
						
							
							
								575b1c45fc 
								
							
								 
							
						 
						
							
							
								
								Sync isoworld, linux fixes  
							
							
							
						 
						
							2013-04-03 01:10:06 +02:00  
				
					
						
							
							
								 
						
							
							
								3da85a2134 
								
							
								 
							
						 
						
							
							
								
								exterminate: add butcher mode  
							
							
							
						 
						
							2013-04-03 00:57:50 +02:00  
				
					
						
							
							
								 
						
							
							
								3580409cc1 
								
							
								 
							
						 
						
							
							
								
								Sync isoworld, some protobuf building changes  
							
							
							
						 
						
							2013-04-02 22:37:41 +02:00  
				
					
						
							
							
								 
						
							
							
								c361ba7bf4 
								
							
								 
							
						 
						
							
							
								
								Sync, fix isoworld in .gitmodules  
							
							
							
						 
						
							2013-04-02 19:19:29 +02:00  
				
					
						
							
							
								 
						
							
							
								5ff9947a06 
								
							
								 
							
						 
						
							
							
								
								Merge branch '0.34.11-r3-bugfixes'  
							
							
							
						 
						
							2013-04-02 19:17:32 +02:00