Commit graph

125 commits

Author SHA1 Message Date
Zach Brown 63130fd2aa
Update upstream B/CB
Closes GH-569
2017-01-06 15:45:59 -06:00
Aikar 86e5224d94 Update upstream - fixes more Spawn Egg issues 2017-01-02 01:58:15 -05:00
Zach Brown 3a8acfba6b
Update upstream B/CB 2016-12-31 00:08:30 -06:00
Zach Brown 1870320545
Update upstream CB
Closes GH-556
2016-12-27 18:46:41 -06:00
Aikar 64f6edc759 Upstream update 2016-12-27 13:07:43 -05:00
Zach Brown bba27681ba
Update usptream CB 2016-12-26 13:02:52 -05:00
Zach Brown ebd97d6f18
Update upstream B/CB 2016-12-24 17:05:51 -05:00
Aikar ebeab924f5 Upstream, Fixes #533 2016-12-23 00:55:03 -05:00
Zach Brown fe913c51c4
Update upstream CB 2016-12-22 15:06:59 -06:00
Zach Brown cae453c16b
Update to Paper to MC 1.11.2 2016-12-21 11:21:40 -06:00
Aikar 417b1e2e02 Update upstream 2016-12-21 01:40:41 -05:00
Zach Brown 33163525f3
Update Paper to MC 1.11.1 2016-12-20 17:45:00 -06:00
Aikar c222ffd4cd Update upstream 2016-12-19 22:58:12 -05:00
Aikar 8bbb9c70f3 Update Upstream 2016-12-19 01:23:54 -05:00
Zach Brown 5ff732798d
Update upstream B/CB 2016-12-16 22:23:03 -06:00
Zach Brown 1d8b7e2ecc
Update upstream B/CB 2016-12-16 15:00:16 -06:00
Zach Brown f087ac45e3
Update upstream B/CB
Fixes GH-542
2016-12-12 14:21:28 -06:00
Zach Brown 7c210e35b4
Update upstream CB 2016-12-10 17:50:31 -06:00
Zach Brown b41a5ab566
Update upstream B/CB 2016-12-09 18:07:35 -06:00
Zach Brown 57c2b8de43
Update upstream B/CB 2016-12-06 17:12:19 -06:00
Zach Brown ebf1094ea5
Update upstream CB 2016-12-04 17:59:11 -06:00
Zach Brown 7e6d4b54e1
Don't remove random diffs in update 2016-12-02 21:06:21 -06:00
Zach Brown f986ebbae5
Update upstream CB 2016-12-02 18:07:07 -06:00
Zach Brown 357b402cbc
Update upstream B/CB some more 2016-12-01 19:34:07 -06:00
Zach Brown 7556f6a556
Update upstream B/CB 2016-11-30 21:10:14 -06:00
Zach Brown 951fbf46dc
Update upstream CB 2016-11-29 23:14:49 -06:00
Zach Brown 2bfdbc4afa
Update upstream CB 2016-11-29 18:02:20 -06:00
Jamie Mansfield 6a127779e7
Update upstream CB 2016-11-29 20:09:37 +00:00
Zach Brown ed6bd4ea4a
Update upstream B/CB - hitEntity added upstream 2016-11-28 17:16:07 -06:00
DemonWav a594f94666
Update Paperclip 2016-11-27 23:27:33 -06:00
Zach Brown b324a0ec4f
More upstream CB 2016-11-27 17:37:38 -06:00
Zach Brown ceec3e2219
Update upstream CB 2016-11-27 17:00:08 -06:00
Zach Brown 4056a8b468
Update upstream B/CB/S 2016-11-26 21:36:05 -06:00
Zach Brown a68f5fbec0
Update upstream B/CB/S 2016-11-24 21:12:18 -06:00
Zach Brown 4ea87e5378
Update upstream B/CB/S 2016-11-22 18:06:14 -06:00
Aikar 2290e5f85d Update upstream 2016-11-21 18:00:40 -05:00
Zach Brown 97e0eac6e7
Update upstream B/CB 2016-11-21 15:51:27 -06:00
Zach Brown eb877d8cdb
Update upstream CB 2016-11-20 17:02:00 -06:00
Zach Brown a27cdba309
Update upstream CB 2016-11-19 21:30:09 -06:00
Zach Brown 508ce52d68
Update upstream CB 2016-11-19 17:24:37 -06:00
Zach Brown 26e4ac4330
Update upstream B/CB 2016-11-19 11:27:13 -06:00
Aikar 6b81efa677 Upstream update again 2016-11-19 00:16:42 -05:00
Aikar 9725050889 Update Upstream 2016-11-18 23:58:56 -05:00
Zach Brown a6d146a939
Update Paper to MC 1.11 2016-11-18 16:21:06 -06:00
Zach Brown 65538782cd
Update upstream B/CB/S 2016-11-12 20:21:46 -06:00
Zach Brown 1e1de2ffa8
Update upstream CB 2016-11-04 22:37:19 -05:00
Zach Brown c4829af34f
Update upstream B/CB 2016-11-03 14:27:37 -05:00
Zach Brown 0860727dae
Update upstream S 2016-10-26 16:05:22 -05:00
Zach Brown 3fafa6306a
Update upstream CB 2016-10-24 21:03:31 -05:00
Zach Brown 88e1379b38
Update upstream CB 2016-10-23 01:32:04 -05:00