af34b5d614 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'bseiller/ea_improve_survey_performance_keep_mlts_on_heap' into develop  
							
							
							
						 
						
							2021-02-23 00:22:22 -05:00  
				
					
						
							
							
								 
						
							
							
								bf56ac1af9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_deprecate_fortplan' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-02-20 00:54:18 -05:00  
				
					
						
							
							
								 
						
							
							
								1be75f269b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_dreamfort' into develop  
							
							... 
							
							
							
							+typo fix in quickfort-alias-guide.rst 
							
						 
						
							2021-02-20 00:47:59 -05:00  
				
					
						
							
							
								 
						
							
							
								cc51835660 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_stockpile_containers_docs' into develop  
							
							
							
						 
						
							2021-02-20 00:38:34 -05:00  
				
					
						
							
							
								 
						
							
							
								3278519c98 
								
									
								
							
								 
							
						 
						
							
							
								
								document how to specify containers for stockpiles  
							
							... 
							
							
							
							that are not specified with expansion syntax 
							
						 
						
							2021-02-19 11:43:10 -08:00  
				
					
						
							
							
								 
						
							
							
								b3666da0a6 
								
									
								
							
								 
							
						 
						
							
							
								
								fix wheelbarrow UI change attribution  
							
							
							
						 
						
							2021-02-18 23:11:09 -08:00  
				
					
						
							
							
								 
						
							
							
								e9afbd328e 
								
									
								
							
								 
							
						 
						
							
							
								
								Add some more client libraries to docs  
							
							
							
						 
						
							2021-02-15 21:44:35 -05:00  
				
					
						
							
							
								 
						
							
							
								09f0607db2 
								
									
								
							
								 
							
						 
						
							
							
								
								add deprecation warnings to fortplan  
							
							
							
						 
						
							2021-02-13 11:07:14 -08:00  
				
					
						
							
							
								 
						
							
							
								4790e23a5c 
								
									
								
							
								 
							
						 
						
							
							
								
								add more docs for quickfort orders  
							
							
							
						 
						
							2021-02-13 07:46:45 -08:00  
				
					
						
							
							
								 
						
							
							
								e87f27e1fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into myk_stockpile_containers_docs  
							
							
							
						 
						
							2021-02-13 07:17:15 -08:00  
				
					
						
							
							
								 
						
							
							
								81d0a276b2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into myk_dreamfort  
							
							
							
						 
						
							2021-02-13 07:15:11 -08:00  
				
					
						
							
							
								 
						
							
							
								49b6e814db 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump to beta1, update submodules  
							
							
							
						 
						
							2021-02-10 21:08:45 -05:00  
				
					
						
							
							
								 
						
							
							
								ebbbfc0f8e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_orders_crash' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-02-10 00:10:53 -05:00  
				
					
						
							
							
								 
						
							
							
								efe62b412c 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2021-02-09 08:48:43 +01:00  
				
					
						
							
							
								 
						
							
							
								13fae4628b 
								
									
								
							
								 
							
						 
						
							
							
								
								add docs for #place-generated manager orders  
							
							
							
						 
						
							2021-02-05 17:05:34 -08:00  
				
					
						
							
							
								 
						
							
							
								330bde7660 
								
									
								
							
								 
							
						 
						
							
							
								
								add heavy feeder piles  
							
							... 
							
							
							
							and other minor fixes found during playtesting
