12 Commits

Author	SHA1	Message	Date
md_5	843c21ddf8	Upstream Merge	2013-08-04 08:51:09 +10:00
md_5	401e57955a	Add more async safeguards	2013-08-03 19:09:09 +10:00
md_5	381a40a50a	Upstream merge	2013-08-03 18:45:50 +10:00
md_5	5462e4c2bb	Upstream merge	2013-07-30 07:27:59 +10:00
md_5	5d31ee288a	Should probably do an upstream update.	2013-07-24 19:33:10 +10:00
md_5	6b60db4272	Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice.	2013-07-11 11:31:30 +10:00
md_5	3c872410f5	Update again - git isn't as smart as he looks	2013-07-03 14:16:28 +10:00
md_5	5d790af909	Update to Minecraft 1.6.1 - Phase 1	2013-07-02 13:03:56 +10:00
md_5	9c9a514b77	Merge tweaks	2013-06-20 18:41:59 +10:00
md_5	0c7072f790	Refresh the hashes of all our patches so they are nicely in sync after our new RB.	2013-06-16 21:45:21 +10:00
md_5	2747aa6e49	Fix loading of per world settings	2013-06-15 22:01:15 +10:00
md_5	45414bbf61	Finish refactoring configuration. The PAIN is over for now	2013-06-11 13:25:58 +10:00