0000000000000000000000000000000000000000 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483296665 +0100	branch: Created from master
059ec54d51d7554ef497a9e64ae272a571e1f9e7 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483296899 +0100	merge A16: Fast-forward
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 41bd3e491d066eb7b4a3eab6f92d87850b53b874 Rando Wiltschek <randomw@gmx.net> 1483297757 +0100	merge A16: Fast-forward
41bd3e491d066eb7b4a3eab6f92d87850b53b874 44899e6388f02ba10031d8d83fe1d49a6172e12d Rando Wiltschek <randomw@gmx.net> 1483351501 +0100	merge origin/master: Merge made by the 'recursive' strategy.
44899e6388f02ba10031d8d83fe1d49a6172e12d c1d3f4813d8106a1174f27686f6689dfb717ec13 Rando Wiltschek <randomw@gmx.net> 1483352225 +0100	commit: BuyItem: Cleanup
c1d3f4813d8106a1174f27686f6689dfb717ec13 8810b0887e95cbc803c86fd019b4775bdff43be4 Rando Wiltschek <randomw@gmx.net> 1483353932 +0100	commit: Removed (redundant?) error check from BuyItem
8810b0887e95cbc803c86fd019b4775bdff43be4 cd3093b09ff81d000ad0c6b596cb0e350c07fa2f Rando Wiltschek <randomw@gmx.net> 1483355684 +0100	commit: Fixed social thoughts of guests not appearing correctly
cd3093b09ff81d000ad0c6b596cb0e350c07fa2f 34914873a0bfe709aac9b8de31a3425f42f00f25 Rando Wiltschek <randomw@gmx.net> 1483355721 +0100	commit: Tweaked opinion offsets so guests can be recruited faster
34914873a0bfe709aac9b8de31a3425f42f00f25 f76a9f0fc1d8aefe3ba3164afae43af654228ff5 Rando Wiltschek <randomw@gmx.net> 1483357169 +0100	commit: Attempt at fixing "item is reserved" error when browsing
f76a9f0fc1d8aefe3ba3164afae43af654228ff5 26d4dbddd0944c56f5a64a19beb2c9ab9b83952c Rando Wiltschek <randomw@gmx.net> 1483357201 +0100	commit: More tweaking of opinions
26d4dbddd0944c56f5a64a19beb2c9ab9b83952c 36b7ac717ff08fdc5539b8ab6cf239312e11d2e3 Rando Wiltschek <randomw@gmx.net> 1483357976 +0100	commit: Another attempt at fixing reservation bug
36b7ac717ff08fdc5539b8ab6cf239312e11d2e3 ce631fca312ede86e2c2f560d2d077d534c0e388 Rando Wiltschek <randomw@gmx.net> 1483359456 +0100	commit: Fixed guests sleeping on the same spot
ce631fca312ede86e2c2f560d2d077d534c0e388 965b95d30ddeb5948d2bd07244a4c144494b128e Rando Wiltschek <randomw@gmx.net> 1483359682 +0100	commit: Build
965b95d30ddeb5948d2bd07244a4c144494b128e d8f6204f453f5f9c95b4c0dc59f28f140069f6fc Rando Wiltschek <randomw@gmx.net> 1483359857 +0100	merge release/A16a: Merge made by the 'recursive' strategy.
d8f6204f453f5f9c95b4c0dc59f28f140069f6fc a1aed6ab29b79d769f60024981db88d25307d3bc Rando Wiltschek <randomw@gmx.net> 1483443143 +0100	commit: Fixed work priorities shifting when Hospitality is added mid-game
a1aed6ab29b79d769f60024981db88d25307d3bc de6024fe95c1f47f8f53f9ea3eabbabf61b21488 Rando Wiltschek <randomw@gmx.net> 1483443359 +0100	commit: Fixed colonists chatting with enemies during combat
de6024fe95c1f47f8f53f9ea3eabbabf61b21488 88842fba0826d037b46752e184476067fda6cb8c Rando Wiltschek <randomw@gmx.net> 1483459524 +0100	commit: Tweaked visitor sleeping priority
88842fba0826d037b46752e184476067fda6cb8c 43994be4bdbf414e333aa377f345490163f388ac Rando Wiltschek <randomw@gmx.net> 1483459557 +0100	commit: Fixed error when trying to browse items
43994be4bdbf414e333aa377f345490163f388ac 3b886cb070cc20f880a2777b6bca45b7063e0136 Rando Wiltschek <randomw@gmx.net> 1483459711 +0100	commit: Build
3b886cb070cc20f880a2777b6bca45b7063e0136 1520908c7a146da5cde33a8b7a051a6521a748a7 Rando Wiltschek <randomw@gmx.net> 1483460162 +0100	merge master: Fast-forward
