18 commits

Author	SHA1	Message	Date
John	f0c0c08719	DANIEL: Cleanup	2015-06-17 10:11:33 -04:00
John	6d24fb4390	Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.)	2015-06-17 10:08:57 -04:00
John	def7ca4372	Max true friends + cleanup	2015-06-17 09:49:18 -04:00
Loudrob	e702145334	DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11'	2015-06-16 19:13:24 -04:00
John	9a4af9c686	Remove Welcome Valley	2015-05-24 17:21:40 +03:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
Zach	eec533a48b	GroupManager updates	2015-04-23 21:07:17 -05:00
DenialMC	04233eb9f3	Revert "Holocausted Welcome Valley" ... This reverts commit ad91b21823.	2015-04-07 17:19:50 +03:00
DenialMC	ad91b21823	Holocausted Welcome Valley	2015-04-07 16:30:49 +03:00
Zach	e80e586b55	force teleport on shard	2015-03-08 21:15:13 -05:00
Zach	fd720c4ebd	ShardPage update	2015-03-08 20:49:47 -05:00
Loudrob	588d9691ca	wtf	2015-03-08 18:15:05 -04:00
Zach	44fe794599	finished GroupManager client, AIs, and ShardPage	2015-03-08 05:22:51 -05:00
Zach	e52dbdb2ff	merge thing	2015-03-07 02:56:06 -06:00
Zach	1c9c92f444	new shard page	2015-03-07 02:24:33 -06:00
Zach	b0ee41b558	dual resources compatibility and shard page update	2015-03-05 16:48:24 -06:00
Loudrob	8eb2b7bb82	Added Zach's shard page, and apparently he doesn't want his resources anymore.	2015-03-05 07:08:28 -05:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00