1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-22 04:33:28 +01:00

[Auto] Update Upstream

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

@ -1 +1 @@
Subproject commit d2834556b1032e98f2ff3125340e792bf19b0ec1
Subproject commit 97d31e64a5e4206b4c191f1d313d7c5fc5db88e4

@ -1 +1 @@
Subproject commit a9c796f12cf00276e4e22de8a54138235c1cea72
Subproject commit cfc67965f397a7d1b930f4212eba07120a43b5f9