10 commits

Author	SHA1	Message	Date
Zach	f25ad9caf8	merge fix and my bs devs fix	2015-05-24 18:42:26 -05:00
Zach	8bf8cf5f55	GARDENING, BITCHES	2015-05-24 18:23:54 -05:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
John Cote	ab3072fb84	Pets will work in battle now.	2015-05-09 02:21:07 -04:00
John Cote	4be89cbfb3	Cleanup toontown/estate	2015-04-29 04:12:56 -04:00
Daniel	f38f910638	Upstream update	2015-03-29 18:41:02 +03:00
Loudrob	8864582ced	Revert "fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel" ... This reverts commit 8fcd496874.	2015-03-12 19:10:42 -04:00
Loudrob	8fcd496874	fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel	2015-03-12 08:12:48 -04:00
Zach	94c1b92776	gardening stuff	2015-03-07 18:31:55 -06:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00