OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity
9035 commits 45 branches 0 tags 287 MiB
Commit graph

1033 commits

Author SHA1 Message Date
Shane Freeder
7c23108a2d Update B/CB 2017-11-16 07:16:50 +00:00
Aikar
1f4f072193 Update CB Upstream 2017-11-12 18:53:38 -05:00
Zach Brown
f141bae102 Update B/CB/S 2017-11-10 17:31:39 -05:00
Brokkonaut
44aa7d0ef4 Update CB 2017-11-09 03:36:59 +01:00
Shane Freeder
6d76e5b46a Update B/CB/S 2017-11-08 16:13:57 +00:00
Shane Freeder
c738f996e8 Update B/CB/S 2017-10-29 15:19:21 +00:00
Shane Freeder
141f231181 Update CB 2017-10-17 14:05:49 +01:00
Shane Freeder
0e26fc4fbb Update CB 2017-10-13 22:07:48 +01:00
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
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
Zach Brown
2ea9521f37 Update upstream B/CB 2016-11-03 14:27:37 -05:00
Zach Brown
122d3d9d43 Update upstream S 2016-10-26 16:05:22 -05:00
Zach Brown
ba280d2292 Update upstream CB 2016-10-24 21:03:31 -05:00
Zach Brown
5b6d46e4c8 Update upstream CB 2016-10-23 01:32:04 -05:00
Zach Brown
714413ff1e Update upstream CB 2016-10-22 15:24:15 -05:00
Zach Brown
2515c80051 Update upstream B/CB 2016-10-21 15:28:44 -05:00
Zach Brown
0df1dae663 Update upstream CB 2016-10-16 15:35:34 -05:00
Zach Brown
f1e5f599ca Update upstream CB/S 2016-10-13 17:29:38 -05:00
Zach Brown
8e6ecaeae0 Update upstream CB 2016-10-10 21:29:08 -05:00
Zach Brown
40f1788ef3 Update upstream CB 2016-10-05 16:08:40 -05:00
Zach Brown
ab9bbceba9 Update paperclip 2016-10-01 22:23:28 -05:00
Zach Brown
abd7523079 Update upstream B/CB/S 2016-10-01 11:47:56 -05:00
Zach Brown
d6618994b5 Update upstream CB 2016-09-20 15:59:26 -05:00
Zach Brown
bc24e29dc5 Update upstream CB 2016-09-18 13:37:38 -05:00
Zach Brown
ca7a828688 Update upstrean CB/S 2016-09-11 14:55:02 -05:00
Zach Brown
64c6e06d95 Update upstream B/CB/S 2016-09-05 14:21:03 -05:00
Zach Brown
b4eceb16ec Update upstream B/CB 2016-09-04 16:59:06 -05:00
Riley Park
7a403d82a0 @Zbob750 missed a few name changes 2016-09-04 06:26:05 +00:00
Zach Brown
e1423d87ba Update upstream B/CB/S 2016-09-02 22:44:52 -05:00
Zach Brown
fcbbc76319 Update upstream B/CB/S 
Remove two features added upstream
 2016-08-27 18:41:58 -05:00
Zach Brown
a9481ee3c7 Update upstream CB 2016-08-21 14:52:19 -05:00
Zach Brown
aec2bb905c Update upstream B/S 2016-08-15 18:51:55 -05:00
Zach Brown
be420541b7 Update upstream B/CB 2016-08-11 15:07:07 -05:00
Zach Brown
f91686b6db Update upstream B/CB 2016-08-07 00:01:31 -05:00
Zach Brown
4db0ba851c Update upstream B/CB/S 2016-07-30 18:02:34 -05:00
Zach Brown
608d77d492 Update upstream B/CB 2016-07-26 19:30:03 -05:00
Zach Brown
359f9ad8cf Update upstream CB 2016-07-22 17:24:30 -05:00
Zach Brown
719164b4ce Update upstream B/CB/S 2016-07-15 17:36:53 -05:00
Zach Brown
aff7563c30 Update upstream B/CB/S 2016-07-12 23:22:58 -05:00
Aikar
0c18db0e44 Upstream burritos, maybe tacos, and churros. 2016-07-08 00:17:25 -04:00
Zach Brown
93dca2c0de Update upstream B/CB/S 2016-07-07 21:06:58 -05:00
Zach Brown
d5a6e263fd Update upstream tacos B/CB/S 2016-07-04 18:49:14 -05:00
Aikar
122f47ac1c More Upstream tacos 2016-06-30 01:38:53 -04:00
Aikar
cb334f6321 Upstream tacos 2016-06-30 01:23:30 -04:00
Zach Brown
fd6048a265 Update upstream CB 2016-06-27 21:21:08 -05:00
Zach Brown
b978b76443 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
de4a16ead0 Update upstream B/CB/S 2016-06-26 14:13:00 -05:00
Zach Brown
e93299df87 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
57cff1f17f Update to MC 1.10.2 2016-06-25 12:19:04 -05:00
Aikar
03553d232e Update upstream 2016-06-22 22:18:41 -04:00
Zach Brown
7253bb10ca Update upstream B/CB 2016-06-19 21:41:46 -05:00
Zach Brown
dd7b44ce04 Update upstream B/CB/S 2016-06-16 18:22:35 -05:00
Zach Brown
3497f7000d Update upstreams 2016-06-15 17:43:51 -05:00
Zach Brown
03eeadc2df Update upstream B/CB 
Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
 2016-06-13 18:42:08 -05:00
