[Auto] Update Upstream

Browse Source

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing.

Bukkit Changes:
97d31e64 Add merging and matching of parsed BlockData

CraftBukkit Changes:
cfc67965 Add merging and matching of parsed BlockData

...

This commit is contained in:

Automated

2018-08-06 00:58:30 -04:00

parent 6ed32b2c2d

commit 57e7f2a19d

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

work/Bukkit

Submodule work/Bukkit updated: d2834556b1...97d31e64a5

2

work/CraftBukkit

Submodule work/CraftBukkit updated: a9c796f12c...cfc67965f3