Commit graph

275 commits

Author SHA1 Message Date
Shane Freeder
45c25c868e Update B/CB 2017-10-09 10:15:17 +01:00
Shane Freeder
d649f90be0 Update CB/S 2017-10-07 09:57:38 +01:00
Shane Freeder
d398f6ccf6 Update CraftBukkit 2017-10-03 21:12:34 +01:00
Shane Freeder
2727dfbafc Update craftbukkit 2017-10-01 01:57:01 +01:00
DemonWav
9705fff3dc Update Paperclip
Undoes the cache directory placement in the same directory as the
Paperclip jar.
2017-09-28 17:11:58 -05:00
Zach Brown
4187be885c Update upstream CB 2017-09-28 12:49:41 -04:00
Kyle Wood
6b2013d8b9 Update to final Java 9 compatible Paperclip 2017-09-25 21:28:14 -05:00
Kyle Wood
c343408d4d Update Paperclip, fixes subdirectory issue 2017-09-24 23:14:16 -05:00
Zach Brown
8bb5dda0f2 Update paperclip 2017-09-24 14:38:20 -04:00
DemonWav
1f65945d1c Update Paperclip 2017-09-23 13:25:57 -05:00
DemonWav
81d69d5889 Move eclipse compiler patch to POM changes patch
Also update to Paperclip 1.1-SNAPSHOT
2017-09-23 13:17:20 -05:00
Zach Brown
7be477c2cc Update upstream CB
Fixes GH-887
2017-09-18 22:01:43 -04:00
Zach Brown
0a9f8c2d56 Update B 2017-09-18 12:03:48 -04:00
Shane Freeder
5ce5ef1c9f Update to 1.12.2, May the Tacos be with you 2017-09-18 12:04:01 +01:00
Shane Freeder
9f7b45a945 Update CB, refactor 0229-Fix-this-stupid-bullshit
Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts
when spigot decides to update the timer and to provide some form of hint in the
console/log on startup.
2017-09-15 15:37:05 +01:00
Shane Freeder
89e69d652f Update CB/S 2017-09-09 08:17:12 +01:00
CDAGaming
d8c452b7e9 Update CB & B (#876) 2017-09-06 11:31:37 -05:00
CDAGaming
4d87864e6e Update CB and B (#873) 2017-09-02 13:01:45 -05:00
CDAGaming
0e3ea47b9f Update CB 2017-08-31 17:38:48 -05:00
CDAGaming
6c6ebe9236 Update Bukkit 2017-08-26 11:27:46 -05:00
CDAGaming
dbcc462822 Update CB and BD 2017-08-23 09:13:12 -05:00
Shane Freeder
e78847f843 Update B 2017-08-20 11:50:29 +01:00
Shane Freeder
7fc4d26c3f Update CB 2017-08-16 16:47:06 +01:00
Shane Freeder
a6eb798352 Update S 2017-08-12 22:32:01 +01:00
Shane Freeder
4bf6691021 Update CB 2017-08-11 12:02:53 +01:00
Shane Freeder
fbeadaefff Update CB (#846) 2017-08-09 19:44:28 +01:00
Aikar
64b2b87256 Upstream update 2017-08-07 23:05:16 -04:00
Shane Freeder
2c4293b0f6 Update B/CB/S 2017-08-05 23:36:47 +01:00
Zach Brown
04e2290f72 Update upstream CB 2017-08-04 22:10:30 -05:00
BlackHole
01d1cc351b Update to 1.12.1 2017-08-03 16:36:06 +02:00
Aikar
489fda430a Update Upstream 2017-07-30 18:41:08 -04:00
Shane Freeder
fe649493e3 Update B/CB 2017-07-28 14:45:16 +01:00
Aikar
4265551308 Upstream update 2017-07-26 21:12:40 -04:00
Zach Brown
b7336e0204 Update upstream CB 2017-07-24 06:47:43 -05:00
Zach Brown
9115bf4ca0 Update upstream CB 2017-07-22 20:16:06 -05:00
Shane Freeder
dde8cb0bc6 Update C 2017-07-19 23:02:48 +01:00
Aikar
a289bd5949 Update upstream (memory leak fix) 2017-07-16 20:36:27 -04:00
Zach Brown
e35d569526 Update upstream CB 2017-07-15 14:57:50 -05:00
Shane Freeder
43d46feb48 Update B/CB 2017-07-10 14:04:41 +01:00
Shane Freeder
b1c4f49c7a Update C 2017-07-09 10:56:36 +01:00
Aikar
61bbe8c3b3 Update upstream 2017-06-30 18:13:06 -05:00
Aikar
70d35b0de5 Update upstream, pretty important bug fix 2017-06-25 21:49:36 -04:00
Aikar
46e300045a Update upstream 2017-06-25 20:26:00 -04:00
Zach Brown
e644762d67 Update upstream S
Fixes build
2017-06-25 18:37:00 -05:00
Zach Brown
3f5b488720 Update upstream B/CB 2017-06-25 18:00:32 -05:00
Zach Brown
7409728bf3 Update upstream CB 2017-06-24 13:52:44 -05:00
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