Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into async-chunks
* origin/master: Honor EntityAgeable#ageLock (#1481) Avoid dimension id collisions (#1487) [Auto] Updated Upstream (CraftBukkit) Allow zero revive health when it matches maxHealth [Auto] Updated Upstream (Bukkit/CraftBukkit) [Auto] Updated Upstream (Bukkit) [Auto] Updated Upstream (Bukkit/CraftBukkit)
- Loading branch information
Showing
33 changed files
with
268 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.