Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-07-10 05:34:59 +02:00
Code Issues Projects Releases Wiki Activity
3,697 Commits 48 Branches 10 Tags 222 MiB
06f15f54ba
Commit Graph

407 Commits

Author SHA1 Message Date
Shane Freeder
89a61a21ef
Update B/CB 2018-02-12 17:37:33 +00:00
Shane Freeder
212a6811db
Update B/CB 2018-01-24 17:31:43 +00:00
Aikar
91977496cc
Update upstream 2018-01-21 14:03:55 -05:00
Aikar
7c60dbe814
update upstream for spigot-3764 fix 2018-01-14 16:15:56 -05:00
Zach Brown
d8c81d20d8
Update upstream B/CB/S 2018-01-10 23:31:19 -06:00
Zach Brown
e32efa9a5a
Update upstream B/CB 2018-01-08 15:22:44 -06:00
Zach Brown
06818d2dd7
Update upstream CB/S 2018-01-05 00:46:00 -06:00
Zach Brown
fc911a20f5
Update upstream B/CB/S 2018-01-04 02:04:31 -06:00
Aikar
ab5109009c
upstream update 2018-01-01 20:09:39 -05:00
Aikar
c3432c8d29
Update Upstream 2018-01-01 16:29:33 -05:00
Shane Freeder
27a4d45e39
Update B/CB 2017-12-31 13:45:47 +00:00
Shane Freeder
32b75c814a
Update B/CB 2017-12-30 08:55:15 +00:00
Shane Freeder
1180d8f383
Update B 2017-12-28 16:56:31 +00:00
Zach Brown
eb0f5adfdc
Update upstream B/CB/S 2017-12-27 22:45:33 -06:00
Shane Freeder
a1b538fc71
Update CB 2017-12-26 00:52:24 +00:00
Aikar
099911fbd1
Update upstream 2017-12-17 01:34:54 -05:00
Zach Brown
f9c8c9eecf
Update upstream CB 2017-12-12 21:34:50 -05:00
Aikar
ad40e694a3
Update upstream 2017-12-09 12:37:09 -05:00
Shane Freeder
eefbd63ea9
Update B/CB 2017-12-07 01:07:36 +00:00
Shane Freeder
a693cb21ab
Update B/CB/S 2017-12-05 01:34:10 +00:00
Shane Freeder
1912d06613
Update B/CB 2017-11-24 07:14:38 +00:00
Shane Freeder
6c5d4f75ee
Update B/CB 2017-11-20 14:50:30 +00:00
Shane Freeder
7f12781017
Update B/CB/S 2017-11-18 03:04:21 +00:00
Shane Freeder
caec68907d
Update B/CB/S 2017-11-17 09:55:26 +00:00
Shane Freeder
33bf9031be
Update B/CB 2017-11-16 07:16:50 +00:00
Aikar
9af72652cd Update CB Upstream 2017-11-12 18:53:38 -05:00
Zach Brown
bc1804b0e4
Update B/CB/S 2017-11-10 17:31:39 -05:00
Brokkonaut
6870574dcf Update CB 2017-11-09 03:36:59 +01:00
Shane Freeder
1d03f56bd6
Update B/CB/S 2017-11-08 16:13:57 +00:00
Shane Freeder
23fa02d399
Update B/CB/S 2017-10-29 15:19:21 +00:00
Shane Freeder
47def2d7b9
Update CB 2017-10-17 14:05:49 +01:00
Shane Freeder
e9eb9ec7eb
Update CB 2017-10-13 22:07:48 +01:00
Shane Freeder
599d18420d
Update B/CB 2017-10-09 10:15:17 +01:00
Shane Freeder
4e44c2b38c
Update CB/S 2017-10-07 09:57:38 +01:00
Shane Freeder
aea7f3a02a
Update CraftBukkit 2017-10-03 21:12:34 +01:00
Shane Freeder
30b9b403e2
Update craftbukkit 2017-10-01 01:57:01 +01:00
DemonWav
febbd49147
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
698f8bd7c2 Update upstream CB 2017-09-28 12:49:41 -04:00
Kyle Wood
6af424cb45
Update to final Java 9 compatible Paperclip 2017-09-25 21:28:14 -05:00
Kyle Wood
1fd3be5bfa
Update Paperclip, fixes subdirectory issue 2017-09-24 23:14:16 -05:00
Zach Brown
219f850ae6
Update paperclip 2017-09-24 14:38:20 -04:00
DemonWav
4fb6555d6e
Update Paperclip 2017-09-23 13:25:57 -05:00
DemonWav
f3b8afd56a
Move eclipse compiler patch to POM changes patch 
Also update to Paperclip 1.1-SNAPSHOT
 2017-09-23 13:21:02 -05:00
Zach Brown
88ba5fcaac
Update upstream CB 
Fixes GH-887
 2017-09-18 22:01:43 -04:00
