2249cb14fa 
								
							
								 
							
						 
						
							
							
								
								Require level 3 both for water & magma, and indicate level 5 by brightness.  
							
							
							
						 
						
							2012-09-02 18:57:10 +04:00  
				
					
						
							
							
								 
						
							
							
								3b08ee44d1 
								
							
								 
							
						 
						
							
							
								
								Vary the internal power consumption of the engine depending on quality.  
							
							
							
						 
						
							2012-09-02 17:32:44 +04:00  
				
					
						
							
							
								 
						
							
							
								67630776ee 
								
							
								 
							
						 
						
							
							
								
								Tweak steam engine raws.  
							
							
							
						 
						
							2012-09-02 17:17:18 +04:00  
				
					
						
							
							
								 
						
							
							
								9c3843c1d4 
								
							
								 
							
						 
						
							
							
								
								Use new API in steam engine; always explode if destroyed with steam inside.  
							
							
							
						 
						
							2012-09-02 14:59:13 +04:00  
				
					
						
							
							
								 
						
							
							
								3713c5ea9e 
								
							
								 
							
						 
						
							
							
								
								Add some APIs required by steam engine to the core.  
							
							
							
						 
						
							2012-09-02 14:10:58 +04:00  
				
					
						
							
							
								 
						
							
							
								a4c028b3b7 
								
							
								 
							
						 
						
							
							
								
								ruby: buildings tweaks  
							
							
							
						 
						
							2012-09-02 01:38:58 +02:00  
				
					
						
							
							
								 
						
							
							
								8536785d1d 
								
							
								 
							
						 
						
							
							
								
								Boilers made out of unsuitable materials should explode!  
							
							
							
						 
						
							2012-09-01 20:46:34 +04:00  
				
					
						
							
							
								 
						
							
							
								bae85ac77d 
								
							
								 
							
						 
						
							
							
								
								Make the steam engine consume liquids from Z level below.  
							
							
							
						 
						
							2012-09-01 17:52:51 +04:00  
				
					
						
							
							
								 
						
							
							
								74501d3197 
								
							
								 
							
						 
						
							
							
								
								Try preventing "boiling water" from freezing, and dump steam on destroy.  
							
							
							
						 
						
							2012-09-01 14:42:19 +04:00  
				
					
						
							
							
								 
						
							
							
								f158e1894d 
								
							
								 
							
						 
						
							
							
								
								Further work on steam engine.  
							
							... 
							
							
							
							- Display water inside as 'boiling' by hooking item_liquid_miscst.
- Store current power in flags to avoid mess if items disappear etc.
- Suspend/unsuspend stoke jobs depending on steam level.
- Implement intelligent steam use rate and boiler capacity cap.
- Modify appearance of special tiles to display status. 
							
						 
						
							2012-09-01 11:29:05 +04:00  
				
					
						
							
							
								 
						
							
							
								acdf0ffb42 
								
							
								 
							
						 
						
							
							
								
								ruby: fix create building map occupancy  
							
							
							
						 
						
							2012-09-01 03:35:47 +02:00  
				
					
						
							
							
								 
						
							
							
								c68afdaad2 
								
							
								 
							
						 
						
							
							
								
								Display command key helper for Manipulator on Unit List, various tweaks  
							
							
							
						 
						
							2012-08-31 20:35:35 -05:00  
				
					
						
							
							
								 
						
							
							
								dcc9498dbc 
								
							
								 
							
						 
						
							
							
								
								ruby: tweak apis  
							
							
							
						 
						
							2012-09-01 03:22:48 +02:00  
				
					
						
							
							
								 
						
							
							
								ece0833c93 
								
							
								 
							
						 
						
							
							
								
								Prototype steam engine workshop :)  
							
							... 
							
							
							
							Very broken and incomplete still. 
							
						 
						
							2012-09-01 00:22:55 +04:00  
				
					
						
							
							
								 
						
							
							
								ce608e4f6a 
								
							
								 
							
						 
						
							
							
								
								ruby: yield announcements for further customization  
							
							
							
						 
						
							2012-08-31 19:16:13 +02:00  
				
					
						
							
							
								 
						
							
							
								54780cac3f 
								
							
								 
							
						 
						
							
							
								
								ruby: allow vmethod call with 6 args, use direct fptr  
							
							
							
						 
						
							2012-08-31 15:51:22 +02:00  
				
					
						
							
							
								 
						
							
							
								e6b2cb73af 
								
							
								 
							
						 
						
							
							
								
								Add a tweak for pressure plate creature weight limit rendering.  
							
							... 
							
							
							
							Print them as readable "???K", instead of the normal truncated numbers. 
							
						 
						
							2012-08-30 20:48:06 +04:00  
				
					
						
							
							
								 
						
							
							
								c414aafc59 
								
							
								 
							
						 
						
							
							
								
								Add "Toggle Group" key  
							
							
							
						 
						
							2012-08-30 10:03:12 -05:00  
				
					
						
							
							
								 
						
							
							
								1dee51abb0 
								
							
								 
							
						 
						
							
							
								
								Use generic DOCTOR tile for wound dresser labor.  
							
							
							
						 
						
							2012-08-30 19:01:43 +04:00  
				
					
						
							
							
								 
						
							
							
								7676f07b06 
								
							
								 
							
						 
						
							
							
								
								Display creature graphics tiles beneath the column headers  
							
							
							
						 
						
							2012-08-30 09:46:09 -05:00  
				
					
						
							
							
								 
						
							
							
								a8158cb19a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'q/master'  
							
							
							
						 
						
							2012-08-30 09:25:26 -05:00  
				
					
						
							
							
								 
						
							
							
								604cf80832 
								
							
								 
							
						 
						
							
							
								
								Repurpose the nestboxes plugin as a watcher that automatically forbids fertile eggs.  
							
							
							
						 
						
							2012-08-30 09:23:11 -05:00  
				
					
						
							
							
								 
						
							
							
								4e169558f5 
								
							
								 
							
						 
						
							
							
								
								Tweak column labels a bit  
							
							
							
						 
						
							2012-08-28 15:52:26 -05:00  
				
					
						
							
							
								 
						
							
							
								b2587c1e6d 
								
							
								 
							
						 
						
							
							
								
								Fix skill sort  
							
							
							
						 
						
							2012-08-28 15:33:22 -05:00  
				
					
						
							
							
								 
						
							
							
								834d7fa1fa 
								
							
								 
							
						 
						
							
							
								
								Tweak prospector: try using the biome elevation for soil depth.  
							
							... 
							
							
							
							Until a better idea presents itself (or maybe it is the right way).
