diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java
index 52e61160..4ec2d29b 100644
--- a/src/main/java/appeng/block/AEBaseStairBlock.java
+++ b/src/main/java/appeng/block/AEBaseStairBlock.java
@@ -39,7 +39,7 @@ public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature
 
 	protected AEBaseStairBlock( final Block block, final EnumSet<AEFeature> features, final String type )
 	{
-		super( block.getStateFromMeta( 0 ) );
+		super( block.getDefaultState() );
 
 		Preconditions.checkNotNull( block );
 		Preconditions.checkNotNull( block.getUnlocalizedName() );
diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
index 30f7d724..fb4ce83f 100644
--- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
+++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
@@ -90,11 +90,11 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 			if( this.definition.maybeItem().isPresent() )
 			{
 				GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) );
-			}
 
-			if( side == Side.CLIENT )
-			{
-				ModelBakery.registerItemVariants( this.definition.maybeItem().get(), registryName );
+				if( side == Side.CLIENT )
+				{
+					ModelBakery.registerItemVariants( this.definition.maybeItem().get(), registryName );
+				}
 			}
 		}
 	}
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json
new file mode 100644
index 00000000..8bf7364d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/fluix" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/fluix", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/fluix.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/fluix.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/fluix", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json
new file mode 100644
index 00000000..44ad35d0
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json
new file mode 100644
index 00000000..6b8ed5ed
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json
new file mode 100644
index 00000000..b46ee72e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json
index 4b812377..30ace0b9 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json
@@ -1,46 +1,44 @@
 {
-    "variants": {
-        "normal": { "model": "appliedenergistics2:skystone.block.stairs" },
-        "inventory": { "model": "appliedenergistics2:skystone.block.stairs" },
-        "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:skystone.block.stairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:skystone.block.stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:skystone.block.stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:skystone.block.stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:skystone.block.stairs.outer" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:skystone.block.stairs.outer" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:skystone.block.stairs.outer", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:skystone.block.stairs.inner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:skystone.block.stairs.inner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:skystone.block.stairs.inner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:skystone.block.stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:skystone.block.stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:skystone.block.stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:skystone.block.stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:skystone.block.stairs.outer", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:skystone.block.stairs.inner", "x": 180, "y": 270, "uvlock": true }
-    }
-}
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.block" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.block", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.block.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.block.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json
new file mode 100644
index 00000000..4b04611f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json
new file mode 100644
index 00000000..4a7475dd
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick.small" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json
new file mode 100644
index 00000000..06553ca2
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json
@@ -0,0 +1,44 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.stone" },
+    "facing=west,half=bottom,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.stone", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.stone.outer" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.stone.inner" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json
new file mode 100644
index 00000000..04547b23
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/FluixBlock",
+    "top": "appliedenergistics2:blocks/FluixBlock",
+    "bottom": "appliedenergistics2:blocks/FluixBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json
new file mode 100644
index 00000000..3fe2ce19
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/FluixBlock",
+    "top": "appliedenergistics2:blocks/FluixBlock",
+    "bottom": "appliedenergistics2:blocks/FluixBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json
new file mode 100644
index 00000000..9619005e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/FluixBlock",
+    "top": "appliedenergistics2:blocks/FluixBlock",
+    "bottom": "appliedenergistics2:blocks/FluixBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json
new file mode 100644
index 00000000..c9a4a875
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide",
+    "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop",
+    "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json
new file mode 100644
index 00000000..a3e8a2a4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide",
+    "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop",
+    "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json
new file mode 100644
index 00000000..d78d351f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide",
+    "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop",
+    "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json
new file mode 100644
index 00000000..97ee6faf
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzBlock",
+    "top": "appliedenergistics2:blocks/QuartzBlock",
+    "bottom": "appliedenergistics2:blocks/QuartzBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json
new file mode 100644
index 00000000..e047870d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzBlock",
+    "top": "appliedenergistics2:blocks/QuartzBlock",
+    "bottom": "appliedenergistics2:blocks/QuartzBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json
new file mode 100644
index 00000000..2ac5d06d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzBlock",
+    "top": "appliedenergistics2:blocks/QuartzBlock",
+    "bottom": "appliedenergistics2:blocks/QuartzBlock"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json
new file mode 100644
index 00000000..f839aed6
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzPillarBlockSide",
+    "top": "appliedenergistics2:blocks/QuartzPillarBlockTop",
+    "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json
new file mode 100644
index 00000000..a7704f6b
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzPillarBlockSide",
+    "top": "appliedenergistics2:blocks/QuartzPillarBlockTop",
+    "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json
new file mode 100644
index 00000000..329c6815
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/QuartzPillarBlockSide",
+    "top": "appliedenergistics2:blocks/QuartzPillarBlockTop",
+    "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json
new file mode 100644
index 00000000..37836264
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json
new file mode 100644
index 00000000..f3183323
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json
new file mode 100644
index 00000000..ca5a7954
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json
new file mode 100644
index 00000000..a029a76f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json
new file mode 100644
index 00000000..d26f5c38
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json
new file mode 100644
index 00000000..1cafa9b5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json
new file mode 100644
index 00000000..03956170
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json
new file mode 100644
index 00000000..799f53d6
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json
new file mode 100644
index 00000000..5e9a19d9
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json
new file mode 100644
index 00000000..7c0c4d26
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/inner_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json
new file mode 100644
index 00000000..3cc77402
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json
new file mode 100644
index 00000000..ed596c2d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json
@@ -0,0 +1,8 @@
+{
+  "parent": "block/outer_stairs",
+  "textures": {
+    "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE",
+    "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json
index 762647b3..5196f2d5 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/fluix/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/fluix"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json
index de74f62f..0ac31601 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/quartz/certus/chiseled/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/quartz.certus.chiseled"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json
index 9eaeeb5e..c2c1e7cd 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/quartz/certus/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/quartz.certus"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json
index 44632e0f..9859adcd 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/quartz/certus/pillar/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/quartz.certus.pillar"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json
index f2af8ffa..e2032c9d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json
@@ -1,3 +1,3 @@
 {
-    "parent": "appliedenergistics2:block/skystone.block.stairs"
+  "parent": "appliedenergistics2:block/stairs/skystone.block"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json
index 736bee77..64c496df 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/skystone/brick/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/skystone.brick"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json
index dd139e46..7060c436 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/skystone/brick/small/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/skystone.brick.small"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json
index 4821dc01..50b61298 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json
@@ -1,13 +1,3 @@
 {
-  "parent": "appliedenergistics2:block/stair/skystone/stone/block",
-  "display": {
-    "thirdperson": {
-      "rotation": [ 10, -45, 170 ],
-      "translation": [ 0, 1.5, -2.75 ],
-      "scale": [ 0.375, 0.375, 0.375 ]
-    },
-    "gui": {
-      "rotation": [ 0, 180, 0 ]
-    }
-  }
+  "parent": "appliedenergistics2:block/stairs/skystone.stone"
 }