1976288efb 
								
							
								 
							
						 
						
							
							
								
								quickfort user guide doc refresh  
							
							... 
							
							
							
							- add docs for negative expansion syntax
- add information on how negative expansion syntax can be used to
  simplify carved track designations
- full editing pass, fixing grammar, typos, formatting, and clarifying text
- added tip about using dig priorities to ensure miners dig one level at
  a time
- add "Dreamfort organization and packaging" section to the dreamfort
  case study
- add inline screenshots for each dreamfort level in the section that
  discusses that level
- fix Links section to use the actual header text of the target links 
							
						 
						
							2022-03-28 16:00:29 -07:00  
				
					
						
							
							
								 
						
							
							
								f37de835da 
								
							
								 
							
						 
						
							
							
								
								center uncentered image in blueprint library guide  
							
							
							
						 
						
							2022-03-28 16:00:29 -07:00  
				
					
						
							
							
								 
						
							
							
								ab54cbff7a 
								
									
								
							
								 
							
						 
						
							
							
								
								[confirm] Fix typo in help message ( #2046 )  
							
							
							
						 
						
							2022-03-23 19:45:13 -07:00  
				
					
						
							
							
								 
						
							
							
								be32e35642 
								
									
								
							
								 
							
						 
						
							
							
								
								Reword the titles of the various guides ( #2041 )  
							
							... 
							
							
							
							so they are more distinct. even I got confused about the difference
between the quickfort library guide (which is about blueprints, but
listing the pre-made onces) and the
quickfort blueprint guide (which is about blueprints, but editing them) 
							
						 
						
							2022-03-21 12:58:17 -07:00  
				
					
						
							
							
								 
						
							
							
								19c0a4fe06 
								
									
								
							
								 
							
						 
						
							
							
								
								Added (chain) for [CHAIN_METAL_TEXT] armours in library/gui/materials.lua used by the gui/create-item script ( #2037 )  
							
							
							
						 
						
							2022-03-19 15:32:16 -07:00  
				
					
						
							
							
								 
						
							
							
								e1961f5fcd 
								
									
								
							
								 
							
						 
						
							
							
								
								visual studio 2022/2019 build instructions ( #2034 )  
							
							... 
							
							
							
							* visual studio 2022/2019
update instructions to recommend using VS 2022 or VS 2019 with downlevel tool support
* reinsert accidentally deleted line
* fix markup
* notes on abi compatibility, changelog 
							
						 
						
							2022-03-17 13:19:12 -07:00  
				
					
						
							
							
								 
						
							
							
								ce30843b92 
								
									
								
							
								 
							
						 
						
							
							
								
								update Windows build docs for Visual C++ 2015 ( #2032 )  
							
							... 
							
							
							
							* update Windows build docs for Visual C++ 2015
* fixed doc errors / moved changelog entry to future section 
							
						 
						
							2022-03-16 13:10:00 -07:00  
				
					
						
							
							
								 
						
							
							
								07e96a6a1c 
								
							
								 
							
						 
						
							
							
								
								Update changelog.txt  
							
							
							
						 
						
							2022-03-15 08:23:18 -07:00  
				
					
						
							
							
								 
						
							
							
								dda487a535 
								
									
								
							
								 
							
						 
						
							
							
								
								Adds new plugin: Spectate ( #1918 )  
							
							... 
							
							
							
							* Adds spectate plugin
* Updates spectate.cpp
* Changes spectate toggle message
* Updates changelog.txt
* Adds spectate to Plugins.rst
* Adds requested changes
- foreach syntax replaces active units loops
- removes CR_FAILURE return on double enable/disable usage
- removes disabled code
- implements a few clion clang tidy suggestions (auto declare when casting)
- Updates zcount to have accurate count for performing RNG
- adds eof newline
- adds todo comment about a redundant if condition
* Declares spectate section in Plugins.rst 
							
						 
						
							2022-03-14 19:33:41 -07:00  
				
					
						
							
							
								 
						
							
							
								88b403ec7a 
								
									
								
							
								 
							
						 
						
							
							
								
								Add functions reverse-engineered from ambushing unit code ( #1992 )  
							
							... 
							
							
							
							* Add functions reverse-engineered from ambushing unit code
* Fix whitespace
* Fix debug_showambush check
* Remove getOuterContainerRef from Lua API
Don't think this works properly without allocating a new specific_ref. More trouble that it's worth.
* Fixed tile visibility check
* I don't think gamemode or gametype are ever NULL
* Minor tweaks to documentation
* Reimplement getOuterContainerRef for Lua; fix some comments
* Update Units.cpp and changelog
* Update Units.cpp
* Update changelog.txt 
							
						 
						
							2022-03-13 17:19:35 -07:00  
				
					
						
							
							
								 
						
							
							
								d2d01843a2 
								
							
								 
							
						 
						
							
							
								
								Update changelog.txt  
							
							... 
							
							
							
							update changelog for changes to Job::remove_postings 
							
						 
						
							2022-03-12 15:37:33 -08:00  
				
					
						
							
							
								 
						
							
							
								89a3ca8ee9 
								
							
								 
							
						 
						
							
							
								
								update docs and changelog  
							
							
							
						 
						
							2022-03-12 13:45:32 -08:00  
				
					
						
							
							
								 
						
							
							
								25d37143e4 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-03-12 13:33:36 -08:00  
				
					
						
							
							
								 
						
							
							
								82910015c1 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-03-12 12:41:19 -08:00  
				
					
						
							
							
								 
						
							
							
								9f8a477f09 
								
									
								
							
								 
							
						 
						
							
							
								
								move EventManager changelog entries to 'Future'  
							
							... 
							
							
							
							ref: #1876  
							
						 
						
							2022-03-12 11:38:43 -08:00  
				
					
						
							
							
								 
						
							
							
								28ebc3921d 
								
							
								 
							
						 
						
							
							
								
								Revises changelog  
							
							
							
						 
						
							2022-03-12 11:33:27 -08:00  
				
					
						
							
							
								 
						
							
							
								0cb6e18e16 
								
							
								 
							
						 
						
							
							
								
								Adds changelog entries for PR  #1876  
							
							
							
						 
						
							2022-03-12 11:33:27 -08:00  
				
					
						
							
							
								 
						
							
							
								2c3f573610 
								
									
								
							
								 
							
						 
						
							
							
								
								really fix the docs typo  
							
							
							
						 
						
							2022-03-10 20:03:37 -08:00  
				
					
						
							
							
								 
						
							
							
								a1e3f2dbe1 
								
									
								
							
								 
							
						 
						
							
							
								
								fix typo in docs  
							
							
							
						 
						
							2022-03-10 18:31:16 -08:00  
				
					
						
							
							
								 
						
							
							
								858d459232 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog for clsocket PR#20  
							
							
							
						 
						
							2022-03-10 14:07:48 -08:00  
				
					
						
							
							
								 
						
							
							
								cf54b84fd6 
								
							
								 
							
						 
						
							
							
								
								Bump to 0.47.05-r4  
							
							
							
						 
						
							2022-03-09 14:27:20 -08:00  
				
					
						
							
							
								 
						
							
							
								7aaccb781e 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-03-03 21:37:38 -08:00  
				
					
						
							
							
								 
						
							
							
								c752fa07a8 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-03-01 05:44:36 -08:00  
				
					
						
							
							
								 
						
							
							
								4d47bf54ce 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-26 15:32:25 -08:00  
				
					
						
							
							
								 
						
							
							
								41ea2527eb 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-26 14:54:42 -08:00  
				
					
						
							
							
								 
						
							
							
								17f400d091 
								
							
								 
							
						 
						
							
							
								
								add light aquifer tap library blueprint and docs  
							
							
							
						 
						
							2022-02-26 14:54:42 -08:00  
				
					
						
							
							
								 
						
							
							
								0362c09811 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-25 12:59:38 -08:00  
				
					
						
							
							
								 
						
							
							
								5937e55cfd 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-25 12:58:56 -08:00  
				
					
						
							
							
								 
						
							
							
								1d6b942293 
								
							
								 
							
						 
						
							
							
								
								update wording in changelog  
							
							
							
						 
						
							2022-02-25 12:57:17 -08:00  
				
					
						
							
							
								 
						
							
							
								2d561ad73d 
								
							
								 
							
						 
						
							
							
								
								move fortplan docs to Removed.rst  
							
							
							
						 
						
							2022-02-25 12:57:17 -08:00  
				
					
						
							
							
								 
						
							
							
								e458e74058 
								
							
								 
							
						 
						
							
							
								
								use correct header in changelog  
							
							
							
						 
						
							2022-02-25 12:57:17 -08:00  
				
					
						
							
							
								 
						
							
							
								6b0f2eace9 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-25 12:57:17 -08:00  
				
					
						
							
							
								 
						
							
							
								eae90c9448 
								
							
								 
							
						 
						
							
							
								
								remove fortplan code; leave doc stub  
							
							
							
						 
						
							2022-02-25 12:57:17 -08:00  
				
					
						
							
							
								 
						
							
							
								91b55a648b 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-19 17:54:01 -08:00  
				
					
						
							
							
								 
						
							
							
								56e8de592c 
								
							
								 
							
						 
						
							
							
								
								simplify dreamfort with new quickfort features  
							
							... 
							
							
							
							also:
- add in iron and flux indicators on the industry level
- fix out of date docs for professions 
							
						 
						
							2022-02-19 17:54:01 -08:00  
				
					
						
							
							
								 
						
							
							
								3dcc6fd899 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2022-02-18 15:47:33 -08:00  
				
					
						
							
							
								 
						
							
							
								89038ffafa 
								
							
								 
							
						 
						
							
							
								
								add pump stack blueprint to the libarary, add docs  
							
							
							
						 
						
							2022-02-18 15:47:33 -08:00  
				
					
						
							
							
								 
						
							
							
								0303e182a8 
								
							
								 
							
						 
						
							
							
								
								fix typo in shift syntax, explain why +y is down  
							
							
							
						 
						
							2022-02-18 14:54:45 -08:00  
				
					
						
							
							
								 
						
							
							
								f2865beb57 
								
							
								 
							
						 
						
							
							
								
								add docs for blueprint shifting and transformation  
							
							
							
						 
						
							2022-02-18 14:54:45 -08:00  
				
					
						
							
							
								 
						
							
							
								10d5f23400 
								
							
								 
							
						 
						
							
							
								
								add documentation for repeat() meta markers  
							
							... 
							
							
							
							and some overall editing updates (sorry for the clutter!) 
							
						 
						
							2022-02-12 18:28:47 -08:00  
				
					
						
							
							
								 
						
							
							
								e0ea113d88 
								
							
								 
							
						 
						
							
							
								
								add docs for extended syntax for z-level changes  
							
							... 
							
							
							
							in quickfort blueprints 
							
						 
						
							2022-02-06 16:56:07 -08:00  
				
					
						
							
							
								 
						
							
							
								bc042bc7df 
								
									
								
							
								 
							
						 
						
							
							
								
								Use copyall instead of nesting pos2xyz and xyz2pos  
							
							
							
						 
						
							2021-12-18 02:05:16 -08:00  
				
					
						
							
							
								 
						
							
							
								5d6f88fa72 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-04 15:32:26 -07:00  
				
					
						
							
							
								 
						
							
							
								dadb053d5f 
								
							
								 
							
						 
						
							
							
								
								fix typo in hostpital supply config  
							
							... 
							
							
							
							powder -> plaster 
							
						 
						
							2021-10-04 15:32:26 -07:00  
				
					
						
							
							
								 
						
							
							
								86cd723162 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-04 12:53:31 -07:00  
				
					
						
							
							
								 
						
							
							
								c292b14b3e 
								
							
								 
							
						 
						
							
							
								
								add documentation for quickfort single-tile tracks  
							
							
							
						 
						
							2021-10-04 11:02:18 -07:00  
				
					
						
							
							
								 
						
							
							
								8245db8862 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-03 08:54:27 -07:00  
				
					
						
							
							
								 
						
							
							
								438f030221 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-02 23:36:26 -07:00  
				
					
						
							
							
								 
						
							
							
								d013b336ba 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-02 12:50:47 -07:00  
				
					
						
							
							
								 
						
							
							
								06916280f4 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-02 09:26:32 -07:00  
				
					
						
							
							
								 
						
							
							
								850da0b5e4 
								
							
								 
							
						 
						
							
							
								
								move changelog entries to correct version  
							
							
							
						 
						
							2021-10-02 09:25:19 -07:00  
				
					
						
							
							
								 
						
							
							
								e3f723c6a2 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-10-02 09:25:19 -07:00  
				
					
						
							
							
								 
						
							
							
								3c91f55612 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-25 22:00:49 -07:00  
				
					
						
							
							
								 
						
							
							
								50a16ac147 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-22 10:30:41 -07:00  
				
					
						
							
							
								 
						
							
							
								e6d93f4170 
								
							
								 
							
						 
						
							
							
								
								update docs for example orders and professions  
							
							
							
						 
						
							2021-09-22 10:30:41 -07:00  
				
					
						
							
							
								 
						
							
							
								e328609ac4 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-20 16:10:15 -07:00  
				
					
						
							
							
								 
						
							
							
								596f72f06b 
								
							
								 
							
						 
						
							
							
								
								implement --playback-start param and logic  
							
							
							
						 
						
							2021-09-20 16:10:15 -07:00  
				
					
						
							
							
								 
						
							
							
								53c1582080 
								
							
								 
							
						 
						
							
							
								
								update library guide  
							
							
							
						 
						
							2021-09-20 13:01:07 -07:00  
				
					
						
							
							
								 
						
							
							
								d5a9a9534e 
								
							
								 
							
						 
						
							
							
								
								dreamfort improvements  
							
							... 
							
							
							
							- shift seventh dwarf from craftsdwarf to farmer
- give starting miners some skill in engraving to make smoothing the
  cistern go faster
- update embark suggestions and sample profile accordingly
- widen clearcutting area for surface fort so trees don't overhang the
  roof
- move wax from the cookables stockpile to the industry goods pile
- move coins from goods to metal
- move sheets from goods to textiles 
							
						 
						
							2021-09-20 13:01:07 -07:00  
				
					
						
							
							
								 
						
							
							
								413917e9c6 
								
							
								 
							
						 
						
							
							
								
								update docs  
							
							
							
						 
						
							2021-09-17 10:57:26 -07:00  
				
					
						
							
							
								 
						
							
							
								0410aaeaf0 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-10 11:11:44 -07:00  
				
					
						
							
							
								 
						
							
							
								0747f872b0 
								
							
								 
							
						 
						
							
							
								
								add --splitby param to blueprint  
							
							... 
							
							
							
							--splitby=none is the new default, allowing all blueprint phases to be
written to a single file. old behavior of one phase per file is
supported via --splitby=phase. 
							
						 
						
							2021-09-09 09:58:53 -07:00  
				
					
						
							
							
								 
						
							
							
								3d1e3f0832 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-09 09:58:53 -07:00  
				
					
						
							
							
								 
						
							
							
								9cdf3d9605 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-09 09:58:23 -07:00  
				
					
						
							
							
								 
						
							
							
								8c0fccb406 
								
							
								 
							
						 
						
							
							
								
								update changlog  
							
							
							
						 
						
							2021-09-09 00:35:15 -07:00  
				
					
						
							
							
								 
						
							
							
								a083a7f670 
								
									
								
							
								 
							
						 
						
							
							
								
								tailor: fix operator precedence in command parsing  
							
							... 
							
							
							
							&& has a higher precendence than ||, so this could have resulted in a crash in
some cases. It also produced unintentional behavior where e.g. `tailor 1 foo`
would enable the plugin, unlike `tailor enable foo`.
From #1920  
							
						 
						
							2021-09-06 22:35:38 -04:00  
				
					
						
							
							
								 
						
							
							
								4a593a489c 
								
							
								 
							
						 
						
							
							
								
								add reference to dffd file in dreamfort help  
							
							
							
						 
						
							2021-09-05 23:54:48 -07:00  
				
					
						
							
							
								 
						
							
							
								695106afae 
								
							
								 
							
						 
						
							
							
								
								add a link to the fully built dreamfort on dffd  
							
							
							
						 
						
							2021-09-05 23:54:48 -07:00  
				
					
						
							
							
								 
						
							
							
								1295633722 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump to 0.47.05-r3  
							
							
							
						 
						
							2021-09-04 14:00:31 -04:00  
				
					
						
							
							
								 
						
							
							
								f8d041b9aa 
								
							
								 
							
						 
						
							
							
								
								dreamfort and supporting files update  
							
							... 
							
							
							
							- merge otherstock into basic (safe now that we have orders sort)
- don't overproduce weapons and armor
- update dreamfort help and examples guide 
							
						 
						
							2021-09-03 00:31:42 -07:00  
				
					
						
							
							
								 
						
							
							
								7c572ceec3 
								
									
								
							
								 
							
						 
						
							
							
								
								Make changelog "invalid line" errors include filename and location  
							
							... 
							
							
							
							e.g. for merge conflicts 
							
						 
						
							2021-09-01 23:35:57 -04:00  
				
					
						
							
							
								 
						
							
							
								0d14a2ccef 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'ab9rf/tailor-v2' into develop  
							
							... 
							
							
							
							Conflicts: docs/changelog.txt 
							
						 
						
							2021-09-01 23:34:30 -04:00  
				
					
						
							
							
								 
						
							
							
								2249b42506 
								
									
								
							
								 
							
						 
						
							
							
								
								update examples docs  
							
							
							
						 
						
							2021-09-01 13:06:07 -07:00  
				
					
						
							
							
								 
						
							
							
								f21ba5c8aa 
								
									
								
							
								 
							
						 
						
							
							
								
								implement orders sort, document, and add to init  
							
							
							
						 
						
							2021-09-01 13:04:23 -07:00  
				
					
						
							
							
								 
						
							
							
								42d3620ef6 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-09-01 13:04:13 -07:00  
				
					
						
							
							
								 
						
							
							
								b1632c0413 
								
							
								 
							
						 
						
							
							
								
								alphabetize professions list; add Migrant  
							
							
							
						 
						
							2021-08-30 23:52:52 -07:00  
				
					
						
							
							
								 
						
							
							
								3a8f815f98 
								
							
								 
							
						 
						
							
							
								
								fix doc link typo  
							
							
							
						 
						
							2021-08-30 23:10:28 -07:00  
				
					
						
							
							
								 
						
							
							
								62bbfb1296 
								
							
								 
							
						 
						
							
							
								
								update examples documentation  
							
							
							
						 
						
							2021-08-30 23:10:28 -07:00  
				
					
						
							
							
								 
						
							
							
								65e5b89d4c 
								
							
								 
							
						 
						
							
							
								
								add goblet-related aliases  
							
							
							
						 
						
							2021-08-30 23:10:28 -07:00  
				
					
						
							
							
								 
						
							
							
								c25d50217c 
								
							
								 
							
						 
						
							
							
								
								fix doc typo  
							
							
							
						 
						
							2021-08-30 23:10:28 -07:00  
				
					
						
							
							
								 
						
							
							
								4b9df5c2db 
								
							
								 
							
						 
						
							
							
								
								minor adjustments to professions; more to come  
							
							
							
						 
						
							2021-08-30 23:10:28 -07:00  
				
					
						
							
							
								 
						
							
							
								687b84378d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'ab9rf/autofarm-berry-fix' into develop  
							
							
							
						 
						
							2021-08-31 00:52:18 -04:00  
				
					
						
							
							
								 
						
							
							
								dc86460238 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix dashes in changelog  
							
							
							
						 
						
							2021-08-31 00:28:04 -04:00  
				
					
						
							
							
								 
						
							
							
								e5ca5e48e9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'lethosor/fix-compile-macos-m1-gcc' into develop  
							
							
							
						 
						
							2021-08-28 17:05:51 -04:00  
				
					
						
							
							
								 
						
							
							
								10db894d99 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_printall_nontable' into develop  
							
							
							
						 
						
							2021-08-21 22:51:35 -04:00  
				
					
						
							
							
								 
						
							
							
								39c650de13 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix compilation error on macOS with GCC 11  
							
							... 
							
							
							
							This should make `-fpermissive` (from #1924 ) unnecessary, so I also removed
those instructions. 
							
						 
						
							2021-08-21 12:58:17 -04:00  
				
					
						
							
							
								 
						
							
							
								fb2d453b8b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'chrismdp/apple-m1-docs' into develop  
							
							
							
						 
						
							2021-08-21 12:53:57 -04:00  
				
					
						
							
							
								 
						
							
							
								4046e06056 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-19 21:58:26 -07:00  
				
					
						
							
							
								 
						
							
							
								c8d329e334 
								
									
								
							
								 
							
						 
						
							
							
								
								add documentation for examples files  
							
							
							
						 
						
							2021-08-19 21:58:26 -07:00  
				
					
						
							
							
								 
						
							
							
								51cc8df40c 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-19 21:57:14 -07:00  
				
					
						
							
							
								 
						
							
							
								d3fdb5a6e0 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-19 17:44:06 -07:00  
				
					
						
							
							
								 
						
							
							
								6b83a39f52 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'myk002/myk_orders_reactions' into develop  
							
							
							
						 
						
							2021-08-17 00:26:02 -04:00  
				
					
						
							
							
								 
						
							
							
								22bcbf9877 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into autofarm-berry-fix  
							
							
							
						 
						
							2021-08-16 07:22:11 -05:00  
				
					
						
							
							
								 
						
							
							
								92f258bdbf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into tailor-v2  
							
							
							
						 
						
							2021-08-16 07:17:53 -05:00  
				
					
						
							
							
								 
						
							
							
								e1f0e94f0f 
								
							
								 
							
						 
						
							
							
								
								fix changelog  
							
							
							
						 
						
							2021-08-14 21:38:00 -07:00  
				
					
						
							
							
								 
						
							
							
								1e2732aee5 
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-14 21:38:00 -07:00  
				
					
						
							
							
								 
						
							
							
								00adb1b720 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-14 16:36:09 -07:00  
				
					
						
							
							
								 
						
							
							
								2bd43f6e76 
								
									
								
							
								 
							
						 
						
							
							
								
								update changelog  
							
							
							
						 
						
							2021-08-14 16:35:34 -07:00  
				
					
						
							
							
								 
						
							
							
								71ac76761a 
								
									
								
							
								 
							
						 
						
							
							
								
								Add underscores as suggested  
							
							... 
							
							
							
							Co-authored-by: Alan <lethosor@users.noreply.github.com> 
							
						 
						
							2021-08-14 18:15:06 +01:00  
				
					
						
							
							
								 
						
							
							
								77e0938dd1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'ab9rf/autogems-1263' into develop  
							
							... 
							
							
							
							Conflicts:
	docs/changelog.txt 
							
						 
						
							2021-08-12 00:27:26 -04:00