Commit graph

229 commits

Author SHA1 Message Date
Aikar
fe6fa3846a Update upstream 2017-06-22 23:14:20 -04:00
Zach Brown
604b92968e Update upstream B/CB/S 2017-06-21 22:12:40 -05:00
Aikar
285746c465 update upstream 2017-06-20 18:53:55 -04:00
Zach Brown
1c208bf05b Update upstream CB/S 2017-06-18 20:36:55 -05:00
Zach Brown
7b4fe3ed73 Update upstream CB 2017-06-17 14:18:29 -05:00
Zach Brown
964e06c9a5 Update upstream B/CB/S 2017-06-12 22:28:09 -05:00
Zach Brown
29bba5da9c Update upstream CB 2017-06-11 23:25:44 -05:00
Zach Brown
e3dd2d2df2 Update upstream CB/S 2017-06-11 12:03:07 -05:00
Aikar
a22ed886b5 upstream update 2017-06-10 13:14:52 -04:00
Aikar
e68554e5c6 Update upstream 2017-06-09 08:29:44 -04:00
Shane Freeder
8bb457e352 Update Paper to MC 1.12 2017-06-08 15:16:51 +01:00
Zach Brown
30cc65c220 Update upstream B/CB 2017-06-04 15:11:50 -05:00
Zach Brown
74ffc20767 Update upstream B/CB 2017-06-02 23:41:05 -05:00
Shane Freeder
9cf2e3b3dc Update to 1.12-pre6 2017-05-31 09:04:52 +01:00
Zach Brown
529a9626f4 Update upstream B/CB 2017-05-29 16:11:54 -05:00
Zach Brown
81159a37d4 Update upstream B/CB/S 2017-05-27 23:25:17 -05:00
Zach Brown
a044ef0e9f Update upstream B/CB 2017-05-26 22:09:24 -05:00
Zach Brown
16113437c6 Update upstream B/S 2017-05-23 17:11:28 -05:00
Zach Brown
b39f2133a1 Update Paper to MC 1.12-pre5 2017-05-20 23:41:39 -05:00
Zach Brown
43a4d24ea0 Merge branch 'master' into pre/1.12 2017-05-17 17:52:45 -05:00
Shane Freeder
0377b7b862 Workaround a jansi bug with Windows
Update Paperclip too while we're here
2017-05-17 17:51:42 -05:00
Zach Brown
d67b067983 Update upstream CB 2017-05-17 17:24:58 -05:00
Zach Brown
edfd5eda4f Update upstream B/CB 2017-05-16 17:17:58 -05:00
Zach Brown
f7d8aa4188 Update upstream B/CB/S 2017-05-15 11:25:20 -05:00
Zach Brown
b712d77d72 Update API patches to MC 1.12pre2 2017-05-14 08:46:44 -05:00
Zach Brown
afaba00192 Update Paperclip 2017-05-14 04:23:06 -05:00
Zach Brown
2c33c8b106 Update upstream CB 2017-05-13 20:37:46 -05:00
Zach Brown
26d7646a75 Update upstream B/CB/S 2017-05-04 18:08:52 -05:00
Zach Brown
2671b8b308 Update upstream B/CB/S 2017-04-28 19:25:52 -05:00
Zach Brown
d8c3e02ad6 Update upstream S 2017-04-25 18:22:29 -05:00
Zach Brown
2aca63ddef Update upstream CB/S 2017-04-22 17:41:28 -05:00
Zach Brown
0d1f8be81d Update upstream B/CB 2017-04-21 23:42:59 -05:00
Zach Brown
724a156e6f Update upstream CB 2017-04-20 18:12:03 -05:00
Zach Brown
90927cd654 Update upstream B/CB 2017-04-20 08:22:08 -05:00
Zach Brown
515506c3ce Update upstream B/CB/S
Closes GH-658
2017-04-16 17:12:01 -05:00
Zach Brown
9aba83bfdc Update upstream CB/S 2017-04-10 22:11:26 -05:00
Zach Brown
3ef2557fe5 Update upstream B/CB 2017-04-04 22:38:08 -05:00
Zach Brown
66a6db73e0 Update upstream B/CB 2017-03-31 23:24:42 -05:00
Zach Brown
bc4e080971 Update upstream CB 2017-03-30 18:26:00 -05:00
Zach Brown
de6a101264 Update upstream B/CB/S
Adds /paper command for reloading the paper config.
Closes GH-639

Per-world config logging has been removed in favor of all or nothing
logging for all paper settings. I don't believe it was used enough to
warrant maintaining. If this is not the case it should be possible to
re-add it.
2017-03-24 22:18:58 -05:00
Zach Brown
b73556fc5c Update upstream B/CB 2017-03-18 21:01:13 -05:00
Zach Brown
a69434f9d1 Update upstream B/CB/S
Closes GH-631
2017-03-15 09:32:50 -05:00
Zach Brown
b7442eaf52 Update upstream S 2017-03-02 21:08:18 -06:00
Zach Brown
14e7575684 Update upstream B/CB 2017-02-22 22:29:13 -06:00
Zach Brown
12310fa5f3 Update upstream B/CB/S 2017-02-17 20:03:38 -06:00
Zach Brown
3e91cc60e4 Update upstream B/CB/S 2017-02-10 18:12:58 -06:00
Zach Brown
e741a89374 Update upstream CB, reduce version cache time
Closes GH-602
2017-02-07 16:29:26 -06:00
Zach Brown
e3b3799b67 Update upstream S 2017-02-04 03:59:44 -06:00
Zach Brown
789bb0b834 Update upstream CB
Closes GH-596
2017-02-01 22:48:16 -06:00
Zach Brown
a3cc3e37bd Update upstream S 2017-01-30 22:33:54 -06:00
Zach Brown
013c024ca2 Update upstream CB 2017-01-28 17:36:03 -06:00
Zach Brown
65a99a06a8 Update upstream B/CB/S 2017-01-25 22:27:42 -06:00
Zach Brown
b0348aea3e Update upstream B/CB/S 2017-01-20 05:21:44 -06:00
Zach Brown
538cd29d93 Update upstream B/CB 2017-01-14 02:11:12 -06:00
Zach Brown
b6dd3fb9d3 Update upstream B/CB
Closes GH-569
2017-01-06 15:45:59 -06:00
Aikar
eee4d138dd Update upstream - fixes more Spawn Egg issues 2017-01-02 01:58:15 -05:00
Zach Brown
fb686972fa Update upstream B/CB 2016-12-30 23:52:19 -06:00
Zach Brown
d6b19bb3c8 Update upstream CB
Closes GH-556
2016-12-27 18:46:41 -06:00
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