Commit graph

72 commits

Author SHA1 Message Date
md_5
f26a3acc43 Rebuild #2 2015-04-09 13:40:23 +10:00
md_5
4e6ca2abdc Hash rebuild 2015-04-09 13:18:56 +10:00
Thinkofdeath
dbe012b14f Upstream merge 2015-03-24 20:45:15 +00:00
Thinkofdeath
4b89e7be76 Upstream merge 2015-03-22 19:50:13 +00:00
Thinkofdeath
beb883d578 Upstream merge 2015-03-17 21:22:17 +00:00
Thinkofdeath
31ba0793ff Rebuild patches 2015-03-08 11:04:41 +00:00
Thinkofdeath
b100cf9e7d Update to Minecraft 1.8.3 2015-02-28 23:11:38 +00:00
md_5
6ee12f6fbc Patch rebuild. 2015-02-26 21:41:47 +11:00
md_5
b73910a7b7 More conflict resolution. 2015-02-15 12:55:54 +11:00
md_5
3e3f2ccfbd Fix merge conflicts. 2015-02-15 12:52:33 +11:00
Thinkofdeath
d0d1d8761a Fix merge conflicts 2015-01-25 14:44:52 +00:00
md_5
2130aaa870 Fix merge conflicts. 2015-01-25 10:37:36 +11:00
Thinkofdeath
0679d750fe Upstream merge 2015-01-18 18:17:11 +00:00
md_5
fa7cbf96a8 Merge 2015-01-17 10:12:20 +11:00
md_5
7297fbdcb8 Merge in changes. 2015-01-16 14:58:23 +11:00
md_5
451b7ed457 Upstream merge. 2015-01-12 20:08:41 +11:00
md_5
e497721865 Upstream merge. 2015-01-05 14:32:59 +11:00
Thinkofdeath
a723278f74 Upstream merge 2015-01-04 23:32:22 +00:00
FrozenBrain
52c130fc6d Fix Entity Activation Range 2014-12-21 09:01:55 +11:00
md_5
d6b5ba7ca0 Fix merge conflicts. 2014-12-18 21:30:50 +11:00
md_5
a926b96d5d Fix conflicts 2014-12-18 11:14:43 +11:00
Thinkofdeath
9b45d9fa8d Upstream merge 2014-12-15 15:53:27 +00:00
Suddenly
a3168ab2ce Fix the BiomeDecorator going missing due to the mc-dev-imports patch 2014-12-15 11:44:03 +00:00
md_5
612de46895 Add BungeeCord Chat API
Went missing in 1.8 update.
2014-12-13 22:57:37 +00:00
md_5
b023457499 Fix conflicts 2014-12-12 13:23:18 +11:00
Thinkofdeath
81e4ab71ca Rebuild patches 2014-12-11 20:46:00 +00:00
Thinkofdeath
b8f6402bbb Upstream merge 2014-12-07 13:26:31 +00:00
Thinkofdeath
0ddb6f3dde Upstream merge 2014-12-07 11:56:05 +00:00
Thinkofdeath
4beb4ac391 Upstream merge 2014-12-07 11:41:26 +00:00
Thinkofdeath
8dc4297e34 Upstream merge 2014-12-05 21:38:02 +00:00
Thinkofdeath
da32fe1d54 Increase the max scoreboard objective size 2014-12-02 15:52:36 +00:00
Thinkofdeath
66af3b310e Base the version hash on the root Spigot project instead of the Spigot-Server project 2014-12-01 10:17:33 +00:00
Thinkofdeath
068df64aee Rebuild all patches 2014-11-30 21:22:49 +00:00
Thinkofdeath
5a0150f586 Fix ITEM_BREAK 2014-11-29 20:44:07 +00:00
Thinkofdeath
89d3fcbdfa Regen the patches 2014-11-28 23:29:40 +00:00
Thinkofdeath
6b9c932ab4 Update to Minecraft 1.8
For more information please see http://www.spigotmc.org/
2014-11-28 17:17:53 +11:00
Thinkofdeath
d61f38bd58 Add the spigot.yml into the timings paste
This allows for tools like @aikar's timings site to produce suggestions
based on the users config
2014-08-25 20:18:21 +01:00
libraryaddict
b1af008222 Add unbreakable API to item meta 2014-08-25 19:05:25 +10:00
md_5
4b5a26b11c Revert unbreakable API, doesn't work as intended 2014-08-24 11:53:33 +10:00
libraryaddict
32e6d74a5f Add isUnbreakable and setUnbreakable to ItemMeta. Also fixes a bug where it doesn't show up on items 2014-08-24 09:36:37 +10:00
Thinkofdeath
1e7bc383c3 Upstream merge 2014-08-18 10:02:45 +01:00
md_5
01a14f4b5a Update Spigot to Minecraft 1.7.10 2014-07-09 10:23:19 +10:00
md_5
ce355b2fda Add a few comments to the first 14 patches. 2014-07-05 20:34:22 +10: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