Learn more about cloning repositories
You have read-only access
Merge branch 'master' into enums-to-registers# Conflicts: # src/main/java/org/bukkit/block/DecoratedPot.java # src/main/java/org/bukkit/block/data/BlockData.java
Everything looks good. We'll let you know here if there's anything you should know about.