refine the embark profile suggestions 
							
						 
						
							2021-02-04 23:01:12 -08:00  
				
					
						
							
							
								 
						
							
							
								6c6a9968ff 
								
									
								
							
								 
							
						 
						
							
							
								
								hauling aliases can take from multile stockpiles  
							
							
							
						 
						
							2021-02-03 13:51:02 -08:00  
				
					
						
							
							
								 
						
							
							
								1063497828 
								
									
								
							
								 
							
						 
						
							
							
								
								don't crash on malformed orders json  
							
							
							
						 
						
							2021-02-02 10:50:21 -08:00  
				
					
						
							
							
								 
						
							
							
								76c9d7a678 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							... 
							
							
							
							- changelog.txt: changed description of fix to be more concise
Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com> 
							
						 
						
							2021-02-02 00:32:30 +01:00  
				
					
						
							
							
								 
						
							
							
								84151ccbf9 
								
							
								 
							
						 
						
							
							
								
								Update changelog  
							
							... 
							
							
							
							- changelog.txt: added entry for bug fix 
							
						 
						
							2021-02-01 23:52:51 +01:00  
				
					
						
							
							
								 
						
							
							
								824beb0253 
								
									
								
							
								 
							
						 
						
							
							
								
								documentation for bin/barrel/wb feature  
							
							
							
						 
						
							2021-02-01 02:22:04 -08:00  
				
					
						
							
							
								 
						
							
							
								4c7e25739f 
								
									
								
							
								 
							
						 
						
							
							
								
								more dreamfort refinements (details on forum)  
							
							
							
						 
						
							2021-01-31 19:36:05 -08:00  
				
					
						
							
							
								 
						
							
							
								94a46a66c6 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-01-31 08:38:50 -08:00  
				
					
						
							
							
								 
						
							
							
								fb143516cd 
								
									
								
							
								 
							
						 
						
							
							
								
								refresh the dreamfort case study  
							
							
							
						 
						
							2021-01-30 19:32:41 -08:00  
				
					
						
							
							
								 
						
							
							
								0c165e020c 
								
									
								
							
								 
							
						 
						
							
							
								
								fix formatting error  
							
							
							
						 
						
							2021-01-30 18:47:34 -08:00  
				
					
						
							
							
								 
						
							
							
								32d4eb001a 
								
									
								
							
								 
							
						 
						
							
							
								
								update dreamfort case study according to changes  
							
							
							
						 
						
							2021-01-30 18:43:39 -08:00  
				
					
						
							
							
								 
						
							
							
								d2f3ec6076 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump to 0.47.04-r5, adjust changelog  
							
							
							
						 
						
							2021-01-30 21:23:44 -05:00  
				
					
						
							
							
								 
						
							
							
								9c65c1f7c7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_stockpiles_stockflow_conflict' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-01-30 21:11:58 -05:00  
				
					
						
							
							
								 
						
							
							
								472f19e82a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_alias_fix' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-01-30 20:58:36 -05:00  
				
					
						
							
							
								 
						
							
							
								7e12f3fd3d 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix off-by-one, adjust changelog, move scroll keys to consistent place  
							
							... 
							
							
							
							Ref #1748  
							
						 
						
							2021-01-30 19:40:15 -05:00  
				
					
						
							
							
								 
						
							
							
								8967e98a33 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop  
							
							
							
						 
						
							2021-01-30 19:33:04 -05:00  
				
					
						
							
							
								 
						
							
							
								6c379752fe 
								
									
								
							
								 
							
						 
						
							
							
								
								Update changelog, authors  
							
							... 
							
							
							
							Ref #1752 , #1753  
							
						 
						
							2021-01-30 18:11:39 -05:00  
				
					
						
							
							
								 
						
							
							
								62870e9aee 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove extra log statement, reorder changelog  
							
							... 
							
							
							
							ref #1753  
							
						 
						
							2021-01-30 18:08:17 -05:00  
				
					
						
							
							
								 
						
							
							
								9d0eacadbf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'Moth-Tolias/seedwatch' into develop  
							
							
							
						 
						
							2021-01-30 17:56:16 -05:00  
				
					
						
							
							
								 
						
							
							
								8e53fb450c 
								
									
								
							
								 
							
						 
						
							
							
								
								use normal title replacement for search-plugin  
							
							
							
						 
						
							2021-01-30 00:56:36 -08:00  
				
					
						
							
							
								 
						
							
							
								c6da99e5ce 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_stockflow_steals_input' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-01-30 01:59:44 -05:00  
				
					
						
							
							
								 
						
							
							
								6db851a2ad 
								
									
								
							
								 
							
						 
						
							
							
								
								Update changelog ( #1717 )  
							
							
							
						 
						
							2021-01-29 20:32:33 -05:00  
				
					
						
							
							
								 
						
							
							
								4126585573 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'lethosor/lua-runcommand' into develop  
							
							
							
						 
						
							2021-01-29 20:27:38 -05:00  
				
					
						
							
							
								 
						
							
							
								845993ba59 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'lethosor/fix-k-search-crash' into develop  
							
							
							
						 
						
							2021-01-29 20:08:08 -05:00  
				
					
						
							
							
								 
						
							
							
								4bad609e33 
								
									
								
							
								 
							
						 
						
							
							
								
								use the search plugin for tallow aliases  
							
							... 
							
							
							
							and document the dependency 
							
						 
						
							2021-01-29 12:20:25 -08:00  
				
					
						
							
							
								 
						
							
							
								545fcf6745 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into seedwatch  
							
							
							
						 
						
							2021-01-29 11:34:57 +00:00  
				
					
						
							
							
								 
						
							
							
								5c14f619c8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_buildingplan_enable_all' into develop  
							
							
							
						 
						
							2021-01-29 00:59:33 -05:00  
				
					
						
							
							
								 
						
							
							
								7f62c12a83 
								
									
								
							
								 
							
						 
						
							
							
								
								document all_enabled setting  
							
							
							
						 
						
							2021-01-28 21:50:43 -08:00  
				
					
						
							
							
								 
						
							
							
								865484f678 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into fix-k-search-crash  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-01-29 00:16:13 -05:00  
				
					
						
							
							
								 
						
							
							
								de6f9183fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix changelog, replace a couple qerror calls with error  
							
							... 
							
							
							
							Ref #1746  
							
						 
						
							2021-01-29 00:04:10 -05:00  
				
					
						
							
							
								 
						
							
							
								d4aef78b26 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_getopt' into develop  
							
							
							
						 
						
							2021-01-28 23:58:45 -05:00  
				
					
						
							
							
								 
						
							
							
								8a728c5170 
								
									
								
							
								 
							
						 
						
							
							
								
								fix tallow alias  
							
							
							
						 
						
							2021-01-28 12:17:26 -08:00  
				
					
						
							
							
								 
						
							
							
								aeb911878b 
								
									
								
							
								 
							
						 
						
							
							
								
								document new aliases  
							
							
							
						 
						
							2021-01-27 14:57:03 -08:00  
				
					
						
							
							
								 
						
							
							
								42ae0727fe 
								
									
								
							
								 
							
						 
						
							
							
								
								resolve hotkey help text conflict  
							
							... 
							
							
							
							between stockflow and stockpiles
I removed stockpiles's dynamic placement code as well. it attempted to
move the hotkey help text down if it covered any stockpile links, but
this will no longer work since other hotkey text already takes up all
the lines below stockpiles' hotkey text. 
							
						 
						
							2021-01-27 08:37:12 -08:00  
				
					
						
							
							
								 
						
							
							
								ff69665815 
								
									
								
							
								 
							
						 
						
							
							
								
								keep stockflow from stealing input during rename  
							
							
							
						 
						
							2021-01-27 08:25:21 -08:00