Commit Graph

3 Commits

Author SHA1 Message Date
William Blake Galbreath
6ee7cbceeb Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
2020-08-23 20:39:32 -05:00
William Blake Galbreath
cae1e7eb26 Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
47740f67 Updated Upstream (CraftBukkit)
948c20e0 Merge remote-tracking branch 'origin/master' into progress/1.16.2
60a5ca6d Fix regex mistake in CB NBT int deserialization (#4146)
2020-08-17 21:10:02 -05:00
William Blake Galbreath
ad8b66099f Fix right click sign editor color codes 2020-08-15 05:24:03 -05:00