Zach Brown
71e2d0e88c
Update B 2017-09-18 12:03:48 -04:00
Shane Freeder
d934dcc1e3
Update to 1.12.2, May the Tacos be with you 2017-09-18 12:04:01 +01:00
Shane Freeder
836db0ec9c
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
2104c3a683
Update CB/S 2017-09-09 08:17:12 +01:00
CDAGaming
15a47148c7 Update CB & B (#876) 2017-09-06 12:31:37 -04:00
CDAGaming
f520871b4f Update CB and B (#873) 2017-09-02 14:01:45 -04:00
CDAGaming
d375188e15 Update CB 2017-08-31 17:38:48 -05:00
CDAGaming
40426d52ad Update Bukkit 2017-08-26 11:27:46 -05:00
CDAGaming
84c2351e37 Update CB and BD 2017-08-23 09:13:12 -05:00
Shane Freeder
48d8add662
Update B 2017-08-20 11:50:29 +01:00
Shane Freeder
4368f412c6
Update CB 2017-08-16 16:47:06 +01:00
Shane Freeder
d77731eee2
Update S 2017-08-12 22:51:29 +01:00
Shane Freeder
912ee23e25
Update CB 2017-08-11 13:05:23 +01:00
Shane Freeder
42faa9e529 Update CB (#846) 2017-08-09 14:44:28 -04:00
Aikar
ff5bd7b03b Upstream update 2017-08-07 23:05:16 -04:00
Shane Freeder
bec1253aa9
Update B/CB/S 2017-08-06 00:08:21 +01:00
Zach Brown
f7e23ba7fa
Update upstream CB 2017-08-04 22:10:30 -05:00
BlackHole
6879328bf6 Update to 1.12.1 2017-08-03 17:27:54 +02:00
Aikar
cdd6d8562a Update Upstream 2017-07-30 18:41:08 -04:00
Shane Freeder
fed4815fff
Update B/CB 2017-07-28 15:51:46 +01:00
Aikar
dcd4f3710f Upstream update 2017-07-26 21:12:40 -04:00
Zach Brown
43543c78c4
Update upstream CB 2017-07-24 06:47:43 -05:00
Zach Brown
c9b00ce95d
Update upstream CB 2017-07-22 20:16:06 -05:00
Shane Freeder
8d10a38779
Update C 2017-07-19 23:02:48 +01:00
Aikar
a7cb000633 Update upstream (memory leak fix) 2017-07-16 20:36:27 -04:00
Zach Brown
9a536c5a7b
Update upstream CB 2017-07-15 14:57:50 -05:00
Shane Freeder
18be9d24e4
Update B/CB 2017-07-10 14:04:41 +01:00
Shane Freeder
1e4d3c3106
Update C 2017-07-09 10:56:36 +01:00
Aikar
a92bce595d Update upstream 2017-06-30 18:13:06 -05:00
Aikar
7cd81967b4 Update upstream, pretty important bug fix 2017-06-25 21:49:58 -04:00
Aikar
3244d917f3 Update upstream 2017-06-25 20:26:00 -04:00
Zach Brown
dedf848bea
Update upstream S 
Fixes build
 2017-06-25 18:37:00 -05:00
Zach Brown
b61aec52a4
Update upstream B/CB 2017-06-25 18:00:32 -05:00
Zach Brown
4793368f72
Update upstream CB 2017-06-24 13:52:44 -05:00
Aikar
7daa2e11b9 Update upstream 2017-06-22 23:14:20 -04:00
Zach Brown
8a45451a97
Update upstream B/CB/S 2017-06-21 22:12:40 -05:00
Aikar
825834273c update upstream 2017-06-20 18:53:55 -04:00
Zach Brown
272f130b5a
Update upstream CB/S 2017-06-18 20:37:08 -05:00
Zach Brown
76cede4391
Update upstream CB 2017-06-17 14:18:29 -05:00
Zach Brown
2b51986c25
Update upstream B/CB/S 2017-06-12 22:28:09 -05:00
Zach Brown
cce9b7a866
Update upstream CB 2017-06-11 23:25:44 -05:00
Zach Brown
263bd3f539
Update upstream CB/S 2017-06-11 12:03:07 -05:00
Aikar
8121250409 upstream update 2017-06-10 13:14:52 -04:00
Aikar
19e9e0d647 Update upstream 2017-06-09 08:29:44 -04:00
Shane Freeder
3c9f2a0a20
Update Paper to MC 1.12 2017-06-08 15:17:11 +01:00
Zach Brown
bd34f2060d
Update upstream B/CB 2017-06-04 15:11:50 -05:00
Zach Brown
04d2d38581
Update upstream B/CB 2017-06-02 23:41:05 -05:00
Shane Freeder
adab11a1f7
Update to 1.12-pre6 2017-05-31 22:12:46 -05:00
Zach Brown
a7d4bd3735
Update upstream B/CB 2017-05-29 16:11:54 -05:00
Zach Brown
066f383b95
Update upstream B/CB/S 2017-05-27 23:25:17 -05:00
Zach Brown
8e2ea2277b
Update upstream B/CB 2017-05-26 22:09:24 -05:00
Zach Brown
720769bf30
Update upstream B/S 2017-05-23 17:11:28 -05:00
Zach Brown
c1d0b4b4c6
Update Paper to MC 1.12-pre5 2017-05-20 23:49:56 -05:00
Zach Brown
210ef18495
Merge branch 'master' into pre/1.12 2017-05-17 17:53:13 -05:00
Shane Freeder
ca6254067f
Workaround a jansi bug with Windows 
Update Paperclip too while we're here
 2017-05-17 17:51:54 -05:00
Zach Brown
6bfe26df49
Update upstream CB 2017-05-17 17:24:58 -05:00
Zach Brown
19134fa224
Update upstream B/CB 2017-05-16 17:17:58 -05:00
Zach Brown
baf762a2c1
Update upstream B/CB/S 2017-05-15 11:25:20 -05:00
Zach Brown
828d600143
Update API patches to MC 1.12pre2 2017-05-14 08:46:44 -05:00
Zach Brown
e4f891c95a
Update Paperclip 2017-05-14 04:23:06 -05:00
Zach Brown
3052144be8
Update upstream CB 2017-05-13 20:37:46 -05:00
Zach Brown
6c3faf6aa3
Update upstream B/CB/S 2017-05-04 18:08:52 -05:00
Zach Brown
8b2122a291
Update upstream B/CB/S 2017-04-28 19:25:52 -05:00
Zach Brown
157528a29e
Update upstream S 2017-04-25 18:22:29 -05:00
Zach Brown
f68b2ab95e
Update upstream CB/S 2017-04-22 17:41:28 -05:00
Zach Brown
9db28f00db
Update upstream B/CB 2017-04-21 23:42:59 -05:00
Zach Brown
2f7c5949d0
Update upstream CB 2017-04-20 18:12:03 -05:00
Zach Brown
d5cf14188a
Update upstream B/CB 2017-04-20 08:22:40 -05:00
Zach Brown
63beca49fe
Update upstream B/CB/S 
Closes GH-658
 2017-04-16 17:12:14 -05:00
Zach Brown
362e425271
Update upstream CB/S 2017-04-10 22:11:26 -05:00
Zach Brown
6127ca1b6e
Update upstream B/CB 2017-04-04 22:38:08 -05:00
Zach Brown
e4a071f6e4
Update upstream B/CB 2017-03-31 23:24:42 -05:00
Zach Brown
e6a7d357ce
Update upstream CB 2017-03-30 18:26:00 -05:00
Zach Brown
07d0098a9e
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:27:43 -05:00
Zach Brown
dbabbdbdbe
Update upstream B/CB 2017-03-18 21:01:13 -05:00
Zach Brown
7f3aa1ed29
Update upstream B/CB/S 
Closes GH-631
 2017-03-15 09:32:50 -05:00
Zach Brown
71d0330810
Update upstream S 2017-03-02 21:08:18 -06:00
Zach Brown
c7638800ac
Update upstream B/CB 2017-02-22 22:29:13 -06:00
Zach Brown
ae98591b8c
Update upstream B/CB/S 2017-02-17 20:03:38 -06:00
Zach Brown
5031a31da5
Update upstream B/CB/S 2017-02-10 18:12:58 -06:00
Zach Brown
919cb9d19a
Update upstream CB, reduce version cache time 
Closes GH-602
 2017-02-07 16:29:26 -06:00
Zach Brown
d3544dad18
Update upstream S 2017-02-04 03:59:44 -06:00
Zach Brown
8878ecc5f3
Update upstream CB 
Closes GH-596
 2017-02-01 22:48:16 -06:00
Zach Brown
1e1541a2e9
Update upstream S 2017-01-30 22:33:54 -06:00
Zach Brown
e08ef5457a
Update upstream CB 2017-01-28 17:36:03 -06:00
Zach Brown
88205cd8fe
Update upstream B/CB/S 2017-01-25 22:27:42 -06:00
Zach Brown
c1641b8e0c
Update upstream B/CB/S 2017-01-20 05:21:44 -06:00
Zach Brown
28c0441d02
Update upstream B/CB 2017-01-14 02:11:12 -06:00
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
Zach Brown
7be0340f48
Update upstream CB 2016-10-22 15:24:15 -05:00
Zach Brown
92567cc43a
Update upstream B/CB 2016-10-21 15:28:44 -05:00
Zach Brown
2645ee04ae
Update upstream CB 2016-10-16 15:35:34 -05:00
Zach Brown
8377df063a
Update upstream CB/S 2016-10-13 17:29:38 -05:00
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