Commit Graph

71 Commits

Author SHA1 Message Date
Zach Brown
b2c262e382 Update upstream CB 2016-10-10 21:29:08 -05:00
Zach Brown
82420acbea Update upstream CB 2016-10-05 16:08:40 -05:00
Zach Brown
f4a336f40e Update paperclip 2016-10-01 22:23:28 -05:00
Zach Brown
18799efd0d Update upstream B/CB/S 2016-10-01 11:47:56 -05:00
Zach Brown
3dee693e9e Update upstream CB 2016-09-20 15:59:26 -05:00
Zach Brown
cf1b2e07f3 Update upstream CB 2016-09-18 13:37:38 -05:00
Zach Brown
2b244fb51e Update upstrean CB/S 2016-09-11 14:55:02 -05:00
Zach Brown
f5d7e2067d Update upstream B/CB/S 2016-09-05 14:21:03 -05:00
Zach Brown
eb7e4424fa Update upstream B/CB 2016-09-04 16:59:06 -05:00
kashike
8f91416dcb @Zbob750 missed a few name changes 2016-09-04 06:35:42 +00:00
Zach Brown
f9f96ea3a5 Update upstream B/CB/S 2016-09-02 22:44:52 -05:00
Zach Brown
b170e8cedb Update upstream B/CB/S
Remove two features added upstream
2016-08-27 18:41:58 -05:00
Zach Brown
16a7cf1c01 Update upstream CB 2016-08-21 14:52:19 -05:00
Zach Brown
d5057a1488 Update upstream B/S 2016-08-15 18:51:55 -05:00
Zach Brown
997fa37ee7 Update upstream B/CB 2016-08-11 15:07:07 -05:00
Zach Brown
15f3ca7ecb Update upstream B/CB 2016-08-07 00:01:31 -05:00
Zach Brown
46bfd418a8 Update upstream B/CB/S 2016-07-30 18:02:34 -05:00
Zach Brown
e30fab8ee6 Update upstream B/CB 2016-07-26 19:30:03 -05:00
Zach Brown
9918f90710 Update upstream CB 2016-07-22 17:24:30 -05:00
Zach Brown
f1691b34c5 Update upstream B/CB/S 2016-07-15 17:36:53 -05:00
Zach Brown
d67763d7a3 Update upstream B/CB/S 2016-07-12 23:22:58 -05:00
Aikar
9e229a2247 Upstream burritos, maybe tacos, and churros. 2016-07-08 00:17:25 -04:00
Zach Brown
c623550296 Update upstream B/CB/S 2016-07-07 21:06:58 -05:00
Zach Brown
2e2f401132 Update upstream tacos B/CB/S 2016-07-04 18:49:14 -05:00
Aikar
2e2842032f More Upstream tacos 2016-06-30 01:38:53 -04:00
Aikar
22f2c98375 Upstream tacos 2016-06-30 01:23:30 -04:00
Zach Brown
5b1c69a2f2 Update upstream CB 2016-06-27 21:21:08 -05:00
Zach Brown
66bfe72181 Update upstream CB
It seems they've gotten their own workaround figured out, we'll keep our own fix for TE removal in but let them try theirs and see if it's better now.
2016-06-26 22:51:20 -05:00
Zach Brown
83472d4c99 Update upstream B/CB/S 2016-06-26 14:13:34 -05:00
Zach Brown
92195ceb57 Update upstream CB
Doesn't change anything except puts the last commit upstream, where it belongs
because we're nice like that, or something
2016-06-25 21:34:09 -05:00
Zach Brown
45d9b4c497 Update to MC 1.10.2 2016-06-25 12:21:26 -05:00
Aikar
0973e46de1 Update upstream 2016-06-22 22:18:41 -04:00
Zach Brown
a656161705 Update upstream B/CB 2016-06-19 21:41:46 -05:00
Zach Brown
d73cd6a4bc Update upstream B/CB/S 2016-06-16 20:27:47 -05:00
Zach Brown
cd6dadb8bc Update upstreams 2016-06-15 17:43:51 -05:00
Zach Brown
98d1d2ac57 Update upstream B/CB
Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
2016-06-13 18:42:08 -05:00
Zach Brown
5bad141169 Update upstream CB/S 2016-06-12 12:00:07 -05:00
Zach Brown
14ffaf5d2c Update upstream B/CB 2016-06-11 22:22:27 -05:00
Zach Brown
47db868df1 Update upstream and rebuild 2016-06-11 14:58:54 -05:00
Brokkonaut
ace471101b Update upstream CB/S 2016-06-09 19:28:16 +02:00
Zach Brown
1fcc7495cd Update upstream CB 2016-06-09 00:24:23 -05:00
Zach Brown
c442e96eb9 Update to Minecraft 1.10 2016-06-08 23:42:46 -05:00
Aikar
f4a43ec92d Update Upstream 2016-06-04 11:41:04 -04:00
Zach Brown
e4e87d78ae Update upstream 2016-06-01 22:52:52 -05:00
Zach Brown
0ae5768736 Update upstreams 2016-05-29 18:32:21 -05:00
Zach Brown
06a6c422b4 Update upstreams 2016-05-27 21:22:18 -05:00
Aikar
13492455a1 Update Upstream 2016-05-25 12:37:17 -04:00
Zach Brown
08701a47f7 Update upstream CB
Closes GH-303
2016-05-21 22:07:14 -05:00
Zach Brown
df1df5d4b4 Update B/CB/S
Closes GH-288
2016-05-20 17:32:50 -05:00
Zach Brown
7e5d36ded5 [16:55:31] *mibby pokes upstream 2016-05-16 17:00:53 -05:00