|  lethosor | 815821eb93 | Merge branch 'develop' into cmake-cleanup Conflicts:
	depends/lua/CMakeLists.txt
	plugins/CMakeLists.txt
	plugins/devel/CMakeLists.txt | 2020-01-18 22:28:43 -05:00 | 
				
					
						|  lethosor | 4feb0aa21f | Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop | 2020-01-14 23:41:22 -05:00 | 
				
					
						|  PatrikLundell | 07dedfb333 | Fixed/improved river tile detection | 2019-11-24 21:32:07 +01:00 | 
				
					
						|  lethosor | e7353ba9bf | embark-assistant: clean up "else if" style Ref #1456 | 2019-11-02 22:13:28 -04:00 | 
				
					
						|  lethosor | 267d52bd17 | Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop Closes #1456 | 2019-11-02 22:10:08 -04:00 | 
				
					
						|  PatrikLundell | 7e501fd70b | Fixed bug in region type determination in new code | 2019-10-31 20:07:34 +01:00 | 
				
					
						|  lethosor | f3658db85f | Merge branch 'develop' into avoid_rebuilding_df_statics_if_core_h_changes | 2019-10-03 23:23:36 -04:00 | 
				
					
						|  PatrikLundell | 7979150566 | Removed trailing blank | 2019-09-24 11:14:50 +02:00 | 
				
					
						|  PatrikLundell | 5eceab2794 | Added 'fileresult' optional parameter, improved world traversal | 2019-09-23 13:13:04 +02:00 | 
				
					
						|  lethosor | 7a5902418e | Abbreviate label on narrow screens | 2019-08-25 21:49:41 -04:00 | 
				
					
						|  lethosor | 417212814d | embark-assistant: add in-game key to activate Closes #1384 | 2019-08-25 21:33:43 -04:00 | 
				
					
						|  lethosor | ac5a54c8db | Merge branch 'develop' into cmake-cleanup Conflicts:
	library/CMakeLists.txt
	plugins/CMakeLists.txt | 2019-08-23 23:58:00 -04:00 | 
				
					
						|  lethosor | 0b8eba7d23 | Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop Conflicts:
	docs/changelog.txt | 2019-08-22 21:50:54 -04:00 | 
				
					
						|  lethosor | 88757d5c27 | Merge branch 'develop' into cmake-cleanup | 2019-07-20 19:22:33 -04:00 | 
				
					
						|  lethosor | 99038c395a | Merge remote-tracking branch 'ab9rf/biometype' into develop | 2019-07-20 16:32:46 -04:00 | 
				
					
						|  lethosor | 76da2c2aaf | Clean up CMakeLists.txt style | 2019-07-16 22:19:11 -04:00 | 
				
					
						|  PatrikLundell | af26f7dc6e | Added intrusion calculations for world edges | 2019-07-14 16:11:51 +02:00 | 
				
					
						|  PatrikLundell | 6f5abc79e9 | Restored install-debug contents and removed offensive white space | 2019-07-12 22:38:12 +02:00 | 
				
					
						|  PatrikLundell | 8248832cbc | Added detection and use of incursions into embark tiles | 2019-07-12 22:09:03 +02:00 | 
				
					
						|  PatrikLundell | 53cf1136fb | Waterfall detection changed | 2019-07-01 13:30:16 +02:00 | 
				
					
						|  PatrikLundell | 134bcf09a9 | Waterfall detection changed. Aquifer display changed | 2019-07-01 13:29:53 +02:00 | 
				
					
						|  PatrikLundell | bcb62697c9 | Waterfall detection changed | 2019-07-01 13:29:19 +02:00 | 
				
					
						|  PatrikLundell | fae5e894ae | Waterfall detection changed | 2019-07-01 13:29:07 +02:00 | 
				
					
						|  PatrikLundell | 242f6fbc38 | Waterfall detection changed | 2019-07-01 13:28:54 +02:00 | 
				
					
						|  PatrikLundell | 092c9f965b | Waterfall detection changed | 2019-07-01 13:28:40 +02:00 | 
				
					
						|  PatrikLundell | 716fe90312 | Modified Flat detection options | 2019-06-23 18:36:18 +02:00 | 
				
					
						|  PatrikLundell | 3139d0d3c7 | Modified Flat detection options | 2019-06-23 18:36:10 +02:00 | 
				
					
						|  PatrikLundell | 8259243d2a | Modified Flat detection options | 2019-06-23 18:35:59 +02:00 | 
				
					
						|  PatrikLundell | 3f7d11d1c7 | Modified Flat detection options | 2019-06-23 18:35:48 +02:00 | 
				
					
						|  PatrikLundell | 3e97643b37 | Modified Flat detection options | 2019-06-23 18:35:28 +02:00 | 
				
					
						|  PatrikLundell | b5e38451de | Modified Flat detection options | 2019-06-23 18:35:11 +02:00 | 
				
					
						|  PatrikLundell | 488f1cd8a1 | Fixed bug causing minerals below magma sea being reported | 2019-06-20 15:50:11 +02:00 | 
				
					
						|  PatrikLundell | f09f3a2d25 | Prettified by adding a blank | 2019-06-06 20:57:21 +02:00 | 
				
					
						|  PatrikLundell | cde8ffd0fd | Fixed materials vector length determination | 2019-06-06 20:56:47 +02:00 | 
				
					
						|  Pauli | f0632347d0 | Remove Core.h include from DataDefs.h Core.h isn't required for DataDefs.h which removes Core.h dependency
