0000000000000000000000000000000000000000 99141e8b43d821c4a297385c849f77195a3402fc Rando Wiltschek <randomw@gmx.net> 1483178614 +0100	branch: Created from 99141e8b43d821c4a297385c849f77195a3402fc
99141e8b43d821c4a297385c849f77195a3402fc eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 Rando Wiltschek <randomw@gmx.net> 1483178800 +0100	merge A15: Fast-forward
eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 778af3ffff2ff80d1d03a526b41f2d2f776817a8 Rando Wiltschek <randomw@gmx.net> 1483178843 +0100	commit: Updated version
778af3ffff2ff80d1d03a526b41f2d2f776817a8 6f56084242b2aee3a117aef1ceb46a8d6e74296e Rando Wiltschek <randomw@gmx.net> 1483185583 +0100	commit: Fixed obvious compiler errors
6f56084242b2aee3a117aef1ceb46a8d6e74296e 4054dd08546c0337a95900d7a6714f78037f0014 Rando Wiltschek <randomw@gmx.net> 1483284270 +0100	pull --no-commit origin A16: Fast-forward
4054dd08546c0337a95900d7a6714f78037f0014 bdc4b5790f05893fd117d8fad23dc88ddb584bc9 Rando Wiltschek <randomw@gmx.net> 1483285147 +0100	commit: Fixed guest bed def
bdc4b5790f05893fd117d8fad23dc88ddb584bc9 577072b4b192ce876c41be62bde9db2e5a55673d Rando Wiltschek <randomw@gmx.net> 1483285298 +0100	commit: Fixed CanIngestForJoy method
577072b4b192ce876c41be62bde9db2e5a55673d 282f4b464523498437bd19a0a120dbe63186ed1f Rando Wiltschek <randomw@gmx.net> 1483285340 +0100	commit: Removed CanIngestForJoy, now redundant (used to be fix for vanilla bug)
282f4b464523498437bd19a0a120dbe63186ed1f 61d0bd97fe3290a4ab82a1a124306a04c7aa8560 Rando Wiltschek <randomw@gmx.net> 1483285709 +0100	commit (amend): Removed CanIngestForJoy, now redundant (used to be fix for vanilla bug)
61d0bd97fe3290a4ab82a1a124306a04c7aa8560 49cacd808aad3ee71f51b5fc081db3b132f44849 Rando Wiltschek <randomw@gmx.net> 1483285735 +0100	commit: Fixed VisitorGroup incident df
49cacd808aad3ee71f51b5fc081db3b132f44849 a51ce63ac0e8f07f35ebbea3285b938dd14ec471 Rando Wiltschek <randomw@gmx.net> 1483285743 +0100	commit (amend): Fixed VisitorGroup incident def
a51ce63ac0e8f07f35ebbea3285b938dd14ec471 33b8bc3343b94d5972f0daf1039283d91683ae3b Rando Wiltschek <randomw@gmx.net> 1483285872 +0100	commit: Fixed Refugee chased and WandererJoin incident defs
33b8bc3343b94d5972f0daf1039283d91683ae3b 808dfaf57382ab0a5dcbb6b8bd0903d95e35165c Rando Wiltschek <randomw@gmx.net> 1483286273 +0100	commit: Set BuyFood to a more appropriate joy kind
808dfaf57382ab0a5dcbb6b8bd0903d95e35165c d52ea508a9e0fba2438efc086fdd6c9e9b2a6838 Rando Wiltschek <randomw@gmx.net> 1483286524 +0100	commit: Adapted new naming convention for memory thoughts and moved GuestBedCount thought to appropriate file
d52ea508a9e0fba2438efc086fdd6c9e9b2a6838 2bcf21a11857ff4cac0cf3e4d805805064d31083 Rando Wiltschek <randomw@gmx.net> 1483286532 +0100	commit (amend): Adapted new naming convention for memory thoughts and moved GuestBedCount thought to appropriate file
2bcf21a11857ff4cac0cf3e4d805805064d31083 910b592695f7794dcfba46cf8f0a0abbdad47047 Rando Wiltschek <randomw@gmx.net> 1483286734 +0100	commit: Updated LowExpectations thought to match vanilla
910b592695f7794dcfba46cf8f0a0abbdad47047 a7601bebd256bd3729c15ff26e26097742d3fc7e Rando Wiltschek <randomw@gmx.net> 1483287113 +0100	commit: Rolled back BuyFood joyKind. Has to match the JobGiver, which we can't / won't change.
a7601bebd256bd3729c15ff26e26097742d3fc7e 7b613d894d682de5ec960640ec35a3c1e7c188f9 Rando Wiltschek <randomw@gmx.net> 1483288363 +0100	commit: GetRoom method: because searcher can be null, added Map parameter
7b613d894d682de5ec960640ec35a3c1e7c188f9 487e2c88c65630c0fece40dc5cd2d03ea8fee14e Rando Wiltschek <randomw@gmx.net> 1483289868 +0100	commit: Fixed wanderer being of player's faction
487e2c88c65630c0fece40dc5cd2d03ea8fee14e f377b588361ccd6e975e647e1f1629eb50a5c757 Rando Wiltschek <randomw@gmx.net> 1483294265 +0100	commit: Fixed capitalization of tutor topics
f377b588361ccd6e975e647e1f1629eb50a5c757 c398ea9645c99f03779396eaa6a80eb10101c3e0 Rando Wiltschek <randomw@gmx.net> 1483294293 +0100	commit: Rephrased recruitment chance explanation
c398ea9645c99f03779396eaa6a80eb10101c3e0 769240bfd7bbd134e493513b0ec5859e99d29531 Rando Wiltschek <randomw@gmx.net> 1483294312 +0100	commit: Made guest tab show less information until guests have arrived
769240bfd7bbd134e493513b0ec5859e99d29531 361ae1056190cd9234b43f82a1a6f3eed024e6c7 Rando Wiltschek <randomw@gmx.net> 1483295652 +0100	commit: Added message to guest tab for pawns that are not guests (trading caravans)
361ae1056190cd9234b43f82a1a6f3eed024e6c7 a739a6dccfd40eba54013f079ebd621c97e2c8dc Rando Wiltschek <randomw@gmx.net> 1483296018 +0100	commit: Clarified trust message
a739a6dccfd40eba54013f079ebd621c97e2c8dc 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483296413 +0100	pull --no-commit origin A16: Fast-forward
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 41bd3e491d066eb7b4a3eab6f92d87850b53b874 Rando Wiltschek <randomw@gmx.net> 1483297653 +0100	commit: Removed obsolete license file