Zach Brown
55fe08d4b9 Update upstream CB/S 2016-06-12 12:00:07 -05:00
Zach Brown
0aaf5eb95c Update upstream B/CB 2016-06-11 22:22:27 -05:00
Zach Brown
2a773b737b Update upstream and rebuild 2016-06-11 14:58:54 -05:00
Brokkonaut
044978f8cc Update upstream CB/S 2016-06-09 19:28:16 +02:00
Zach Brown
8ab69858ac Update upstream CB 2016-06-09 00:24:23 -05:00
Zach Brown
9b192b2708 Update to Minecraft 1.10 2016-06-08 22:57:14 -05:00
Aikar
ec95eb86f7 Update Upstream 2016-06-04 11:41:04 -04:00
Zach Brown
44ddc211c4 Update upstream 2016-06-01 22:52:52 -05:00
Zach Brown
6c11d95680 Update upstreams 2016-05-29 18:32:21 -05:00
Zach Brown
ff2c1ee38e Update upstreams 2016-05-27 21:22:18 -05:00
Aikar
45aa7db5c4 Update Upstream 2016-05-25 12:37:17 -04:00
Zach Brown
32ea7542d2 Update upstream CB 
Closes GH-303
 2016-05-21 22:07:14 -05:00
Zach Brown
143ab568d4 Update B/CB/S 
Closes GH-288
 2016-05-20 17:32:50 -05:00
Zach Brown
af4db4ddea [16:55:31] *mibby pokes upstream 2016-05-16 17:00:53 -05:00
Aikar
34fcd8ccc2 Paper 1.9.4 Update 2016-05-11 22:07:46 -04:00
Aikar
22d5cbee82 Update Upstream 2016-05-04 20:10:27 -04:00
Aikar
4e7355aa95 update upstream 2016-05-01 15:58:10 -04:00
Zach Brown
8c96f893c8 Update CB 2016-04-26 23:15:39 -05:00
Zach Brown
ee1ea990e1 Update CB 2016-04-24 19:27:43 -05:00
Aikar
71db253321 update upstream 2016-04-23 22:41:46 -04:00
Zach Brown
ef8ee10bd6 Update CB + Paperclip 2016-04-23 15:47:25 -05:00
Zach Brown
36394d5284 Update upstream Spigot and rebuild 2016-04-22 22:20:34 -05:00
Zach Brown
08cfefeb50 Update upstream CB and rebuild 2016-04-20 11:58:49 -05:00
Zach Brown
85e00ed1ab Update upstream B/CB 2016-04-17 13:36:39 -05:00
Zach Brown
14f6bee0a1 Update upstream 2016-04-12 11:31:54 -05:00
Zach Brown
f54aa3ca2c Update upstreams 2016-04-11 10:30:12 -05:00
Aikar
52ca5f228b upstream 2016-04-10 19:58:05 -04:00
Zach Brown
309e2bd0d3 Update upstream CB 2016-04-09 20:44:54 -05:00
Zach Brown
b6dd739ed4 Update B/CB 2016-04-09 13:51:47 -05:00
Zach Brown
c7bdf516da Update upstreams and rebuild 2016-04-08 17:24:26 -05:00
Zach Brown
933829f334 Update upstream B/CB/Spigot 2016-04-07 00:32:10 -05:00
Zach Brown
b4a0af94bb Upstream merge 2016-04-05 11:42:40 -05:00
Zach Brown
3506f09ca7 Update upstream and rebuild 2016-04-04 09:53:03 -05:00
DemonWav
d89cd16ecb Update Paperclip 2016-04-01 23:20:56 -05:00
DemonWav
09812092f9 Cleanup and restructure the project 2016-04-01 22:55:54 -05:00