Commits
Merge branch 'refs/heads/master' into enums-to-registers
# Conflicts: # pom.xml # src/main/java/org/bukkit/Effect.java # src/main/java/org/bukkit/Material.java # src/main/java/org/bukkit/Particle.java # src/main/java/org/bukkit/Registry.java # src/main/java/org/bukkit/Sound.java # src/main/java/org/bukkit/Tag.java # src/main/java/org/bukkit/UnsafeValues.java # src/main/java/org/bukkit/attribute/Attribute.java # src/main/java/org/bukkit/block/BlockType.java # src/main/java/org/bukkit/block/banner/PatternType.java # src/main/java/org/bukkit/enchantments/Enchantment.java # src/main/java/org/bukkit/entity/EntityType.java # src/main/java/org/bukkit/entity/Player.java # src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java # src/main/java/org/bukkit/event/player/PlayerBucketEvent.java # src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java # src/main/java/org/bukkit/inventory/ItemFactory.java # src/main/java/org/bukkit/inventory/ItemStack.java # src/main/java/org/bukkit/inventory/ItemType.java # src/main/java/org/bukkit/inventory/RecipeChoice.java # src/main/java/org/bukkit/inventory/meta/BookMeta.java # src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java # src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java # src/main/java/org/bukkit/potion/Potion.java # src/main/java/org/bukkit/potion/PotionType.java # src/test/java/org/bukkit/scoreboard/CriteriaTest.java
No tags