11 Commits

Author	SHA1	Message	Date
md_5	86c8d0492a	Fix merge conflicts.	2015-01-25 02:02:43 -06:00
md_5	384699a51a	Upstream merge.	2015-01-06 22:09:08 -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	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	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

Renamed from CraftBukkit-Patches/0063-BungeeCord-Support.patch (Browse further)