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  
				
					
						
							
							
								 
						
							
							
								a3de35c32e 
								
							
								 
							
						 
						
							
							
								
								Added isoworld to the build list.  
							
							
							
						 
						
							2013-03-30 15:27:37 +05:30  
				
					
						
							
							
								 
						
							
							
								9981d21965 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote  
							
							... 
							
							
							
							Conflicts:
	plugins/CMakeLists.txt
	plugins/isoworldremote.cpp 
							
						 
						
							2013-03-30 13:03:22 +05:30  
				
					
						
							
							
								 
						
							
							
								14369d18dc 
								
							
								 
							
						 
						
							
							
								
								Initial work on the isoworldremote plugin, which sends sections of the map to isoworld.  
							
							... 
							
							
							
							Signed-off-by: Japa <japa.mala.illo@gmail.com> 
							
						 
						
							2013-03-30 12:38:42 +05:30  
				
					
						
							
							
								 
						
							
							
								2027416997 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1  from zkf/overlay-position  
							
							... 
							
							
							
							Right-align happiness monitor overlay. 
							
						 
						
							2013-03-29 20:59:54 -07:00  
				
					
						
							
							
								 
						
							
							
								a5b9848271 
								
							
								 
							
						 
						
							
							
								
								Clean up  
							
							
							
						 
						
							2013-03-30 16:38:21 +13:00  
				
					
						
							
							
								 
						
							
							
								edc305db69 
								
							
								 
							
						 
						
							
							
								
								AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible.  
							
							
							
						 
						
							2013-03-30 16:38:03 +13:00  
				
					
						
							
							
								 
						
							
							
								323c56a641 
								
							
								 
							
						 
						
							
							
								
								Right-align happiness monitor overlay.  
							
							... 
							
							
							
							The overlay was blocking game messages which are displayed on the left side. 
							
						 
						
							2013-03-29 15:03:09 +01:00  
				
					
						
							
							
								 
						
							
							
								6e9de245c2 
								
							
								 
							
						 
						
							
							
								
								Started work on isoworld remote  
							
							
							
						 
						
							2013-03-27 01:24:13 +05:30  
				
					
						
							
							
								 
						
							
							
								dc9a62fd1d 
								
							
								 
							
						 
						
							
							
								
								Fix crash when using right mouse button  
							
							
							
						 
						
							2013-03-22 23:08:33 +13:00  
				
					
						
							
							
								 
						
							
							
								4fe37b4bd5 
								
							
								 
							
						 
						
							
							
								
								ruby: fix DfFlagarray.inspect when no indexenum  
							
							
							
						 
						
							2013-03-16 21:06:31 +01:00  
				
					
						
							
							
								 
						
							
							
								49024809ce 
								
							
								 
							
						 
						
							
							
								
								Update NEWS, build DFusion by default  
							
							
							
						 
						
							2013-03-16 18:37:16 +01:00  
				
					
						
							
							
								 
						
							
							
								ffa9c50486 
								
							
								 
							
						 
						
							
							
								
								autoSyndrome: stop spam, and disable by default  
							
							
							
						 
						
							2013-03-16 13:26:59 +01:00  
				
					
						
							
							
								 
						
							
							
								59ec9bfc57 
								
							
								 
							
						 
						
							
							
								
								Update versions  
							
							
							
						 
						
							2013-03-16 22:13:01 +13:00  
				
					
						
							
							
								 
						
							
							
								a85d6bd2dd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'mousequery'  
							
							
							
						 
						
							2013-03-16 20:40:20 +13:00  
				
					
						
							
							
								 
						
							
							
								4bd5e3db77 
								
							
								 
							
						 
						
							
							
								
								Add mousequery to build  
							
							
							
						 
						
							2013-03-16 20:35:53 +13:00  
				
					
						
							
							
								 
						
							
							
								c16bd3d71a 
								
							
								 
							
						 
						
							
							
								
								Apply r3 name changes  
							
							
							
						 
						
							2013-03-16 18:25:02 +13:00  
				
					
						
							
							
								 
						
							
							
								cc5d354a59 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github:jjyg/dfhack  
							
							
							
						 
						
							2013-03-16 01:04:29 +01:00  
				
					
						
							
							
								 
						
							
							
								b961cb6a09 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/peterix/dfhack  
							
							
							
						 
						
							2013-03-16 12:51:31 +13:00  
				
					
						
							
							
								 
						
							
							
								f69f245732 
								
							
								 
							
						 
						
							
							
								
								Allow planned constructions orthogonal to stairs  
							
							
							
						 
						
							2013-03-16 12:26:37 +13:00  
				
					
						
							
							
								 
						
							
							
								5a92eabb6b 
								
							
								 
							
						 
						
							
							
								
								Add all fortress dwarves to happiness monitor.  
							
							
							
						 
						
							2013-03-16 10:29:17 +13:00  
				
					
						
							
							
								 
						
							
							
								6a31abc60f 
								
							
								 
							
						 
						
							
							
								
								Another update to stonesense :-P  
							
							
							
						 
						
							2013-03-15 14:30:21 -04:00  
				
					
						
							
							
								 
						
							
							
								d87bfd7f26 
								
							
								 
							
						 
						
							
							
								
								Update to Stonesense  
							
							
							
						 
						
							2013-03-15 14:28:46 -04:00  
				
					
						
							
							
								 
						
							
							
								c93cb693c8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  http://github.com/peterix/dfhack  
							
							
							
						 
						
							2013-03-14 13:35:28 -04:00  
				
					
						
							
							
								 
						
							
							
								9a58c5b7b3 
								
							
								 
							
						 
						
							
							
								
								Stonesense updates  
							
							
							
						 
						
							2013-03-14 13:33:01 -04:00  
				
					
						
							
							
								 
						
							
							
								2b675c80ce 
								
							
								 
							
						 
						
							
							
								
								Fix createitem to not leak memory  
							
							
							
						 
						
							2013-03-14 12:00:16 -05:00  
				
					
						
							
							
								 
						
							
							
								c5aa808737 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2013-03-14 05:07:30 +01:00  
				
					
						
							
							
								 
						
							
							
								b5806f7278 
								
							
								 
							
						 
						
							
							
								
								Copy fixes from r3 to fix search issues in Nobles screen.  
							
							
							
						 
						
							2013-03-13 22:21:30 +13:00  
				
					
						
							
							
								 
						
							
							
								215a2e78af 
								
							
								 
							
						 
						
							
							
								
								Fix crash when persistent data refers to missing buildings. Can only happen if planned buildings are removed with the plugin removed, then the game is reloaded after the plugin is put back.  
							
							
							
						 
						
							2013-03-13 21:44:33 +13:00  
				
					
						
							
							
								 
						
							
							
								bc0c493b7c 
								
							
								 
							
						 
						
							
							
								
								Workaround for strange crash in accelerated mod  
							
							
							
						 
						
							2013-03-12 21:18:29 +13:00  
				
					
						
							
							
								 
						
							
							
								8e9fc235a9 
								
							
								 
							
						 
						
							
							
								
								Adding a debug mode to track down an elusive bug.  
							
							
							
						 
						
							2013-03-10 16:14:00 +13:00  
				
					
						
							
							
								 
						
							
							
								3ed5f06f49 
								
							
								 
							
						 
						
							
							
								
								Fix for eventful and a advfort not to show worn items.  
							
							
							
						 
						
							2013-03-09 12:54:07 +02:00  
				
					
						
							
							
								 
						
							
							
								63707471f4 
								
							
								 
							
						 
						
							
							
								
								WIP - More logical categories and variable windows  
							
							
							
						 
						
							2013-03-07 22:27:06 +13:00  
				
					
						
							
							
								 
						
							
							
								0b31fbafea 
								
							
								 
							
						 
						
							
							
								
								Remove the "assign random labors to random dwarfs" nonsense that I put in while drunk or something.  
							
							
							
						 
						
							2013-03-02 23:05:09 -06:00  
				
					
						
							
							
								 
						
							
							
								701b7b7d9b 
								
							
								 
							
						 
						
							
							
								
								Multiple data averaging windows and gcc fixes.  
							
							
							
						 
						
							2013-03-02 15:14:56 +13:00  
				
					
						
							
							
								 
						
							
							
								b07f2fc33f 
								
							
								 
							
						 
						
							
							
								
								Get entity from unit->civ_id instead of from ui (so it works in advmode), and only get site in fortress mode  
							
							
							
						 
						
							2013-02-28 10:00:00 -06:00  
				
					
						
							
							
								 
						
							
							
								9bd999ebc1 
								
							
								 
							
						 
						
							
							
								
								Update createitem to allow specifying quantity, also allow it to auto-detect whether it needs to create extra gloves and assign handedness  
							
							
							
						 
						
							2013-02-28 09:23:48 -06:00  
				
					
						
							
							
								 
						
							
							
								4afe74efa6 
								
							
								 
							
						 
						
							
							
								
								Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.  
							
							
							
						 
						
							2013-02-28 23:39:22 +13:00  
				
					
						
							
							
								 
						
							
							
								f55030909f 
								
							
								 
							
						 
						
							
							
								
								Add createItem plugin, spawns an item at the selected unit's feet  
							
							
							
						 
						
							2013-02-27 11:09:06 -06:00  
				
					
						
							
							
								 
						
							
							
								03b91ca26c 
								
							
								 
							
						 
						
							
							
								
								Fix a problem in binpatch.lua and comment out debug messages in tweak.  
							
							
							
						 
						
							2013-02-26 12:29:02 +04:00  
				
					
						
							
							
								 
						
							
							
								2bbe6824fb 
								
							
								 
							
						 
						
							
							
								
								fix tweak/stable-cursor for low z-levels  
							
							
							
						 
						
							2013-02-21 15:26:35 +01:00  
				
					
						
							
							
								 
						
							
							
								6b70a89321 
								
							
								 
							
						 
						
							
							
								
								ruby: typo in autogen/int8_t  
							
							
							
						 
						
							2013-02-17 02:05:01 +01:00  
				
					
						
							
							
								 
						
							
							
								db98b06c6e 
								
							
								 
							
						 
						
							
							
								
								Added documentation of autolabor exemption from burrowed dwarves  
							
							
							
						 
						
							2013-02-15 19:16:26 -08:00  
				
					
						
							
							
								 
						
							
							
								b0528d283b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/peterix/dfhack  
							
							
							
						 
						
							2013-02-15 20:23:39 +02:00  
				
					
						
							
							
								 
						
							
							
								ab6a993689 
								
							
								 
							
						 
						
							
							
								
								friendship.lua: removed debug printing  
							
							
							
						 
						
							2013-02-15 20:21:33 +02:00  
				
					
						
							
							
								 
						
							
							
								bb5d98e895 
								
							
								 
							
						 
						
							
							
								
								friendship fixes.  
							
							
							
						 
						
							2013-02-15 20:19:55 +02:00  
				
					
						
							
							
								 
						
							
							
								fe70df593b 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2013-02-14 18:36:21 -06:00  
				
					
						
							
							
								 
						
							
							
								ac2e45c843 
								
							
								 
							
						 
						
							
							
								
								Compatibility with older GCC versions in the search plugin  
							
							
							
						 
						
							2013-02-14 12:45:58 +01:00  
				
					
						
							
							
								 
						
							
							
								8de172f1c8 
								
							
								 
							
						 
						
							
							
								
								Binsearch in units.active can't possibly work, ever.  
							
							
							
						 
						
							2013-02-14 13:13:25 +04:00  
				
					
						
							
							
								 
						
							
							
								a8f5e54e37 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2013-02-14 09:53:14 +01:00  
				
					
						
							
							
								 
						
							
							
								e35a1c7720 
								
							
								 
							
						 
						
							
							
								
								Correct autolabor2 for changes in structures.  
							
							
							
						 
						
							2013-02-13 16:00:09 -06:00  
				
					
						
							
							
								 
						
							
							
								8d278a87db 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/angavrilov/dfhack.git  
							
							... 
							
							
							
							Conflicts:
	plugins/devel/CMakeLists.txt 
							
						 
						
							2013-02-13 13:52:02 -06:00  
				
					
						
							
							
								 
						
							
							
								f9a3450aca 
								
							
								 
							
						 
						
							
							
								
								Reinstate old autolabor in its original place.  
							
							
							
						 
						
							2013-02-13 13:34:39 -06:00  
				
					
						
							
							
								 
						
							
							
								ff0012c91f 
								
							
								 
							
						 
						
							
							
								
								Move new autolabor to autolabor2 in devel.  
							
							
							
						 
						
							2013-02-13 13:33:32 -06:00