from DataStatics*. | 2018-12-30 17:08:42 -05:00 | 
				
					
						|  PatrikLundell | ef57295c02 | Added coal search to embark-assistant | 2018-12-04 14:58:10 +01:00 | 
				
					
						|  PatrikLundell | 0916d69373 | Added coal search to embark-assistant | 2018-12-04 14:57:44 +01:00 | 
				
					
						|  PatrikLundell | 8f9cbfeafd | Added coal search to embark-assistant | 2018-12-04 14:57:23 +01:00 | 
				
					
						|  PatrikLundell | 1ef7f0746c | Added coal search to embark-assistant | 2018-12-04 14:56:55 +01:00 | 
				
					
						|  PatrikLundell | efeb0504cc | Added coal search to embark-assistant | 2018-12-04 14:55:59 +01:00 | 
				
					
						|  PatrikLundell | 5f6376e76e | Added coal search to embark-assistant | 2018-12-04 14:55:16 +01:00 | 
				
					
						|  Kelly Kinkade | 3351d78864 | Change embark-assistant to biome type from Maps See #1392 | 2018-09-11 18:27:44 -05:00 | 
				
					
						|  PatrikLundell | 73e7ffff83 | Made cancel state sensitive | 2018-08-18 18:03:00 +02:00 | 
				
					
						|  PatrikLundell | 2ed6469be8 | Made cancel state sensitive | 2018-08-18 18:02:19 +02:00 | 
				
					
						|  PatrikLundell | c75a4fe8ee | Used taleden's world map size algorithm | 2018-08-06 11:52:22 +02:00 | 
				
					
						|  PatrikLundell | aa6182a1ee | Added embark-assistant world match indication | 2018-08-05 17:28:49 +02:00 | 
				
					
						|  PatrikLundell | 136eb0f03a | Added embark-assistant world match indication | 2018-08-05 17:23:03 +02:00 | 
				
					
						|  PatrikLundell | f7fadaab37 | Added embark-assistant world match indication | 2018-08-05 17:11:47 +02:00 | 
				
					
						|  PatrikLundell | 4c850cabca | Added embark-assistant world match indication | 2018-08-05 17:11:39 +02:00 | 
				
					
						|  PatrikLundell | 70630cfd92 | Added embark-assistant world match indication | 2018-08-05 17:11:26 +02:00 |