Commits

DerFrZocker authored b2f7a90c046 Merge 
Merge branch 'refs/heads/master' into enums-to-registers

# Conflicts:
#	src/main/java/org/bukkit/Art.java
#	src/main/java/org/bukkit/block/BlockType.java
#	src/main/java/org/bukkit/entity/EntityType.java
#	src/main/java/org/bukkit/inventory/ItemType.java
#	src/test/java/org/bukkit/support/TestServer.java
No tags
7c5cf0c95ef
experimental

src/main/java/org/bukkit/attribute/AttributeModifier.java

Modified

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut