Try to fix a thing that broke someone's account D:
Merge branch 'master' of github.com:sharpobject/sgre

* 'master' of github.com:sharpobject/sgre:
  Fix entering fight with invalid decks
  Fix pacifism
slight cleanup of cafe code away from using server_message
Merge pull request #30 from chuanshi/cafe-fix

slight cleanup of cafe code away from using server_message
Fix sense of belonging, quick service, luthica's ward
fixed cafe to work more similarly to crafting with respect to client-server interaction
Merge remote-tracking branch 'upstream/master'
Fix vampiric education
fixed modal dialogs to be cafe-only and update_collection reason
Merge pull request #31 from chuanshi/cafe-cleanup

fixed cafe to work more similarly to crafting with respect to client-ser...
Update NPC deck generation

This generates somewhat more accurate decks for current content.
Add ep3 characters/skills
Add a facility for manually specifying decks

This will be useful for stuff like M at least
EP3 crafting
EP3 dungeons, npc decks
Add sigma to client

Add panica to server, but NPC skills are not done
Decks/dungeon for panica
Tweak NPC pipeline to accomodate some bosses with 4 of a card
Update loveframes (fixes crafting UI bug)
Multiply rewards by 3
Fix dist_client for osx
Merge pull request #29 from gcreamer3/master

Added dungeon selection screen
Add sigma dungeon image
Reduce log noise on server

Especially when select() decides to always return instantly...