Commit graph

62 commits

Author SHA1 Message Date
Zach Brown
105e5e9ba4 Update from upstream SpigotMC take 2: Update harder 2014-12-27 16:07:04 -06:00
Zach Brown
a9b3e95f53 Update from upstream SpigotMC
3beb7729816
a77ed5758a7
52c130fc6d9
2014-12-20 19:09:49 -06:00
Zach Brown
afa737e5a5 Update from upstream SpigotMC
a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]
2014-12-18 17:33:08 -06:00
Zach Brown
d6ca2dd326 Update from upstream SpigotMC
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
2014-12-05 21:33:40 -06:00
Zach Brown
2bb64147b6 Update from upstream SpigotMC
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
2014-12-02 00:02:15 -06:00
Zach Brown
a52eb21fd8 Update PaperSpigot to Minecraft 1.8 2014-11-27 17:17:45 -08:00
Zach Brown
e7f3ca4505 Restructure PaperSpigot as a new set of modules
Allows us much greater control over the Spigot portion of the code
and makes us more "proper"
Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 15:46:54 -05:00
Zach Brown
8ae366785c Apply our patches over Spigot-Server and Spigot-API directly 2014-06-24 07:21:58 -05:00
Spigot
07a1436667 Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it.
By: md_5 <git@md-5.net>
2014-06-21 16:30:09 +10:00
Spigot
226c6d1ef0 Upstream merge
By: Thinkofdeath <thinkofdeath@spigotmc.org>
2014-06-02 15:38:03 +01:00
Spigot
77c0da2f07 Upstream merge: conflict resolution and version bump
By: md_5 <git@md-5.net>
2014-05-15 17:05:45 +10:00
Spigot
51faa817d1 Upstream merge
By: Thinkofdeath <thinkofdeath@spigotmc.org>
2014-05-14 14:02:09 +01:00
Spigot
1f1443ed34 Upstream merge: 1.7.9
By: Thinkofdeath <thethinkofdeath@gmail.com>
2014-04-17 20:47:40 +01:00
Spigot
df0b4f3094 Fix BanList command and other *list functionality
By: md_5 <git@md-5.net>
2014-04-17 19:03:00 +10:00
Spigot
28ccca81f4 Stage 1
By: md_5 <git@md-5.net>
2014-04-12 14:18:37 +10:00
Spigot
968a96a1d3 Upstream: Add more expansive UUID based operations
By: md_5 <git@md-5.net>
2014-03-30 09:09:24 +11:00
Spigot
b215942177 Update to 1.7.5
By: Thinkofdeath <thethinkofdeath@gmail.com>
2014-03-23 00:06:43 +00:00
Spigot
3985d6815c Rebuild patch hashes, fix build.
By: md_5 <git@md-5.net>
2014-03-10 09:14:45 +11:00
Spigot
7073c502e9 Upstream merge
By: Thinkofdeath <thethinkofdeath@gmail.com>
2014-02-12 13:48:26 +00:00
Spigot
99ececedb4 Upstream merge
By: Thinkofdeath <thethinkofdeath@gmail.com>
2014-01-31 20:42:29 +00:00
Spigot
5daa2e1c61 Revert Spigot branding.
By: md_5 <git@md-5.net>
2014-01-26 21:54:02 +11:00
Spigot
87c6f7ea4b 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!
By: md_5 <git@md-5.net>
2014-01-26 21:50:53 +11:00
Spigot
3ca7ea1b9f Revert "Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise."
This reverts commit 4a7355c626.

By: md_5 <git@md-5.net>
2014-01-26 21:33:46 +11:00
Spigot
4a7355c626 Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise.
By: md_5 <git@md-5.net>
2014-01-26 09:17:40 +11:00
Spigot
1180c5cc83 Upstream merge
By: md_5 <git@md-5.net>
2014-01-15 20:28:26 +11:00
Spigot
fe21d2887d Fix patch tree.
By: md_5 <git@md-5.net>
2013-12-22 10:06:06 +11:00
Spigot
2c6428f4b1 Upstream merge, nothing major.
By: md_5 <git@md-5.net>
2013-12-21 19:13:39 +11:00
Spigot
72cde1fd01 Upstream merge
By: md_5 <git@md-5.net>
2013-12-18 17:48:18 +11:00
Spigot
d908152b5e Fix shade fix accidentally being unmerged
By: md_5 <md_5@live.com.au>
2013-12-04 19:57:08 +11:00
Spigot
534e2d536d Actually fix division by 0 in growth
By: md_5 <md_5@live.com.au>
2013-12-03 09:05:49 +11:00
Spigot
9b902e4a4c Update maven shade plugin so that newer maven versions (ie travis) will compile.
By: md_5 <md_5@live.com.au>
2013-12-03 08:21:58 +11:00
Spigot
9a876418c1 Upstream merge
By: md_5 <md_5@live.com.au>
2013-12-02 07:36:51 +11:00
Spigot
ff79e2c7df Stage 1
By: md_5 <md_5@live.com.au>
2013-12-01 14:40:53 +11:00
Spigot
964389e910 Update master to R2 as well.
By: md_5 <md_5@live.com.au>
2013-11-05 10:46:34 +11:00
Spigot
9658a61088 Upstream Merge
By: md_5 <md_5@live.com.au>
2013-10-24 21:23:24 +11:00
Spigot
d0f0d605bf Update to CraftBukkit 1.6.4
By: md_5 <md_5@live.com.au>
2013-09-20 11:46:45 +10:00
Spigot
754e2b5680 Upstream merge + remove 3 pulled patches.
By: md_5 <md_5@live.com.au>
2013-09-12 10:17:46 +10:00
Spigot
3eb0f032f0 Upstream merge
By: md_5 <md_5@live.com.au>
2013-08-07 17:16:57 +10:00
Spigot
51c9200b04 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice.
By: md_5 <md_5@live.com.au>
2013-07-11 11:31:30 +10:00
Spigot
6fe8638955 Update Spigot to Minecraft 1.6.2
By: md_5 <md_5@live.com.au>
2013-07-09 10:31:10 +10:00
Spigot
8bdeaf2c08 Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.

By: md_5 <md_5@live.com.au>
2013-07-04 20:05:41 +10:00
Spigot
3d185b5792 Remove LocalLanguage patch for now
By: md_5 <md_5@live.com.au>
2013-07-02 13:14:40 +10:00
Spigot
acb5c443c4 Update to Minecraft 1.6.1 - Phase 1
By: md_5 <md_5@live.com.au>
2013-07-02 13:03:56 +10:00
Spigot
52cf9d619c Compiling up to patch 10
By: md_5 <md_5@live.com.au>
2013-06-21 17:00:01 +10:00
Spigot
b7bbdfb74e Refresh the hashes of all our patches so they are nicely in sync after our new RB.
By: md_5 <md_5@live.com.au>
2013-06-16 21:45:21 +10:00
Spigot
be02458440 Update versions.
By: md_5 <md_5@live.com.au>
2013-06-15 19:08:22 +10:00
Spigot
326c461585 Update to latest upstream
By: md_5 <md_5@live.com.au>
2013-05-04 09:24:15 +10:00
Spigot
1857895f30 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST.
By: md_5 <md_5@live.com.au>
2013-05-01 08:33:27 +10:00
Spigot
cde5a715a3 FIx spacing
By: md_5 <md_5@live.com.au>
2013-04-23 11:35:18 +10:00
Spigot
2a38426e59 Move version resolve check to initial POM patch
By: md_5 <md_5@live.com.au>
2013-04-23 11:32:07 +10:00