Soil depth computation affects which soil layers are reported, and
Z level alignment of the layer stack. 
							
						 
						
							2012-08-28 11:52:54 +04:00  
				
					
						
							
							
								 
						
							
							
								d69a7c63e3 
								
							
								 
							
						 
						
							
							
								
								Tabs to spaces.  
							
							
							
						 
						
							2012-08-27 16:05:23 -04:00  
				
					
						
							
							
								 
						
							
							
								1a5f05768f 
								
							
								 
							
						 
						
							
							
								
								Made it not run every tick.  
							
							
							
						 
						
							2012-08-27 15:06:41 -04:00  
				
					
						
							
							
								 
						
							
							
								c587ea2c74 
								
							
								 
							
						 
						
							
							
								
								Add new tweak command to make Train orders no longer count as patrol duty  
							
							
							
						 
						
							2012-08-27 14:06:10 -05:00  
				
					
						
							
							
								 
						
							
							
								f73cebff68 
								
							
								 
							
						 
						
							
							
								
								Account for caves and magma sea in pre-embark prospector.  
							
							
							
						 
						
							2012-08-27 23:03:17 +04:00  
				
					
						
							
							
								 
						
							
							
								f1915915b4 
								
							
								 
							
						 
						
							
							
								
								Follow change in xml again.  
							
							
							
						 
						
							2012-08-27 23:03:02 +04:00  
				
					
						
							
							
								 
						
							
							
								e12e7ddd40 
								
							
								 
							
						 
						
							
							
								
								Fixed some memory leaks.  
							
							
							
						 
						
							2012-08-27 14:42:00 -04:00  
				
					
						
							
							
								 
						
							
							
								5ad9b82ace 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-08-27 09:17:27 -05:00  
				
					
						
							
							
								 
						
							
							
								faf3bdf2b7 
								
							
								 
							
						 
						
							
							
								
								Adjust grid display - labors without skills use different tiles, and skills without labors have a red background  
							
							
							
						 
						
							2012-08-27 09:04:32 -05:00  
				
					
						
							
							
								 
						
							
							
								5fed060d7d 
								
							
								 
							
						 
						
							
							
								
								Follow field rename in xml.  
							
							
							
						 
						
							2012-08-27 16:01:11 +04:00  
				
					
						
							
							
								 
						
							
							
								f562871867 
								
							
								 
							
						 
						
							
							
								
								Add ViewCre and Zoom-Cre to Manipulator (by forwarding them to Unitlist)  
							
							
							
						 
						
							2012-08-26 13:58:37 -05:00  
				
					
						
							
							
								 
						
							
							
								84f6663a07 
								
							
								 
							
						 
						
							
							
								
								Add a tweak to save the cursor position of dwarfmode between menus.  
							
							
							
						 
						
							2012-08-26 21:19:56 +04:00  
				
					
						
							
							
								 
						
							
							
								8171652323 
								
							
								 
							
						 
						
							
							
								
								Support permaflow in liquids, including the gui.  
							
							
							
						 
						
							2012-08-26 20:08:28 +04:00  
				
					
						
							
							
								 
						
							
							
								bee33fd486 
								
							
								 
							
						 
						
							
							
								
								Add a performance test for location caching in general refs.  
							
							
							
						 
						
							2012-08-26 14:43:14 +04:00  
				
					
						
							
							
								 
						
							
							
								f6e4969e19 
								
							
								 
							
						 
						
							
							
								
								Key names are bright green, not dark green  
							
							
							
						 
						
							2012-08-25 11:07:42 -05:00  
				
					
						
							
							
								 
						
							
							
								da6567e374 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-08-25 11:02:28 -05:00  
				
					
						
							
							
								 
						
							
							
								bd9800055d 
								
							
								 
							
						 
						
							
							
								
								Link to the lua library in the liquids plugin.  
							
							
							
						 
						
							2012-08-25 20:01:03 +04:00  
				
					
						
							
							
								 
						
							
							
								dcdff40c85 
								
							
								 
							
						 
						
							
							
								
								Add sorting, command help; replace filtering with just using the current page of the UnitList viewscreen (and don't close it)  
							
							
							
						 
						
							2012-08-25 10:57:50 -05:00  
				
					
						
							
							
								 
						
							
							
								41ad42d0fd 
								
							
								 
							
						 
						
							
							
								
								Expose the liquids plugin engine to lua, and make a wrapper gui script.  
							
							
							
						 
						
							2012-08-25 10:37:03 +04:00  
				
					
						
							
							
								 
						
							
							
								21904fd607 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-08-24 22:30:39 +02:00  
				
					
						
							
							
								 
						
							
							
								9154564e71 
								
							
								 
							
						 
						
							
							
								
								Sync up submodules  
							
							
							
						 
						
							2012-08-24 21:56:16 +02:00  
				
					
						
							
							
								 
						
							
							
								15adb17559 
								
							
								 
							
						 
						
							
							
								
								Converted tabs to spaces.  
							
							
							
						 
						
							2012-08-23 22:21:09 -04:00  
				
					
						
							
							
								 
						
							
							
								76cd941084 
								
							
								 
							
						 
						
							
							
								
								Added teledwarf: teleports dwarves to their destination instantly.  
							
							
							
						 
						
							2012-08-23 22:17:28 -04:00  
				
					
						
							
							
								 
						
							
							
								eac2f3f5d1 
								
							
								 
							
						 
						
							
							
								
								Added misery plugin: multiply effects of negative thoughts.  
							
							
							
						 
						
							2012-08-23 22:05:35 -04:00  
				
					
						
							
							
								 
						
							
							
								c339c7085a 
								
							
								 
							
						 
						
							
							
								
								ruby: add memory_check / memory_patch native methods  
							
							
							
						 
						
							2012-08-23 18:44:03 +02:00  
				
					
						
							
							
								 
						
							
							
								5b0f37276f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/quietust/dfhack  
							
							
							
						 
						
							2012-08-23 17:19:15 +02:00  
				
					
						
							
							
								 
						
							
							
								7046a6abbc 
								
							
								 
							
						 
						
							
							
								
								Manipulator - store unit 'summary' objects so names/professions can be cached (for faster sorting), and properly display skill level when it's exactly at the level threshold  
							
							
							
						 
						
							2012-08-22 20:52:19 -05:00  
				
					
						
							
							
								 
						
							
							
								132491e868 
								
							
								 
							
						 
						
							
							
								
								Use Units module to get unit colors, fix initial scroll position  
							
							
							
						 
						
							2012-08-22 16:54:34 -05:00  
				
					
						
							
							
								 
						
							
							
								92c0b555dc 
								
							
								 
							
						 
						
							
							
								
								Use Units module to get profession strings  
							
							
							
						 
						
							2012-08-22 11:15:05 -05:00  
				
					
						
							
							
								 
						
							
							
								83214ccb72 
								
							
								 
							
						 
						
							
							
								
								Fix bugs in window resizing, cleanup some other stuff  
							
							
							
						 
						
							2012-08-22 10:43:26 -05:00  
				
					
						
							
							
								 
						
							
							
								7987ea9a98 
								
							
								 
							
						 
						
							
							
								
								Put some compatibility features into the base dfhack viewscreen.  
							
							
							
						 
						
							2012-08-22 18:18:19 +04:00  
				
					
						
							
							
								 
						
							
							
								8969fc9435 
								
							
								 
							
						 
						
							
							
								
								manipulator: Inherit from dfhack_viewscreen, and don't use itoa.  
							
							
							
						 
						
							2012-08-22 12:23:56 +04:00  
				
					
						
							
							
								 
						
							
							
								b6e5786b4f 
								
							
								 
							
						 
						
							
							
								
								Manipulator - display summary of selected unit + skill/labor  
							
							
							
						 
						
							2012-08-21 16:41:20 -05:00  
				
					
						
							
							
								 
						
							
							
								2c0a42296c 
								
							
								 
							
						 
						
							
							
								
								New plugin: Dwarf Manipulator - enter the [u]nits list and press [l]abors to get a DwarfTherapist-style labor editor  
							
							
							
						 
						
							2012-08-21 15:43:32 -05:00  
				
					
						
							
							
								 
						
							
							
								6d12368724 
								
							
								 
							
						 
						
							
							
								
								Added digtype to dig.cpp. Digtype allows designation of all veins of a given type.  
							
							
							
						 
						
							2012-08-19 22:45:47 -04:00  
				
					
						
							
							
								 
						
							
							
								b8ee52131b 
								
							
								 
							
						 
						
							
							
								
								Add a module for painting tiles into the gps global.  
							
							
							
						 
						
							2012-08-19 09:31:09 +04:00  
				
					
						
							
							
								 
						
							
							
								fd0bf2ef92 
								
							
								 
							
						 
						
							
							
								
								Extract the color enum from color_ostream to toplevel.  
							
							
							
						 
						
							2012-08-19 09:21:25 +04:00  
				
					
						
							
							
								 
						
							
							
								8ed219d4e0 
								
							
								 
							
						 
						
							
							
								
								Add "clean plants", currently just removes water from rain (and lets you set them on fire)  
							
							
							
						 
						
							2012-08-18 19:21:40 -05:00  
				
					
						
							
							
								 
						
							
							
								01ba2a31fc 
								
							
								 
							
						 
						
							
							
								
								Tweak the interpose API, and fix a couple of bugs.  
							
							
							
						 
						
							2012-08-18 11:48:07 +04:00  
				
					
						
							
							
								 
						
							
							
								236ffd578b 
								
							
								 
							
						 
						
							
							
								
								Add experimental support for interposing vmethods of known classes.  
							
							... 
							
							
							
							The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API. 
							
						 
						
							2012-08-17 22:40:53 +04:00  
				
					
						
							
							
								 
						
							
							
								cde97bba6f 
								
							
								 
							
						 
						
							
							
								
								Fix workflow some more  
							
							
							
						 
						
							2012-08-13 07:42:02 +02:00  
				
					
						
							
							
								 
						
							
							
								4eedd6f5f0 
								
							
								 
							
						 
						
							
							
								
								Fix workflow.  
							
							
							
						 
						
							2012-08-13 07:39:11 +02:00  
				
					
						
							
							
								 
						
							
							
								e659d845ab 
								
							
								 
							
						 
						
							
							
								
								ruby: fix LinkList.next=  
							
							
							
						 
						
							2012-08-13 02:06:56 +02:00  
				
					
						
							
							
								 
						
							
							
								53a0536506 
								
							
								 
							
						 
						
							
							
								
								ruby: typo in building_deconstruct  
							
							
							
						 
						
							2012-08-13 00:46:27 +02:00  
				
					
						
							
							
								 
						
							
							
								5a880d619c 
								
							
								 
							
						 
						
							
							
								
								ruby: add MapTile#dig, tweak unit_iscitizen  
							
							
							
						 
						
							2012-08-12 22:36:54 +02:00  
				
					
						
							
							
								 
						
							
							
								7cc100b26e 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-08-12 01:10:37 +02:00  
				
					
						
							
							
								 
						
							
							
								030bd8ab57 
								
							
								 
							
						 
						
							
							
								
								fix/loyaltycascade: clear the enemy status cache, dont require a save/reload anymore  
							
							
							
						 
						
							2012-08-12 00:24:34 +02:00  
				
					
						
							
							
								 
						
							
							
								2362bb8eea 
								
							
								 
							
						 
						
							
							
								
								ruby: add popup_announcement method  
							
							
							
						 
						
							2012-08-11 22:25:08 +02:00  
				
					
						
							
							
								 
						
							
							
								4c720c7504 
								
							
								 
							
						 
						
							
							
								
								ruby: add explicit paths everywhere for ruby-autogen  
							
							
							
						 
						
							2012-08-11 20:11:00 +02:00  
				
					
						
							
							
								 
						
							
							
								942b245461 
								
							
								 
							
						 
						
							
							
								
								ruby: add method to check if an item is free for use as construction material  
							
							
							
						 
						
							2012-08-11 20:08:33 +02:00  
				
					
						
							
							
								 
						
							
							
								8f4c39d3f5 
								
							
								 
							
						 
						
							
							
								
								showmood: fix fetched/needed quantity calculation  
							
							
							
						 
						
							2012-08-09 17:07:20 +02:00  
				
					
						
							
							
								 
						
							
							
								7a03f93dbd 
								
							
								 
							
						 
						
							
							
								
								ruby: add raw stl::string allocation, add _cpp_delete, tweak readme  
							
							
							
						 
						
							2012-08-09 14:50:52 +02:00  
				
					
						
							
							
								 
						
							
							
								2abb9a898c 
								
							
								 
							
						 
						
							
							
								
								One more autolabor cleanup  
							
							
							
						 
						
							2012-08-08 10:50:07 +02:00  
				
					
						
							
							
								 
						
							
							
								4039d2c0b7 
								
							
								 
							
						 
						
							
							
								
								Don't disable autolabor when you input "autolabor 1|enable" and it's  
							
							... 
							
							
							
							already enabled. 
							
						 
						
							2012-08-08 10:47:02 +02:00  
				
					
						
							
							
								 
						
							
							
								2c703ffbca 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary whitespace  
							
							
							
						 
						
							2012-08-06 16:59:09 +02:00  
				
					
						
							
							
								 
						
							
							
								bb760bd376 
								
							
								 
							
						 
						
							
							
								
								Added quality constraints to workflow plugin  
							
							
							
						 
						
							2012-08-06 16:55:55 +02:00  
				
					
						
							
							
								 
						
							
							
								c1bcd270e9 
								
							
								 
							
						 
						
							
							
								
								ruby: add spawn_water/spawn_magma methods to MapTile  
							
							
							
						 
						
							2012-08-03 17:00:02 +02:00  
				
					
						
							
							
								 
						
							
							
								f400591080 
								
							
								 
							
						 
						
							
							
								
								ruby: use enums in single-bit values too  
							
							
							
						 
						
							2012-08-03 16:53:54 +02:00  
				
					
						
							
							
								 
						
							
							
								81ea0345ad 
								
							
								 
							
						 
						
							
							
								
								Fix cage-related bug in the sort plugin.  
							
							
							
						 
						
							2012-08-03 16:09:51 +02:00  
				
					
						
							
							
								 
						
							
							
								160487f7eb 
								
							
								 
							
						 
						
							
							
								
								ruby: move all generated/downloaded stuff in the build/ directory  
							
							
							
						 
						
							2012-08-03 15:19:43 +02:00  
				
					
						
							
							
								 
						
							
							
								61195859e3 
								
							
								 
							
						 
						
							
							
								
								fix autolabor compilation error  
							
							
							
						 
						
							2012-08-03 03:28:29 +02:00  
				
					
						
							
							
								 
						
							
							
								1ed6d6e7e0 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/ab9rf/dfhack  
							
							... 
							
							
							
							Conflicts:
	plugins/autolabor.cpp 
							
						 
						
							2012-08-02 10:32:25 -05:00  
				
					
						
							
							
								 
						
							
							
								144802e3ef 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/hashaash/dfhack  
							
							
							
						 
						
							2012-08-02 14:44:52 +02:00  
				
					
						
							
							
								 
						
							
							
								8a8b45d840 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/warmist/dfhack  
							
							
							
						 
						
							2012-08-02 14:44:31 +02:00  
				
					
						
							
							
								 
						
							
							
								d8cb6e2c4e 
								
							
								 
							
						 
						
							
							
								
								Fixed seedwatch not working on reclaim  
							
							... 
							
							
							
							Just needed to add a check for game_type::DWARF_RECLAIM in two places 
							
						 
						
							2012-08-01 19:52:50 -05:00  
				
					
						
							
							
								 
						
							
							
								78fc850ce2 
								
							
								 
							
						 
						
							
							
								
								Autolabor: dwarves who are scheduled for a meeting are automatically cleared of all labors.  
							
							... 
							
							
							
							Labor to skill map is now generated at plugin start rather than with every iteration.
Also partially refactored the code; no behavioral changes from that. 
							
						 
						
							2012-07-22 12:16:50 -05:00  
				
					
						
							
							
								 
						
							
							
								9f53f6296d 
								
							
								 
							
						 
						
							
							
								
								Removed Console module from dfusion.  
							
							
							
						 
						
							2012-07-18 21:07:27 +03:00  
				
					
						
							
							
								 
						
							
							
								9705497a7e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/peterix/dfhack  
							
							
							
						 
						
							2012-07-17 10:39:20 -05:00  
				
					
						
							
							
								 
						
							
							
								2695d55090 
								
							
								 
							
						 
						
							
							
								
								Make indentation consistent (spaces), only display "not enabled" error if you actually try to do something  
							
							
							
						 
						
							2012-07-17 10:27:30 -05:00  
				
					
						
							
							
								 
						
							
							
								671f8cc1ff 
								
							
								 
							
						 
						
							
							
								
								Synchronize with changes to df-structures  
							
							
							
						 
						
							2012-07-16 20:56:46 -05:00  
				
					
						
							
							
								 
						
							
							
								ab4c4b63c0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'jjyg/master'  
							
							
							
						 
						
							2012-07-16 20:52:15 -05:00  
				
					
						
							
							
								 
						
							
							
								70ac2ffa17 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-07-16 20:52:03 -05:00  
				
					
						
							
							
								 
						
							
							
								6be752454d 
								
							
								 
							
						 
						
							
							
								
								Check zone plugin parameters better  
							
							
							
						 
						
							2012-07-12 02:16:08 +02:00  
				
					
						
							
							
								 
						
							
							
								0615a27663 
								
							
								 
							
						 
						
							
							
								
								ruby: refix unit_idlers, make unit_find handle 'u'nitlist viewscreen  
							
							
							
						 
						
							2012-07-12 00:44:07 +02:00  
				
					
						
							
							
								 
						
							
							
								d8e55196c2 
								
							
								 
							
						 
						
							
							
								
								ruby: better handling of errors in onupdate callbacks  
							
							
							
						 
						
							2012-07-11 23:25:55 +02:00  
				
					
						
							
							
								 
						
							
							
								b0edb33023 
								
							
								 
							
						 
						
							
							
								
								ruby: fix unit_idlers  
							
							
							
						 
						
							2012-07-11 23:24:53 +02:00  
				
					
						
							
							
								 
						
							
							
								b2623e68a3 
								
							
								 
							
						 
						
							
							
								
								Track submodules  
							
							
							
						 
						
							2012-07-11 14:38:04 -05:00  
				
					
						
							
							
								 
						
							
							
								79ca632f64 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'jjyg/master'  
							
							
							
						 
						
							2012-07-11 14:37:19 -05:00  
				
					
						
							
							
								 
						
							
							
								08469abd09 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/angavrilov/dfhack.git  
							
							
							
						 
						
							2012-07-11 14:37:06 -05:00  
				
					
						
							
							
								 
						
							
							
								0f23aba89d 
								
							
								 
							
						 
						
							
							
								
								Sync with df-structures  
							
							
							
						 
						
							2012-07-11 14:31:47 -05:00  
				
					
						
							
							
								 
						
							
							
								4c7c38df93 
								
							
								 
							
						 
						
							
							
								
								* Autolabor: really exclude the broker from all labors when trader requested  
							
							... 
							
							
							
							* Autolabor: add 'haulpct' config option to control percentage of non-idle dwarfs assigned to hauling labors (default is 33)
* Zones: allow nontamed birds to be nestboxes.  warning: does not check for 'hostile to civilization' birds, so if you try to tame a hostile elk bird, !!fun!! will happen
* Stripcaged: changed default behavior to keep armor, reduced noisiness 
							
						 
						
							2012-07-11 14:30:47 -05:00  
				
					
						
							
							
								 
						
							
							
								a5977db443 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-07-09 01:13:07 +02:00  
				
					
						
							
							
								 
						
							
							
								6975f643fc 
								
							
								 
							
						 
						
							
							
								
								Fixage, syncing with structures  
							
							
							
						 
						
							2012-07-09 01:05:40 +02:00  
				
					
						
							
							
								 
						
							
							
								c20951c30b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-07-06 20:37:14 +02:00  
				
					
						
							
							
								 
						
							
							
								4bbb185f7b 
								
							
								 
							
						 
						
							
							
								
								Fix build and allow autodump to any walkable tile (e.g. a stair).  
							
							
							
						 
						
							2012-07-06 20:11:20 +04:00  
				
					
						
							
							
								 
						
							
							
								d645d6b046 
								
							
								 
							
						 
						
							
							
								
								ruby: better message on out of bounds array access  
							
							
							
						 
						
							2012-07-06 13:32:39 +02:00  
				
					
						
							
							
								 
						
							
							
								bef5079d43 
								
							
								 
							
						 
						
							
							
								
								ruby: add vector.first/last  
							
							
							
						 
						
							2012-07-06 13:25:47 +02:00  
				
					
						
							
							
								 
						
							
							
								8e17ebbefc 
								
							
								 
							
						 
						
							
							
								
								add SC_PAUSED / SC_UNPAUSED onStateChange events  
							
							
							
						 
						
							2012-07-05 18:03:02 +02:00  
				
					
						
							
							
								 
						
							
							
								45456b2230 
								
							
								 
							
						 
						
							
							
								
								Enable building Stonesense and Ruby support  
							
							
							
						 
						
							2012-07-05 11:39:27 -04:00  
				
					
						
							
							
								 
						
							
							
								068542d58a 
								
							
								 
							
						 
						
							
							
								
								Submodule changes  
							
							
							
						 
						
							2012-07-05 11:39:08 -04:00  
				
					
						
							
							
								 
						
							
							
								6f4f3039e1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'jjyg/master'  
							
							
							
						 
						
							2012-07-05 10:04:28 -05:00  
				
					
						
							
							
								 
						
							
							
								fb2d901e01 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'angavrilov/master'  
							
							
							
						 
						
							2012-07-05 10:01:04 -05:00  
				
					
						
							
							
								 
						
							
							
								217ef18aef 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-07-05 10:00:36 -05:00  
				
					
						
							
							
								 
						
							
							
								83f00e5583 
								
							
								 
							
						 
						
							
							
								
								Autolabor: allow setting the nonidle hauler percentage at runtime.  
							
							... 
							
							
							
							Stripcaged: add keeparmor option 
							
						 
						
							2012-07-05 09:59:28 -05:00  
				
					
						
							
							
								 
						
							
							
								b718912184 
								
							
								 
							
						 
						
							
							
								
								Fix Ruby build  
							
							
							
						 
						
							2012-07-05 10:31:55 -04:00  
				
					
						
							
							
								 
						
							
							
								7074048146 
								
							
								 
							
						 
						
							
							
								
								showmood: display number of items already collected  
							
							
							
						 
						
							2012-07-05 16:17:41 +02:00  
				
					
						
							
							
								 
						
							
							
								7732901b6e 
								
							
								 
							
						 
						
							
							
								
								ruby: tweak onupdate to allow tick rate-limiting  
							
							
							
						 
						
							2012-07-05 15:35:37 +02:00  
				
					
						
							
							
								 
						
							
							
								f560d2de11 
								
							
								 
							
						 
						
							
							
								
								ruby: add MapTile class  
							
							
							
						 
						
							2012-07-05 14:15:34 +02:00  
				
					
						
							
							
								 
						
							
							
								e4d4bf23ae 
								
							
								 
							
						 
						
							
							
								
								update xml, fix autolabor with new trade depot flags name  
							
							
							
						 
						
							2012-07-04 19:05:44 +02:00  
				
					
						
							
							
								 
						
							
							
								f80ca239d0 
								
							
								 
							
						 
						
							
							
								
								ruby: allow coords arguments to *_find, add building_find  
							
							
							
						 
						
							2012-07-04 18:34:41 +02:00  
				
					
						
							
							
								 
						
							
							
								7c4f60df1d 
								
							
								 
							
						 
						
							
							
								
								ruby: extend item_find to work on constructed coffers  
							
							
							
						 
						
							2012-07-04 17:48:44 +02:00  
				
					
						
							
							
								 
						
							
							
								15cfc1d00b 
								
							
								 
							
						 
						
							
							
								
								ruby: handle constructed beds in item_find in LookAround mode  
							
							
							
						 
						
							2012-07-04 17:24:46 +02:00  
				
					
						
							
							
								 
						
							
							
								edf0a9cb3d 
								
							
								 
							
						 
						
							
							
								
								ruby: add decode_mat method for mat_type/mat_index  
							
							
							
						 
						
							2012-07-04 17:24:03 +02:00  
				
					
						
							
							
								 
						
							
							
								cb17bde8f4 
								
							
								 
							
						 
						
							
							
								
								ruby: refix codegen for refers-to without key-field, add translate_name  
							
							
							
						 
						
							2012-07-04 15:18:36 +02:00  
				
					
						
							
							
								 
						
							
							
								877b879e57 
								
							
								 
							
						 
						
							
							
								
								ruby: item_find handle v/i unit inventory  
							
							
							
						 
						
							2012-07-03 23:57:15 +02:00  
				
					
						
							
							
								 
						
							
							
								2e42e31754 
								
							
								 
							
						 
						
							
							
								
								ruby: add curview, fix item_find/unit_find wrt gview mode, fix refers-to to use binsearch  
							
							
							
						 
						
							2012-07-03 19:51:52 +02:00  
				
					
						
							
							
								 
						
							
							
								501fd43dda 
								
							
								 
							
						 
						
							
							
								
								ruby: fix handling of <pointer to unknown data struct>  
							
							
							
						 
						
							2012-07-03 18:40:10 +02:00  
				
					
						
							
							
								 
						
							
							
								a7a25b80a0 
								
							
								 
							
						 
						
							
							
								
								ruby: use the color_ostream argument from dfhack to output to dfhack-run  
							
							
							
						 
						
							2012-07-03 16:13:15 +02:00  
				
					
						
							
							
								 
						
							
							
								0bdff401ca 
								
							
								 
							
						 
						
							
							
								
								ruby: fix codegen align int64_t on windows  
							
							
							
						 
						
							2012-07-03 15:24:35 +02:00  
				
					
						
							
							
								 
						
							
							
								b9425474a1 
								
							
								 
							
						 
						
							
							
								
								ruby: fix codegen for darwin  
							
							
							
						 
						
							2012-07-02 21:57:53 +02:00  
				
					
						
							
							
								 
						
							
							
								c24333515b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jjyg/dfhack  
							
							... 
							
							
							
							Conflicts:
	library/Core.cpp
Starting to merge in Ruby stuffs 
							
						 
						
							2012-07-02 11:07:30 -04:00  
				
					
						
							
							
								 
						
							
							
								421e5fd82c 
								
							
								 
							
						 
						
							
							
								
								Swap order of includes to work around silly compiler/assembler bug on OS X  
							
							
							
						 
						
							2012-07-02 11:02:48 -04:00  
				
					
						
							
							
								 
						
							
							
								554683929f 
								
							
								 
							
						 
						
							
							
								
								ruby: allow explicit target-os override in codegen  
							
							
							
						 
						
							2012-07-01 14:20:55 +02:00  
				
					
						
							
							
								 
						
							
							
								bd5aea994b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'q-github/master'  
							
							
							
						 
						
							2012-06-30 15:51:49 +04:00  
				
					
						
							
							
								 
						
							
							
								31a5495031 
								
							
								 
							
						 
						
							
							
								
								ruby: osx support (maybe)  
							
							
							
						 
						
							2012-06-29 17:51:26 +02:00  
				
					
						
							
							
								 
						
							
							
								592c0a41ac 
								
							
								 
							
						 
						
							
							
								
								ruby: remove useless raise in unit_find  
							
							
							
						 
						
							2012-06-29 11:29:36 +02:00  
				
					
						
							
							
								 
						
							
							
								56ff129ee0 
								
							
								 
							
						 
						
							
							
								
								ruby: fix enum + base-type  
							
							
							
						 
						
							2012-06-29 11:25:41 +02:00  
				
					
						
							
							
								 
						
							
							
								f0d4d799d8 
								
							
								 
							
						 
						
							
							
								
								Don't index world_data->region_map beyond its bounds  
							
							
							
						 
						
							2012-06-27 16:38:39 -05:00  
				
					
						
							
							
								 
						
							
							
								24aa3827c1 
								
							
								 
							
						 
						
							
							
								
								ruby: generate accessors for refers-to and vector of ref-target  
							
							
							
						 
						
							2012-06-27 14:52:34 +02:00  
				
					
						
							
							
								 
						
							
							
								85f9d35f6f 
								
							
								 
							
						 
						
							
							
								
								Temporary fix for memory accessor.  
							
							
							
						 
						
							2012-06-25 22:26:08 +03:00  
				
					
						
							
							
								 
						
							
							
								4e4e375122 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-06-25 22:23:37 +03:00  
				
					
						
							
							
								 
						
							
							
								1c013486d5 
								
							
								 
							
						 
						
							
							
								
								Removed non-working onfunction.  
							
							
							
						 
						
							2012-06-25 22:22:20 +03:00  
				
					
						
							
							
								 
						
							
							
								c2c29af959 
								
							
								 
							
						 
						
							
							
								
								ruby: fix deadlock on df exit due to BEGIN_UNLOAD + Core.Suspend()  
							
							
							
						 
						
							2012-06-25 19:16:35 +02:00  
				
					
						
							
							
								 
						
							
							
								412e8608d8 
								
							
								 
							
						 
						
							
							
								
								ruby: add method for basic xml ref-target support, tweak scripts/slayrace  
							
							
							
						 
						
							2012-06-25 19:05:50 +02:00  
				
					
						
							
							
								 
						
							
							
								17d06b969b 
								
							
								 
							
						 
						
							
							
								
								ruby: move all ruby invocations inside a CoreSuspend lock, remove ruby suspend method  
							
							
							
						 
						
							2012-06-25 17:06:37 +02:00  
				
					
						
							
							
								 
						
							
							
								8fb139a2f4 
								
							
								 
							
						 
						
							
							
								
								ruby: document mutex use, load ruby-autogen in the background  
							
							
							
						 
						
							2012-06-25 01:45:50 +02:00  
				
					
						
							
							
								 
						
							
							
								d5ae1fc4f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/danaris/dfhack  
							
							... 
							
							
							
							Conflicts:
	depends/clsocket
	package/darwin/dfhack
	package/darwin/dfhack-run
Fixed. 
							
						 
						
							2012-06-24 18:41:24 -04:00  
				
					
						
							
							
								 
						
							
							
								d1762e3cb8 
								
							
								 
							
						 
						
							
							
								
								ruby: add growcrops script, add doc for methods in README  
							
							
							
						 
						
							2012-06-24 21:44:40 +02:00  
				
					
						
							
							
								 
						
							
							
								552da8417e 
								
							
								 
							
						 
						
							
							
								
								ruby: handle .rb files in df/hack/scripts/  
							
							
							
						 
						
							2012-06-24 20:24:46 +02:00  
				
					
						
							
							
								 
						
							
							
								3f4d2e4792 
								
							
								 
							
						 
						
							
							
								
								ruby: split ruby.rb in modules  
							
							
							
						 
						
							2012-06-24 17:30:26 +02:00  
				
					
						
							
							
								 
						
							
							
								4c2d4d4b86 
								
							
								 
							
						 
						
							
							
								
								ruby: clean stuff up, install ruby modules in df/hack/ruby/  
							
							
							
						 
						
							2012-06-24 16:09:31 +02:00  
				
					
						
							
							
								 
						
							
							
								ad1ba9bf6b 
								
							
								 
							
						 
						
							
							
								
								ruby: try msvc workaround for __thiscall  
							
							
							
						 
						
							2012-06-24 02:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								1327b4954a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-06-18 10:04:45 -05:00  
				
					
						
							
							
								 
						
							
							
								db91850464 
								
							
								 
							
						 
						
							
							
								
								Sync to the change in gamemode/gametype globals.  
							
							
							
						 
						
							2012-06-16 14:42:56 +04:00  
				
					
						
							
							
								 
						
							
							
								0bdae68294 
								
							
								 
							
						 
						
							
							
								
								ruby: fix codegen enum base-types  
							
							
							
						 
						
							2012-06-15 21:02:04 +02:00  
				
					
						
							
							
								 
						
							
							
								93662034fe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-06-15 13:08:46 +03:00  
				
					
						
							
							
								 
						
							
							
								cfdf941c52 
								
							
								 
							
						 
						
							
							
								
								ruby: fix windows build warnings/load ruby.rb  
							
							
							
						 
						
							2012-06-14 22:35:59 +02:00  
				
					
						
							
							
								 
						
							
							
								6bd67cc055 
								
							
								 
							
						 
						
							
							
								
								ruby: try to fix msvc build (use fastcall for thiscall fptr)  
							
							
							
						 
						
							2012-06-14 14:25:16 +02:00  
				
					
						
							
							
								 
						
							
							
								2781723f7b 
								
							
								 
							
						 
						
							
							
								
								Linux build works again.  
							
							
							
						 
						
							2012-06-14 02:25:15 +02:00  
				
					
						
							
							
								 
						
							
							
								5f33ebde41 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/Rinin/dfhack  
							
							
							
						 
						
							2012-06-14 00:01:38 +02:00  
				
					
						
							
							
								 
						
							
							
								52f9fe4a6a 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/danaris/dfhack  
							
							... 
							
							
							
							Conflicts:
	depends/clsocket 
							
						 
						
							2012-06-14 00:00:36 +02:00  
				
					
						
							
							
								 
						
							
							
								0285448367 
								
							
								 
							
						 
						
							
							
								
								ruby: fix download url, cmake doesnt handle HTTP 301  
							
							
							
						 
						
							2012-06-13 00:20:52 +02:00  
				
					
						
							
							
								 
						
							
							
								3c1cb24d9f 
								
							
								 
							
						 
						
							
							
								
								ruby: download lib from github as tgz, switch to ruby18, simply log to stderr.log if cannot load libruby  
							
							
							
						 
						
							2012-06-12 18:51:33 +02:00  
				
					
						
							
							
								 
						
							
							
								95606ee3dc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-06-11 16:00:00 +02:00  
				
					
						
							
							
								 
						
							
							
								c0e7295f22 
								
							
								 
							
						 
						
							
							
								
								ruby: fix cmake to rebuild ruby-autogen.rb only when necessary  
							
							
							
						 
						
							2012-06-10 23:42:58 +02:00  
				
					
						
							
							
								 
						
							
							
								7ee8d79014 
								
							
								 
							
						 
						
							
							
								
								ruby: download libruby with cmake  
							
							
							
						 
						
							2012-06-10 02:06:22 +02:00  
				
					
						
							
							
								 
						
							
							
								bc734619b4 
								
							
								 
							
						 
						
							
							
								
								ruby: use ruby1.9.1 on linux  
							
							
							
						 
						
							2012-06-10 01:45:30 +02:00  
				
					
						
							
							
								 
						
							
							
								2aace670ea 
								
							
								 
							
						 
						
							
							
								
								ruby: dlopen libruby -- currently segfaults with rb1.9 ...  
							
							
							
						 
						
							2012-06-02 23:44:52 +02:00  
				
					
						
							
							
								 
						
							
							
								e143c312bf 
								
							
								 
							
						 
						
							
							
								
								Sync with df-structures changes  
							
							
							
						 
						
							2012-05-31 19:13:11 -05:00  
				
					
						
							
							
								 
						
							
							
								884cf53b0b 
								
							
								 
							
						 
						
							
							
								
								body_part_raw has its own set of flags which do NOT match body_part_template  
							
							
							
						 
						
							2012-05-30 08:02:53 -05:00  
				
					
						
							
							
								 
						
							
							
								3e61452f15 
								
							
								 
							
						 
						
							
							
								
								ruby: codegen code cleanup, move ruby-memstruct in ruby.rb, handle bool struct fields, rename Enum.to_sym/to_i to sym()/int(), define nested compound sizeof()  
							
							
							
						 
						
							2012-05-29 18:30:18 +02:00  
				
					
						
							
							
								 
						
							
							
								bcb698a5b4 
								
							
								 
							
						 
						
							
							
								
								ruby: have codegen compute struct offsets directly  
							
							
							
						 
						
							2012-05-29 16:10:33 +02:00  
				
					
						
							
							
								 
						
							
							
								e72bf1ac9a 
								
							
								 
							
						 
						
							
							
								
								Sync to changes in df-structures.  
							
							
							
						 
						
							2012-05-26 14:49:27 +04:00  
				
					
						
							
							
								 
						
							
							
								8644ea4dc0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'q-github/master'  
							
							
							
						 
						
							2012-05-26 14:41:36 +04:00  
				
					
						
							
							
								 
						
							
							
								800cbca578 
								
							
								 
							
						 
						
							
							
								
								Some improvements to showmood - show relevant skill, cleanup messages  
							
							
							
						 
						
							2012-05-25 21:31:47 -05:00  
				
					
						
							
							
								 
						
							
							
								44c3afc306 
								
							
								 
							
						 
						
							
							
								
								Merge git://github.com/quietust/dfhack  
							
							... 
							
							
							
							Gotta get the changes that prevent DFHack from crashing. 
							
						 
						
							2012-05-24 15:39:11 -04:00  
				
					
						
							
							
								 
						
							
							
								24d221052b 
								
							
								 
							
						 
						
							
							
								
								Initial changes to get dfhack building on the Mac  
							
							
							
						 
						
							2012-05-24 11:31:20 -04:00  
				
					
						
							
							
								 
						
							
							
								ae41ddc04a 
								
							
								 
							
						 
						
							
							
								
								Don't crash if world is undefined  
							
							
							
						 
						
							2012-05-23 13:43:41 -05:00  
				
					
						
							
							
								 
						
							
							
								9a73ea9f14 
								
							
								 
							
						 
						
							
							
								
								Cleanup World module to use df::global, and fix crashes when control_mode/game_mode are missing  
							
							
							
						 
						
							2012-05-23 12:51:03 -05:00  
				
					
						
							
							
								 
						
							
							
								705b60ca27 
								
							
								 
							
						 
						
							
							
								
								Fixed BrewDrink products counting  
							
							
							
						 
						
							2012-05-22 19:22:36 +04:00  
				
					
						
							
							
								 
						
							
							
								65349039f0 
								
							
								 
							
						 
						
							
							
								
								Fix workflow bug: properly deduce the output material of BrewDrink jobs.  
							
							
							
						 
						
							2012-05-22 17:50:48 +04:00  
				
					
						
							
							
								 
						
							
							
								81022451c2 
								
							
								 
							
						 
						
							
							
								
								Support sorting items in stocks, and correct unit sorting in joblist.  
							
							
							
						 
						
							2012-05-21 22:29:03 +04:00  
				
					
						
							
							
								 
						
							
							
								8ef1423ee7 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-20 23:01:44 +02:00  
				
					
						
							
							
								 
						
							
							
								8ff4f1a78e 
								
							
								 
							
						 
						
							
							
								
								Disable ruby plugin by default.  
							
							
							
						 
						
							2012-05-20 22:58:02 +02:00  
				
					
						
							
							
								 
						
							
							
								b992b04f0b 
								
							
								 
							
						 
						
							
							
								
								Remove stuff that shouldn't be in the core, and expose to lua what's left.  
							
							... 
							
							
							
							Specifically, any "if (verbose) { Core::printerr("blah") }" kind
of stuff definitely doesn't belong in the common API functions.
Also, ref->getUnit() is very expensive.
On the other hand, checks for crash-inducing conflicts with the
ui should be in the core api, and not in client plugins. 
							
						 
						
							2012-05-20 21:57:45 +04:00  
				
					
						
							
							
								 
						
							
							
								489f22e550 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'ruby' of  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-05-20 17:37:13 +02:00  
				
					
						
							
							
								 
						
							
							
								3fa155e8e6 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/angavrilov/dfhack  
							
							
							
						 
						
							2012-05-20 17:33:09 +02:00  
				
					
						
							
							
								 
						
							
							
								d28d240dbd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'kmartin/master'  
							
							
							
						 
						
							2012-05-20 11:03:41 +04:00  
				
					
						
							
							
								 
						
							
							
								51f06c78fc 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/playfordh/dfhack  
							
							... 
							
							
							
							Conflicts:
	library/include/modules/Items.h
	library/modules/Items.cpp 
							
						 
						
							2012-05-19 19:09:13 +02:00  
				
					
						
							
							
								 
						
							
							
								b8ce3b45e1 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jaxad0127/dfhack  
							
							
							
						 
						
							2012-05-19 18:37:02 +02:00  
				
					
						
							
							
								 
						
							
							
								d0de575a2b 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/jjyg/dfhack  
							
							
							
						 
						
							2012-05-19 18:27:57 +02:00  
				
					
						
							
							
								 
						
							
							
								7774f5f2c1 
								
							
								 
							
						 
						
							
							
								
								Add a mechanism converting ui focus to a string representation.  
							
							... 
							
							
							
							The idea is to make ui handling more modular, dispensing with
huge functions that switch or if/else on lots of variables.
For now, used to split up functions in the sort plugin. 
							
						 
						
							2012-05-19 19:50:36 +04:00  
				
					
						
							
							
								 
						
							
							
								b851ee2d22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of git://github.com/peterix/dfhack  
							
							
							
						 
						
							2012-05-19 12:53:23 +02:00  
				
					
						
							
							
								 
						
							
							
								e2f39368b1 
								
							
								 
							
						 
						
							
							
								
								Sync submodules  
							
							
							
						 
						
							2012-05-18 17:43:22 +02:00  
				
					
						
							
							
								 
						
							
							
								4aa6dbdd00 
								
							
								 
							
						 
						
							
							
								
								Support sorting items in the trade screens.  
							
							... 
							
							
							
							Caveat: sorts items in containers independently from the container. 
							
						 
						
							2012-05-18 19:18:49 +04:00  
				
					
						
							
							
								 
						
							
							
								e77c9dc730 
								
							
								 
							
						 
						
							
							
								
								Add new PUSH_HAUL_VEHICLES labor to autolabor.  
							
							... 
							
							
							
							This commit will only work with 0.34.08 (or later). 
							
						 
						
							2012-05-15 13:42:48 -05:00