md_5
3ea2235dbd
More conflict resolution.
2015-02-14 20:15:47 -06:00
md_5
6008bb8fab
Fix merge conflicts.
2015-02-14 20:15:35 -06:00
Thinkofdeath
d7dbedcf72
Fix merge conflicts
2015-01-25 21:56:18 -06:00
md_5
86c8d0492a
Fix merge conflicts.
2015-01-25 02:02:43 -06:00
Thinkofdeath
3c20eb4a97
Upstream merge
2015-01-18 12:40:16 -06:00
md_5
478838714f
Merge
2015-01-16 10:46:27 -06:00
md_5
bfc8900321
Merge in changes.
2015-01-16 10:39:55 -06:00
md_5
3de5e003f5
Upstream merge.
2015-01-12 11:15:14 -06:00
md_5
384699a51a
Upstream merge.
2015-01-06 22:09:08 -06:00
Zach Brown
b360cf686f
Update from upstream SpigotMC
...
eb39b4729ce
59b08be5833
a723278f74a
2015-01-04 20:01:24 -06:00
Zach Brown
c7f1eed0bf
Update from upstream SpigotMC
...
3beb7729816
a77ed5758a7
52c130fc6d9
2014-12-20 19:09:49 -06:00
Zach Brown
6a5e553feb
Update from upstream SpigotMC
...
a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]
2014-12-18 17:33:08 -06:00
Zach Brown
8bbab87c6b
Update from upstream SpigotMC
...
3e3ea0bd0d8
320ed92779f
612de468951
2014-12-14 15:54:10 -06:00
Zach Brown
74110558b2
Update from upstream SpigotMC
...
81e4ab71ca4
b023457499d
dc776bee32b
116e6fc98dc
2b97a3846f2
2014-12-12 22:47:57 -06:00
Zach Brown
28414e7e28
Update from upstream SpigotMC
...
6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe
2014-12-07 13:26:30 -06:00
Zach Brown
c9daa16dac
Update from upstream SpigotMC
...
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
2014-12-05 21:33:40 -06:00
Zach Brown
2a30a76ac5
Merge with Spigot
...
da32fe1d549 <- Increase max scoreboard objective size
2014-12-03 18:13:06 -06:00
Zach Brown
c55b9c30d7
Update from upstream SpigotMC
...
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
2014-12-02 00:02:15 -06:00
Zach Brown
19972e09b8
Update SpigotMC's patches
...
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
2014-11-30 16:16:48 -06:00
Zach Brown
1c49ff69f4
Update Spigot's Patches round 2?
...
The hell happened here.
:
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf
This new system breaks a lot :(
2014-11-28 18:06:26 -06:00
Zach Brown
de86706b70
Update PaperSpigot to Minecraft 1.8
2014-11-28 15:01:21 -06:00
Zach Brown
cab333b217
Rebase (Update) from upstream SpigotMC
...
Don't send requests of every player was found in the global api cache SpigotMC/Spigot@841270ff1e
Correctly set the response code for the cached lookups and return the ... SpigotMC/Spigot@f170b7899c
Don't try and re-set the global api cache on reload SpigotMC/Spigot@b410a00a66
Use a compile time sneaky throw hack. SpigotMC/Spigot@508462b96b
Fix a missed rename in WorldGenGroundBush SpigotMC/Spigot@0614d8fae9
2014-11-28 14:19:07 -06:00
Zach Brown
c777f40058
Update from upstream SpigotMC
...
Add unbreakable API to item meta SpigotMC/Spigot@b1af008222
Configure how often EntityHangings calculate if they should die. SpigotMC/Spigot@ac6e1fc32d
Copy ItemStacks in DataWatcher to prevent ConcurrentModificationExcep… SpigotMC/Spigot@2af28ffbd1
Add the spigot.yml into the timings paste SpigotMC/Spigot@d61f38bd58
Note: This commit moves the entity-hanging tick into Spigot's spigot.yml and out of our paper.yml
2014-08-25 16:33:18 -05:00
Zach Brown
5b4bc3081a
Update from upstream SpigotMC
...
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
2014-08-18 10:43:17 -05:00
Zach Brown
7b0c576798
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
1207bc585d
Apply our patches over Spigot-Server and Spigot-API directly
2014-06-24 08:04:20 -05:00
Thinkofdeath
5d4ed8047a
Upstream merge: Chicken jockey despawning and generation fixes
2014-04-30 15:13:37 +01:00
md_5
74c275f71c
Upstream merge
2014-04-24 16:33:42 +10:00
Thinkofdeath
a118e4c40d
Upstream merge
2014-04-18 17:08:19 +00:00
md_5
83ce6724ca
Stage 1
2014-04-12 14:18:37 +10:00
Thinkofdeath
ded44c47f0
Upstream merge
2014-04-03 21:12:44 +01:00
md_5
04d72bc702
Merge some stuff from upstream.
2014-04-02 17:54:35 +11:00
Thinkofdeath
69324bba91
Update to 1.7.5
2014-03-23 00:06:43 +00:00
md_5
254df64f1b
Rebuild patch hashes, fix build.
2014-03-10 09:14:45 +11:00
Thinkofdeath
5284bd1a74
Upstream merge
2014-02-12 14:06:33 +00:00
Thinkofdeath
31f53fbbbe
Upstream merge
2014-01-31 20:42:29 +00:00
md_5
80c8e1ac31
Don't disconnect player when we have no vanilla tab completions.
2014-01-21 15:32:54 +11:00
md_5
6a98142bd5
Fix patch tree.
2013-12-22 10:06:06 +11:00
md_5
e9cb6ec3c5
Upstream merge
2013-12-18 17:48:18 +11:00
md_5
7899e58d02
Merge in some stuff
2013-12-14 17:58:22 +11:00
md_5
80da3f0c9b
Stage 1
2013-12-01 14:40:53 +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
843c21ddf8
Upstream Merge
2013-08-04 08:51:09 +10:00
md_5
7db0f5eda8
Get rid of ambiguity
2013-08-03 20:01:12 +10:00
DerFlash
edd0d42995
Add Getter for Entity Invulnerability
2013-08-03 19:54:36 +10:00
md_5
381a40a50a
Upstream merge
2013-08-03 18:45:50 +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
