121 commits

Author	SHA1	Message	Date
Aikar	352c322914	Upstream update	2016-12-27 13:07:43 -05:00
Zach Brown	ac93a5cb00	Update usptream CB	2016-12-26 13:02:52 -05:00
Zach Brown	e700f1f255	Update upstream B/CB	2016-12-24 17:05:51 -05:00
Aikar	da3827e1c5	Upstream, Fixes #533	2016-12-23 00:55:03 -05:00
Zach Brown	54f0061ce5	Update upstream CB	2016-12-22 15:06:59 -06:00
Zach Brown	0fa5771dac	Update to Paper to MC 1.11.2	2016-12-21 11:21:40 -06:00
Aikar	e0f5d3e1bd	Update upstream	2016-12-21 01:40:41 -05:00
Zach Brown	ec68dfff5a	Update Paper to MC 1.11.1	2016-12-20 16:34:27 -06:00
Aikar	310105c9c0	Update upstream	2016-12-19 22:58:12 -05:00
Aikar	beb2b5b6c1	Update Upstream	2016-12-19 01:23:54 -05:00
Zach Brown	86ae842a36	Update upstream B/CB	2016-12-16 22:23:03 -06:00
Zach Brown	dbfd2a3406	Update upstream B/CB	2016-12-16 15:00:16 -06:00
Zach Brown	659a7c955f	Update upstream B/CB ... Fixes GH-542	2016-12-12 14:21:28 -06:00
Zach Brown	67a9e0cbf6	Update upstream CB	2016-12-10 17:50:31 -06:00
Zach Brown	b21c31c91d	Update upstream B/CB	2016-12-09 18:07:35 -06:00
Zach Brown	cead4e0a74	Update upstream B/CB	2016-12-06 17:12:19 -06:00
Zach Brown	b75a37d67b	Update upstream CB	2016-12-04 17:59:11 -06:00
Zach Brown	9e40eaf85d	Don't remove random diffs in update	2016-12-02 21:04:24 -06:00
Zach Brown	f0e32d948f	Update upstream CB	2016-12-02 18:07:07 -06:00
Zach Brown	90c9266a32	Update upstream B/CB some more	2016-12-01 19:34:07 -06:00
Zach Brown	9317149ab5	Update upstream B/CB	2016-11-30 21:10:14 -06:00
Zach Brown	19e3622c64	Update upstream CB	2016-11-29 23:14:49 -06:00
Zach Brown	b3d302b6db	Update upstream CB	2016-11-29 18:02:20 -06:00
Jamie Mansfield	72ba56a200	Update upstream CB	2016-11-29 20:09:37 +00:00
Zach Brown	4241b49b85	Update upstream B/CB - hitEntity added upstream	2016-11-28 17:16:07 -06:00
DemonWav	0e8954e40c	Update Paperclip	2016-11-27 23:27:33 -06:00
Zach Brown	e4b2d88214	More upstream CB	2016-11-27 17:37:38 -06:00
Zach Brown	1687e4c0aa	Update upstream CB	2016-11-27 17:00:08 -06:00
Zach Brown	194025fc1b	Update upstream B/CB/S	2016-11-26 21:36:05 -06:00
Zach Brown	5cc2d45a03	Update upstream B/CB/S	2016-11-24 21:12:18 -06:00
Zach Brown	b44bb52488	Update upstream B/CB/S	2016-11-22 18:06:14 -06:00
Aikar	09a8e2f02f	Update upstream	2016-11-21 18:00:40 -05:00
Zach Brown	fb14193e53	Update upstream B/CB	2016-11-21 15:51:27 -06:00
Zach Brown	b97f0ee0e4	Update upstream CB	2016-11-20 17:02:00 -06:00
Zach Brown	6b64111273	Update upstream CB	2016-11-19 21:30:09 -06:00
Zach Brown	3df7a09e64	Update upstream CB	2016-11-19 17:24:37 -06:00
Zach Brown	3efba978ad	Update upstream B/CB	2016-11-19 11:27:13 -06:00
Aikar	84a72db135	Upstream update again	2016-11-19 00:16:42 -05:00
Aikar	7d73fa7ae0	Update Upstream	2016-11-18 23:58:56 -05:00
Zach Brown	4832b1a385	Update Paper to MC 1.11	2016-11-16 20:23:38 -06:00
Zach Brown	c8051323cd	Update upstream B/CB/S	2016-11-12 20:21:46 -06:00
Zach Brown	da6e2f40a9	Update upstream CB	2016-11-04 22:37:19 -05:00
Zach Brown	2ea9521f37	Update upstream B/CB	2016-11-03 14:27:37 -05:00
Zach Brown	122d3d9d43	Update upstream S	2016-10-26 16:05:22 -05:00
Zach Brown	ba280d2292	Update upstream CB	2016-10-24 21:03:31 -05:00
Zach Brown	5b6d46e4c8	Update upstream CB	2016-10-23 01:32:04 -05:00
Zach Brown	714413ff1e	Update upstream CB	2016-10-22 15:24:15 -05:00
Zach Brown	2515c80051	Update upstream B/CB	2016-10-21 15:28:44 -05:00
Zach Brown	0df1dae663	Update upstream CB	2016-10-16 15:35:34 -05:00
Zach Brown	f1e5f599ca	Update upstream CB/S	2016-10-13 17:29:38 -05:00