Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-18 08:36:13 +01:00
Code Issues Projects Releases Wiki Activity
6,266 Commits 49 Branches 14 Tags 227 MiB
ce1e7e810a
Commit Graph

843 Commits

Author SHA1 Message Date
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
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
Aikar
b59e2a51de Paper 1.9.4 Update 2016-05-12 01:01:13 -04:00
Aikar
814c534481 Update Upstream 2016-05-04 20:10:27 -04:00
Aikar
594fd61d17 update upstream 2016-05-01 15:58:10 -04:00
Zach Brown
22f1223a86
Update CB 2016-04-26 23:15:48 -05:00
Zach Brown
5b58aa20e1
Update CB 2016-04-24 19:27:43 -05:00
Aikar
9381554475 update upstream 2016-04-23 22:41:46 -04:00
Zach Brown
392d05c63d
Update CB + Paperclip 2016-04-23 15:48:56 -05:00
Zach Brown
3591fb7ed9
Update upstream Spigot and rebuild 2016-04-22 22:21:10 -05:00
Zach Brown
9abe6f6882
Update upstream CB and rebuild 2016-04-20 11:58:49 -05:00
Zach Brown
fb0ab299be
Update upstream B/CB 2016-04-17 13:36:39 -05:00
Zach Brown
189235906d
Update upstream 2016-04-12 11:31:54 -05:00
Zach Brown
ef3f6a481a
Update upstreams 2016-04-11 10:30:12 -05:00
Aikar
d8321084f8 upstream 2016-04-10 19:58:05 -04:00
Zach Brown
04064bc956
Update upstream CB 2016-04-09 20:44:54 -05:00
Zach Brown
0de12fa3ec
Update B/CB 2016-04-09 13:51:47 -05:00
Zach Brown
38d2939ff1
Update upstreams and rebuild 2016-04-08 17:24:26 -05:00
Zach Brown
1f67eb7450
Update upstream B/CB/Spigot 2016-04-07 00:32:10 -05:00
Zach Brown
daab2c8a77 Upstream merge 2016-04-05 11:42:40 -05:00
Zach Brown
bce92696c6 Update upstream and rebuild 2016-04-04 09:53:03 -05:00
DemonWav
5479e7ab80 Update Paperclip 2016-04-01 23:20:56 -05:00
DemonWav
8b66d99e73 Cleanup and restructure the project 2016-04-01 23:15:41 -05:00