Shaun Bennett f8885e4c5c Merge remote-tracking branch 'origin/master'		2015-02-05 21:36:19 -05:00
..
clans	War state, handle time better, ability to have a server timezone (see ClanManager)	2015-02-05 21:36:07 -05:00
fields	Refactored IRelation method names	2014-12-03 13:06:50 -08:00
gameplay	Fixed a bunch of clans bugs	2014-12-08 00:55:20 -08:00
shop	Fix ugly /gold command	2015-01-22 20:41:05 -05:00
Clans.java	Revert "Revert "Work on treasure............""	2015-02-05 11:34:29 +11:00
Farming.java	Refactored IButton	2014-12-04 05:05:27 -08:00
Recipes.java	Refactored IButton	2014-12-04 05:05:27 -08:00