Merge master into bleeding for changes.

SpongePowered · Feb 3, 2016 · 87f7d6f · 87f7d6f
2 parents d136502 + 48ca19d
commit 87f7d6f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/spongepowered/api/block/BlockState.java b/src/main/java/org/spongepowered/api/block/BlockState.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.block;
 
+import org.spongepowered.api.CatalogType;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.block.tileentity.TileEntity;
 import org.spongepowered.api.block.trait.BlockTrait;
@@ -50,7 +51,7 @@
  * a single instance of a particular {@link BlockState} as they are immutable,
  * a particular instance may be cached for various uses.
  */
-public interface BlockState extends ImmutableDataHolder<BlockState>, DirectionRelativePropertyHolder {
+public interface BlockState extends ImmutableDataHolder<BlockState>, DirectionRelativePropertyHolder, CatalogType {
 
     /**
      * Creates a new {@link Builder} for building {@link BlockState}s.