43 Commits

Author	SHA1	Message	Date
Thinkofdeath	31f53fbbbe	Upstream merge	2014-01-31 20:42:29 +00:00
md_5	d3f7cce233	Revert Spigot branding.	2014-01-26 21:54:02 +11:00
md_5	6eefe4e38e	Allow configuring of player sample size, and default the sample to 12, the same as Vanilla. This has some performance overhead, as we have to shuffle the list each time, but this is better than the server displaying as offline!	2014-01-26 21:50:53 +11:00
md_5	ab3c5a42f7	Revert "Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise." ... This reverts commit 71255cf140.	2014-01-26 21:33:46 +11:00
md_5	71255cf140	Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise.	2014-01-26 09:17:40 +11:00
md_5	65a4f51285	Upstream merge	2014-01-15 20:28:26 +11:00
md_5	6a98142bd5	Fix patch tree.	2013-12-22 10:06:06 +11:00
md_5	1c099a713b	Upstream merge, nothing major.	2013-12-21 19:13:39 +11:00
md_5	e9cb6ec3c5	Upstream merge	2013-12-18 17:48:18 +11:00
md_5	e770480d4b	Fix shade fix accidentally being unmerged	2013-12-04 19:57:08 +11:00
md_5	c8145fb896	Actually fix division by 0 in growth	2013-12-03 09:05:49 +11:00
md_5	31572d6c20	Update maven shade plugin so that newer maven versions (ie travis) will compile.	2013-12-03 08:21:58 +11:00
md_5	cc7903bbf3	Upstream merge	2013-12-02 07:36:51 +11:00
md_5	80da3f0c9b	Stage 1	2013-12-01 14:40:53 +11:00
md_5	cdbe22b7c7	Update master to R2 as well.	2013-11-05 10:46:34 +11:00
md_5	f775c4dbd1	Upstream Merge	2013-10-24 21:23:24 +11:00
md_5	7509839cdf	Update to CraftBukkit 1.6.4	2013-09-20 11:46:45 +10:00
md_5	1b854cbe28	Upstream merge + remove 3 pulled patches.	2013-09-12 10:20:02 +10:00
md_5	e36ba8dd96	Upstream merge	2013-08-07 17:16:57 +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	9018b1d7ba	Update Spigot to Minecraft 1.6.2	2013-07-09 10:31:10 +10:00
md_5	26f85d2572	Update Depends ... - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.	2013-07-04 20:05:41 +10:00
md_5	4d2619f099	Remove LocalLanguage patch for now	2013-07-02 13:14:40 +10:00
md_5	5d790af909	Update to Minecraft 1.6.1 - Phase 1	2013-07-02 13:03:56 +10:00
md_5	8cbfcf995d	Compiling up to patch 10	2013-06-21 17:00:01 +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	2083a98e7b	Update versions.	2013-06-15 19:08:22 +10:00
md_5	51ed9f651d	Update to latest upstream	2013-05-04 09:24:53 +10:00
md_5	89c99e9d28	[CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST.	2013-05-01 08:40:33 +10:00
md_5	7c8c784aab	FIx spacing	2013-04-23 11:35:18 +10:00
md_5	ce45aa074e	Move version resolve check to initial POM patch	2013-04-23 11:32:07 +10:00
md_5	079dc61259	Now that thats out the way..	2013-04-13 17:14:56 +10:00
md_5	010f3ea2b0	Remove a fair chunk of existing patches now applied to CraftBukkit	2013-04-13 17:06:23 +10:00
md_5	d9c76252eb	Remove stats completely from patches.	2013-04-10 14:08:33 +10:00
Ammar Askar	1fdfed1fb9	Update for upstream version change	2013-04-04 15:58:51 +05:00
Hudson	acc7e2172b	revert changes to disabled plugins and scheduler. ... sorry for messy commit,doing via tablet on ssh md_5	2013-04-03 02:20:29 -05:00
Benjamin James Harrison-Sims	49fd03bf60	Update to 1.5.1	2013-03-20 22:13:12 +00:00
md_5	a97c5a42d6	Deploy server again. wot eva	2013-03-17 12:27:37 +11:00
md_5	6e1c16aed8	Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p	2013-03-16 08:35:56 +11:00
md_5	3c54fa95be	Rename generated repo, and only deploy API, not server.	2013-03-07 17:49:54 +11:00
md_5	7b4bba6b3b	Actually use the parent pom.	2013-02-03 09:54:16 +11:00
md_5	5853e18f40	Just use the parent pom.	2013-02-03 09:48:23 +11:00
md_5	277b59e4b9	Update POM changes to individual patches.	2013-02-03 09:38:54 +11:00