18a91ef221 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/ab9rf/dfhack  
							
							... 
							
							
							
							Conflicts:
	library/xml
	plugins/stonesense 
							
						 
						
							2013-04-24 18:00:40 +02:00  
				
					
						
							
							
								 
						
							
							
								c39f4bc182 
								
							
								 
							
						 
						
							
							
								
								Fix build bug in automaterial.  
							
							
							
						 
						
							2013-04-24 17:49:18 +02:00  
				
					
						
							
							
								 
						
							
							
								222c61ab25 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'IsoRemote' of  https://github.com/JapaMala/dfhack  
							
							
							
						 
						
							2013-04-24 17:36:22 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								3b921feb61 
								
							
								 
							
						 
						
							
							
								
								Skip ice and brook floors.  
							
							
							
						 
						
							2013-04-06 17:07:46 +05:30  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								fe922e3528 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'IsoRemote' of  https://github.com/JapaMala/dfhack  
							
							
							
						 
						
							2013-04-02 19:01:46 +02:00  
				
					
						
							
							
								 
						
							
							
								33f0f0d3f3 
								
							
								 
							
						 
						
							
							
								
								Isoworldremote plugin now gives material lists, and verifies weather a map block has anything in it.  
							
							
							
						 
						
							2013-04-02 22:03:32 +05:30  
				
					
						
							
							
								 
						
							
							
								9d6f202988 
								
							
								 
							
						 
						
							
							
								
								Fix the search plugin crashing the military screen.  
							
							... 
							
							
							
							The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list. 
							
						 
						
							2013-04-02 22:42:55 +13:00  
				
					
						
							
							
								 
						
							
							
								462a08a4ea 
								
							
								 
							
						 
						
							
							
								
								Fix the search plugin crashing the military screen.  
							
							... 
							
							
							
							The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list. 
							
						 
						
							2013-04-02 12:03:37 +04:00  
				
					
						
							
							
								 
						
							
							
								c0a4db32e9 
								
							
								 
							
						 
						
							
							
								
								Fixed the single tile reported coordinates.  
							
							
							
						 
						
							2013-04-02 11:57:30 +05:30  
				
					
						
							
							
								 
						
							
							
								b2f4029f42 
								
							
								 
							
						 
						
							
							
								
								Added in more sanity checks.  
							
							... 
							
							
							
							Signed-off-by: Japa <japa.mala.illo@gmail.com> 
							
						 
						
							2013-04-02 02:58:06 +05:30  
				
					
						
							
							
								 
						
							
							
								29a2f36e4a 
								
							
								 
							
						 
						
							
							
								
								Fix small bug in the tweak plugin  
							
							
							
						 
						
							2013-04-01 17:42:02 +02:00  
				
					
						
							
							
								 
						
							
							
								b0ee4fe9d9 
								
							
								 
							
						 
						
							
							
								
								Update stonesense  
							
							
							
						 
						
							2013-04-11 21:08:33 +02:00  
				
					
						
							
							
								 
						
							
							
								d7c91975c0 
								
							
								 
							
						 
						
							
							
								
								Fix warnings  
							
							
							
						 
						
							2013-04-01 20:02:39 +13:00  
				
					
						
							
							
								 
						
							
							
								1070eec016 
								
							
								 
							
						 
						
							
							
								
								Make planned doors pet passable  
							
							
							
						 
						
							2013-04-01 19:52:34 +13:00  
				
					
						
							
							
								 
						
							
							
								1550df496f 
								
							
								 
							
						 
						
							
							
								
								Right align happiness monitor to avoid interference with announcements  
							
							
							
						 
						
							2013-04-01 19:52:13 +13:00  
				
					
						
							
							
								 
						
							
							
								c020c0271c 
								
							
								 
							
						 
						
							
							
								
								Respect export mandates  
							
							
							
						 
						
							2013-04-01 19:21:10 +13:00  
				
					
						
							
							
								 
						
							
							
								86a02952f8 
								
							
								 
							
						 
						
							
							
								
								Changed coords to embark tiles instead of blocks.  
							
							
							
						 
						
							2013-04-01 04:39:30 +05:30  
				
					
						
							
							
								 
						
							
							
								4bb80d9865 
								
							
								 
							
						 
						
							
							
								
								Added some sanity checks to isoworldremote.cpp  
							
							... 
							
							
							
							Signed-off-by: Japa <japa.mala.illo@gmail.com> 
							
						 
						
							2013-03-31 12:31:44 +05:30  
				
					
						
							
							
								 
						
							
							
								39390e2749 
								
							
								 
							
						 
						
							
							
								
								Got a working connection with Isoworld.  
							
							
							
						 
						
							2013-03-31 02:42:06 +05:30  
				
					
						
							
							
								 
						
							
							
								135289e89a 
								
							
								 
							
						 
						
							
							
								
								ruby: add MapTile#burrow  
							
							
							
						 
						
							2013-03-30 20:22:25 +01:00