diff --git a/src/main/java/com/simibubi/create/AllBlockTags.java b/src/main/java/com/simibubi/create/AllBlockTags.java
index 71864a2a0..15690638b 100644
--- a/src/main/java/com/simibubi/create/AllBlockTags.java
+++ b/src/main/java/com/simibubi/create/AllBlockTags.java
@@ -8,7 +8,10 @@ import net.minecraft.util.ResourceLocation;
 
 public enum AllBlockTags {
 
-	WINDMILL_SAILS;
+	WINDMILL_SAILS,
+	FAN_HEATERS,
+	
+	;
 
 	public Tag<Block> tag;
 
diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java
index 06362e269..f04093824 100644
--- a/src/main/java/com/simibubi/create/AllBlocks.java
+++ b/src/main/java/com/simibubi/create/AllBlocks.java
@@ -53,6 +53,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.Block.Properties;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.block.FenceBlock;
 import net.minecraft.block.FenceGateBlock;
 import net.minecraft.block.RotatedPillarBlock;
@@ -141,6 +142,7 @@ public enum AllBlocks {
 	INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB),
 	SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
 	MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
+	LIMESAND(new FallingBlock(Properties.from(Blocks.SAND))),
 	LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
 	LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
 	POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB),
diff --git a/src/main/java/com/simibubi/create/AllRecipes.java b/src/main/java/com/simibubi/create/AllRecipes.java
index f77466f78..6757954aa 100644
--- a/src/main/java/com/simibubi/create/AllRecipes.java
+++ b/src/main/java/com/simibubi/create/AllRecipes.java
@@ -18,7 +18,7 @@ import net.minecraftforge.event.RegistryEvent;
 
 public enum AllRecipes {
 
-	PLACEMENT_HANDGUN_UPGRADE(BuilderGunUpgradeRecipe.Serializer::new, Types.BLOCKZAPPER_UPGRADE),
+	BLOCKZAPPER_UPGRADE(BuilderGunUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING),
 	CRUSHING(() -> new ProcessingRecipeSerializer<>(CrushingRecipe::new), Types.CRUSHING),
 	SPLASHING(() -> new ProcessingRecipeSerializer<>(SplashingRecipe::new), Types.SPLASHING),
 	PRESSING(() -> new ProcessingRecipeSerializer<>(PressingRecipe::new), Types.PRESSING),
@@ -29,7 +29,6 @@ public enum AllRecipes {
 		public static IRecipeType<CrushingRecipe> CRUSHING = register("crushing");
 		public static IRecipeType<SplashingRecipe> SPLASHING = register("splashing");
 		public static IRecipeType<PressingRecipe> PRESSING = register("pressing");
-		public static IRecipeType<BuilderGunUpgradeRecipe> BLOCKZAPPER_UPGRADE = register("blockzapper_upgrade");
 
 		static <T extends IRecipe<?>> IRecipeType<T> register(final String key) {
 			return Registry.register(Registry.RECIPE_TYPE, new ResourceLocation(key), new IRecipeType<T>() {
diff --git a/src/main/java/com/simibubi/create/ClientEvents.java b/src/main/java/com/simibubi/create/ClientEvents.java
index 6a1514c99..a77b9bdd2 100644
--- a/src/main/java/com/simibubi/create/ClientEvents.java
+++ b/src/main/java/com/simibubi/create/ClientEvents.java
@@ -3,7 +3,7 @@ package com.simibubi.create;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.simibubi.create.compat.jei.AnimatedKinetics;
+import com.simibubi.create.compat.jei.AnimationTickHolder;
 import com.simibubi.create.foundation.block.IBlockWithScrollableValue;
 import com.simibubi.create.foundation.gui.ScreenOpener;
 import com.simibubi.create.foundation.utility.TooltipHelper;
@@ -38,7 +38,7 @@ public class ClientEvents {
 		if (event.phase == Phase.START)
 			return;
 		
-		AnimatedKinetics.tick();
+		AnimationTickHolder.tick();
 		
 		if (!isGameActive())
 			return;
diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java
index 5397e445b..8ed54062d 100644
--- a/src/main/java/com/simibubi/create/CreateClient.java
+++ b/src/main/java/com/simibubi/create/CreateClient.java
@@ -1,11 +1,15 @@
 package com.simibubi.create;
 
+import com.simibubi.create.modules.contraptions.CachedBufferReloader;
 import com.simibubi.create.modules.contraptions.receivers.EncasedFanParticleHandler;
 import com.simibubi.create.modules.schematics.ClientSchematicLoader;
 import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler;
 import com.simibubi.create.modules.schematics.client.SchematicHandler;
 import com.simibubi.create.modules.schematics.client.SchematicHologram;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.IReloadableResourceManager;
+import net.minecraft.resources.IResourceManager;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@@ -22,7 +26,7 @@ public class CreateClient {
 	public static EncasedFanParticleHandler fanParticles;
 
 	public static ModConfig config;
-	
+
 	@SubscribeEvent
 	public static void clientInit(FMLClientSetupEvent event) {
 		schematicSender = new ClientSchematicLoader();
@@ -30,19 +34,23 @@ public class CreateClient {
 		schematicHologram = new SchematicHologram();
 		schematicAndQuillHandler = new SchematicAndQuillHandler();
 		fanParticles = new EncasedFanParticleHandler();
-		
+
 		AllKeys.register();
 		AllContainers.registerScreenFactories();
 		AllTileEntities.registerRenderers();
 		AllItems.registerColorHandlers();
 		AllBlocks.registerColorHandlers();
+
+		IResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
+		if (resourceManager instanceof IReloadableResourceManager)
+			((IReloadableResourceManager) resourceManager).addReloadListener(new CachedBufferReloader());
 	}
-	
+
 	@SubscribeEvent
 	public static void createConfigs(ModConfig.ModConfigEvent event) {
 		if (event.getConfig().getSpec() == CreateConfig.specification)
 			return;
-		
+
 		config = event.getConfig();
 	}
 
diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java b/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java
index 59571a2a9..b4b443060 100644
--- a/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java
+++ b/src/main/java/com/simibubi/create/compat/jei/AnimatedKinetics.java
@@ -5,14 +5,8 @@ import net.minecraft.client.Minecraft;
 
 public abstract class AnimatedKinetics implements IDrawable {
 
-	protected static int ticks;
-
-	public static void tick() {
-		ticks++;
-	}
-
 	public static float getCurrentAngle() {
-		return ((ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360;
+		return ((AnimationTickHolder.ticks + Minecraft.getInstance().getRenderPartialTicks()) * 4f) % 360;
 	}
 
 }
diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java
index 55fee1255..4980040e3 100644
--- a/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java
+++ b/src/main/java/com/simibubi/create/compat/jei/AnimatedPress.java
@@ -1,5 +1,7 @@
 package com.simibubi.create.compat.jei;
 
+import static com.simibubi.create.compat.jei.AnimationTickHolder.ticks;
+
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.gui.ScreenElementRenderer;
diff --git a/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java b/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java
new file mode 100644
index 000000000..08c03df78
--- /dev/null
+++ b/src/main/java/com/simibubi/create/compat/jei/AnimationTickHolder.java
@@ -0,0 +1,11 @@
+package com.simibubi.create.compat.jei;
+
+public class AnimationTickHolder {
+
+	protected static int ticks;
+
+	public static void tick() {
+		ticks++;
+	}
+	
+}
diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
index 084157341..d4fbef785 100644
--- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
+++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
@@ -64,7 +64,8 @@ public class CreateJEI implements IModPlugin {
 		registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid());
 		registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid());
 		registration.addRecipes(findRecipes(AllRecipes.PRESSING), pressingCategory.getUid());
-		registration.addRecipes(findRecipes(AllRecipes.PLACEMENT_HANDGUN_UPGRADE), blockzapperCategory.getUid());
+		registration.addRecipes(findRecipesById(AllRecipes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()),
+				blockzapperCategory.getUid());
 		registration.addRecipes(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid());
 		registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING),
 				blastingCategory.getUid());
@@ -98,6 +99,11 @@ public class CreateJEI implements IModPlugin {
 				.collect(Collectors.toList());
 	}
 
+	private static List<IRecipe<?>> findRecipesById(ResourceLocation id) {
+		return Minecraft.getInstance().world.getRecipeManager().getRecipes().stream()
+				.filter(r -> r.getSerializer().getRegistryName().equals(id)).collect(Collectors.toList());
+	}
+
 	private static List<IRecipe<?>> findRecipesByTypeExcluding(IRecipeType<?> type, IRecipeType<?> excludingType) {
 		List<IRecipe<?>> byType = findRecipesByType(type);
 		List<IRecipe<?>> byExcludingType = findRecipesByType(excludingType);
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java b/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java
new file mode 100644
index 000000000..713c83f90
--- /dev/null
+++ b/src/main/java/com/simibubi/create/modules/contraptions/CachedBufferReloader.java
@@ -0,0 +1,28 @@
+package com.simibubi.create.modules.contraptions;
+
+import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer;
+import com.simibubi.create.modules.contraptions.receivers.constructs.MechanicalBearingTileEntityRenderer;
+import com.simibubi.create.modules.contraptions.receivers.constructs.MechanicalPistonTileEntityRenderer;
+import com.simibubi.create.modules.logistics.block.diodes.FlexpeaterTileEntityRenderer;
+
+import net.minecraft.client.resources.ReloadListener;
+import net.minecraft.profiler.IProfiler;
+import net.minecraft.resources.IResourceManager;
+
+public class CachedBufferReloader extends ReloadListener<String> {
+
+	@Override
+	protected String prepare(IResourceManager resourceManagerIn, IProfiler profilerIn) {
+		return "";
+	}
+
+	@Override
+	protected void apply(String splashList, IResourceManager resourceManagerIn, IProfiler profilerIn) {
+		KineticTileEntityRenderer.invalidateCache();
+		MechanicalPistonTileEntityRenderer.invalidateCache();
+		MechanicalBearingTileEntityRenderer.invalidateCache();
+		FlexpeaterTileEntityRenderer.invalidateCache();
+	}
+
+
+}
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java
index 85d6a4cc9..6d7b876ae 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java
@@ -119,4 +119,9 @@ public class KineticTileEntityRenderer extends TileEntityRendererFast<KineticTil
 		return te.getBlockState();
 	}
 
+	public static void invalidateCache() {
+		if (cachedBuffers != null)
+			cachedBuffers.clear();
+	}
+	
 }
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/EncasedFanTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/receivers/EncasedFanTileEntity.java
index b0bd5c4b6..2d1a0c6a8 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/EncasedFanTileEntity.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/receivers/EncasedFanTileEntity.java
@@ -7,6 +7,7 @@ import static net.minecraft.util.Direction.AxisDirection.POSITIVE;
 
 import java.util.List;
 
+import com.simibubi.create.AllBlockTags;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.CreateClient;
@@ -91,8 +92,7 @@ public class EncasedFanTileEntity extends KineticTileEntity implements ITickable
 	}
 
 	public void updateGenerator() {
-		boolean shouldGenerate = world.isBlockPowered(pos) && world.isBlockPresent(pos.down())
-				&& world.getBlockState(pos.down()).getBlock() == Blocks.FIRE;
+		boolean shouldGenerate = world.isBlockPowered(pos) && world.isBlockPresent(pos.down()) && blockBelowIsHot();
 		if (shouldGenerate == isGenerator)
 			return;
 
@@ -103,6 +103,10 @@ public class EncasedFanTileEntity extends KineticTileEntity implements ITickable
 		sendData();
 	}
 
+	public boolean blockBelowIsHot() {
+		return world.getBlockState(pos.down()).getBlock().isIn(AllBlockTags.FAN_HEATERS.tag);
+	}
+
 	protected void updateReachAndForce() {
 		if (getWorld() == null)
 			return;
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalBearingTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalBearingTileEntityRenderer.java
index 24b3f1a0a..85e72b108 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalBearingTileEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalBearingTileEntityRenderer.java
@@ -110,5 +110,10 @@ public class MechanicalBearingTileEntityRenderer extends KineticTileEntityRender
 		return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
 				((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
 	}
+	
+	public static void invalidateCache() {
+		if (cachedConstructs != null)
+			cachedConstructs.invalidateAll();
+	}
 
 }
diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalPistonTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalPistonTileEntityRenderer.java
index a52c211c7..9c3c1d68c 100644
--- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalPistonTileEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/MechanicalPistonTileEntityRenderer.java
@@ -89,5 +89,10 @@ public class MechanicalPistonTileEntityRenderer extends KineticTileEntityRendere
 		return AllBlocks.SHAFT.block.getDefaultState().with(BlockStateProperties.AXIS,
 				((IRotate) te.getBlockState().getBlock()).getRotationAxis(te.getBlockState()));
 	}
+	
+	public static void invalidateCache() {
+		if (cachedConstructs != null)
+			cachedConstructs.invalidateAll();
+	}
 
 }
diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunUpgradeRecipe.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunUpgradeRecipe.java
index 6f8cbf309..bef5ef878 100644
--- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunUpgradeRecipe.java
+++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunUpgradeRecipe.java
@@ -10,7 +10,6 @@ import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.ICraftingRecipe;
 import net.minecraft.item.crafting.IRecipeSerializer;
-import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.item.crafting.ShapedRecipe;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.JSONUtils;
@@ -64,14 +63,14 @@ public class BuilderGunUpgradeRecipe implements ICraftingRecipe {
 		return getRecipe().getId();
 	}
 
-	@Override
-	public IRecipeType<?> getType() {
-		return AllRecipes.Types.BLOCKZAPPER_UPGRADE;
-	}
+//	@Override
+//	public IRecipeType<?> getType() {
+//		return AllRecipes.Types.BLOCKZAPPER_UPGRADE;
+//	}
 	
 	@Override
 	public IRecipeSerializer<?> getSerializer() {
-		return AllRecipes.PLACEMENT_HANDGUN_UPGRADE.serializer;
+		return AllRecipes.BLOCKZAPPER_UPGRADE.serializer;
 	}
 	
 	public static class Serializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<BuilderGunUpgradeRecipe> {
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java
index 6112a7af8..75431b3b6 100644
--- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java
+++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ConfigureFlexpeaterPacket.java
@@ -4,6 +4,7 @@ import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 
 public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket<FlexpeaterTileEntity> {
 
@@ -31,6 +32,7 @@ public class ConfigureFlexpeaterPacket extends TileEntityConfigurationPacket<Fle
 	@Override
 	protected void applySettings(FlexpeaterTileEntity te) {
 		te.maxState = maxState;
+		te.state = MathHelper.clamp(te.state, 0, maxState);
 		te.sendData();
 	}
 
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java
index 423ae1436..75f12a4c2 100644
--- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java
+++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java
@@ -21,17 +21,23 @@ public class FlexpeaterTileEntity extends SyncedTileEntity implements ITickableT
 
 	public FlexpeaterTileEntity() {
 		super(AllTileEntities.FLEXPEATER.type);
-		lastModified = -1;
-		maxState = 1;
+		lastModified  = -1;
+		maxState = newMaxState = 1;
 	}
 
 	@Override
 	public void read(CompoundNBT compound) {
+		readClientUpdate(compound);
+		newMaxState = maxState;
+		super.read(compound);
+	}
+	
+	@Override
+	public void readClientUpdate(CompoundNBT compound) {
 		state = compound.getInt("State");
 		charging = compound.getBoolean("Charging");
-		newMaxState = maxState = compound.getInt("MaxState");
-		lastModified = -1;
-		super.read(compound);
+		maxState = compound.getInt("MaxState");
+		state = MathHelper.clamp(state, 0, maxState - 1);
 	}
 
 	@Override
@@ -95,8 +101,8 @@ public class FlexpeaterTileEntity extends SyncedTileEntity implements ITickableT
 		updateConfigurableValue();
 		boolean powered = getBlockState().get(POWERED);
 		boolean powering = getBlockState().get(POWERING);
-		boolean atMax = state == maxState;
-		boolean atMin = state == 0;
+		boolean atMax = state >= maxState;
+		boolean atMin = state <= 0;
 
 		if (!charging && powered)
 			charging = true;
diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java
index 0436fc336..619ed0638 100644
--- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java
@@ -33,12 +33,12 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
 			mutable.rewind();
 
 			int color = ColorHelper.mixColors(0x2C0300, 0xCD0000, colorModifier);
-			
+
 			byte r = (byte) (color >> 16);
 			byte g = (byte) ((color >> 8) & 0xFF);
 			byte b = (byte) (color & 0xFF);
 			byte a = (byte) 255;
-			
+
 			for (int vertex = 0; vertex < vertexCount(original); vertex++) {
 				putColor(mutable, vertex, r, g, b, a);
 				putPos(mutable, vertex, getX(original, vertex) + xIn, getY(original, vertex) + yIn,
@@ -50,7 +50,7 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
 		}
 	}
 
-	private FlexpeaterIndicatorRenderer cachedIndicator;
+	protected static FlexpeaterIndicatorRenderer cachedIndicator;
 
 	@Override
 	public void renderTileEntityFast(FlexpeaterTileEntity te, double x, double y, double z, float partialTicks,
@@ -80,4 +80,8 @@ public class FlexpeaterTileEntityRenderer extends TileEntityRendererFast<Flexpea
 				te.state / (float) te.maxState, packedLightmapCoords));
 	}
 
+	public static void invalidateCache() {
+		cachedIndicator = null;
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java b/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java
index 70d96e6da..185443205 100644
--- a/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java
+++ b/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java
@@ -90,15 +90,16 @@ public class ClientSchematicLoader {
 			byte[] data = new byte[maxPacketSize];
 			try {
 				int status = activeUploads.get(schematic).read(data);
-				if (status < maxPacketSize) {
-					data = Arrays.copyOf(data, status);
-				}
 
-				if (Minecraft.getInstance().world != null)
-					AllPackets.channel.sendToServer(SchematicUploadPacket.write(schematic, data));
-				else {
-					activeUploads.remove(schematic);
-					return;
+				if (status != -1) {
+					if (status < maxPacketSize)
+						data = Arrays.copyOf(data, status);
+					if (Minecraft.getInstance().world != null)
+						AllPackets.channel.sendToServer(SchematicUploadPacket.write(schematic, data));
+					else {
+						activeUploads.remove(schematic);
+						return;
+					}
 				}
 
 				if (status < maxPacketSize)
diff --git a/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json b/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json
deleted file mode 100644
index 4441f039d..000000000
--- a/src/main/resources/assets/create/blockstates/dolomite_bricks_stairs.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/dolomite_bricks_stairs"},
-            "outer_right":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/dolomite_bricks_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/dolomite_bricks_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/blockstates/dolomite_stairs.json b/src/main/resources/assets/create/blockstates/dolomite_stairs.json
index cc108d952..e12879599 100644
--- a/src/main/resources/assets/create/blockstates/dolomite_stairs.json
+++ b/src/main/resources/assets/create/blockstates/dolomite_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/dolomite_stairs"},
-            "outer_right":{"model":"create:block/palettes/dolomite_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/dolomite_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/dolomite_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/dolomite_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/dolomite_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/dolomite_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/dolomite_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/dolomite_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/dolomite_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/dolomite_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/dolomite_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/dolomite_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/dolomite_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/dolomite_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/dolomite_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/dolomite_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/dolomite_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/dolomite_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json b/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json
index bd21f14a9..0657e6c88 100644
--- a/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json
+++ b/src/main/resources/assets/create/blockstates/gabbro_bricks_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/gabbro_bricks_stairs"},
-            "outer_right":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/gabbro_bricks_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/gabbro_bricks_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/gabbro_bricks_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/gabbro_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/gabbro_stairs.json b/src/main/resources/assets/create/blockstates/gabbro_stairs.json
index 948c7fb38..e833c946a 100644
--- a/src/main/resources/assets/create/blockstates/gabbro_stairs.json
+++ b/src/main/resources/assets/create/blockstates/gabbro_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/gabbro_stairs"},
-            "outer_right":{"model":"create:block/palettes/gabbro_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/gabbro_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/gabbro_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/gabbro_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/gabbro_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/gabbro_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/gabbro_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/gabbro_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/gabbro_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/gabbro_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/gabbro_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/gabbro_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/gabbro_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/gabbro_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/gabbro_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/gabbro_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/gabbro_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/gabbro_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/limesand.json b/src/main/resources/assets/create/blockstates/limesand.json
new file mode 100644
index 000000000..bba383dc3
--- /dev/null
+++ b/src/main/resources/assets/create/blockstates/limesand.json
@@ -0,0 +1,7 @@
+{
+	"forge_marker": 1,
+	"defaults": { "model": "create:block/palettes/limesand" },
+    "variants": {
+      "": [{ "y": 0 }, { "y": 90 }, { "y": 180 }, { "y": 270 }]
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json b/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json
index 100202a77..049fe0e0d 100644
--- a/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json
+++ b/src/main/resources/assets/create/blockstates/limestone_bricks_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-    "defaults": {
-        "uvlock": true
-    },
-    "variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/limestone_bricks_stairs"},
-            "outer_right":{"model":"create:block/palettes/limestone_bricks_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/limestone_bricks_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/limestone_bricks_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/limestone_bricks_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/limestone_bricks_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/limestone_bricks_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/limestone_bricks_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/limestone_bricks_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/limestone_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/limestone_stairs.json b/src/main/resources/assets/create/blockstates/limestone_stairs.json
index 213cbecea..8416342be 100644
--- a/src/main/resources/assets/create/blockstates/limestone_stairs.json
+++ b/src/main/resources/assets/create/blockstates/limestone_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/limestone_stairs"},
-            "outer_right":{"model":"create:block/palettes/limestone_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/limestone_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/limestone_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/limestone_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/limestone_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/limestone_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/limestone_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/limestone_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/limestone_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/limestone_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/limestone_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/limestone_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/limestone_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/limestone_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/limestone_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/limestone_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/limestone_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json
index 117f6e20e..11ae8eb53 100644
--- a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json
+++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/weathered_limestone_bricks_stairs"},
-            "outer_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/weathered_limestone_bricks_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json b/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json
index a4f9c7f2c..2ff20cfa3 100644
--- a/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json
+++ b/src/main/resources/assets/create/blockstates/weathered_limestone_stairs.json
@@ -1,51 +1,44 @@
 {
-    "forge_marker": 1,
-	"defaults": {
-        "uvlock": true
-    },
-	"variants": { 
-        "facing":{
-            "east":{},
-            "west":{"y": 180},
-            "south":{"y": 90},
-            "north":{"y": 270}                        
-        },
-        "half":{
-          "bottom":{},
-          "top":{"x": 180}  
-        },    
-        "shape":{
-            "straight":{"model":"create:block/palettes/weathered_limestone_stairs"},
-            "outer_right":{"model":"create:block/palettes/weathered_limestone_stairs_outer"},
-            "outer_left":{"model":"create:block/palettes/weathered_limestone_stairs_outer"},
-            "inner_right":{"model":"create:block/palettes/weathered_limestone_stairs_inner"},
-            "inner_left":{"model":"create:block/palettes/weathered_limestone_stairs_inner"}
-        },         
-        "facing=east,half=bottom,shape=outer_left":  {"y": 270},
-        "facing=west,half=bottom,shape=outer_left":  {"y": 90},
-        "facing=south,half=bottom,shape=outer_left": {"y": 0},
-        "facing=north,half=bottom,shape=outer_left": {"y": 180},
-        "facing=east,half=bottom,shape=inner_left":  {"y": 270},
-        "facing=west,half=bottom,shape=inner_left":  {"y": 90},
-        "facing=south,half=bottom,shape=inner_left": {"y": 0},
-        "facing=north,half=bottom,shape=inner_left": {"y": 180},
-        "facing=west,half=top,shape=straight":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=straight": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=straight": {"x": 180, "y": 270},
-        "facing=west,half=top,shape=outer_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=outer_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=outer_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=outer_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=outer_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=outer_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=outer_left": {"x": 180, "y": 0},
-        "facing=east,half=top,shape=inner_right":  {"x": 180, "y": 0},
-        "facing=west,half=top,shape=inner_right":  {"x": 180, "y": 180},
-        "facing=south,half=top,shape=inner_right": {"x": 180, "y": 90},
-        "facing=north,half=top,shape=inner_right": {"x": 180, "y": 270},
-        "facing=east,half=top,shape=inner_left":  {"x": 180, "y": 90},
-        "facing=west,half=top,shape=inner_left":  {"x": 180, "y": 270},
-        "facing=south,half=top,shape=inner_left": {"x": 180, "y": 180},
-        "facing=north,half=top,shape=inner_left": {"x": 180, "y": 0}
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "create:block/palettes/weathered_limestone_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "create:block/palettes/weathered_limestone_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_stairs_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_stairs_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "create:block/palettes/weathered_limestone_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/weathered_limestone_stairs_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/weathered_limestone_stairs_inner", "x": 180, "y": 270, "uvlock": true }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json
index cda9fe075..0b58c7fe8 100644
--- a/src/main/resources/assets/create/lang/en_us.json
+++ b/src/main/resources/assets/create/lang/en_us.json
@@ -118,6 +118,7 @@
 	"block.create.dolomite_bricks_slab": "Dolomite Brick Slab",
 	"block.create.polished_dolomite": "Polished Dolomite",
 	
+	"block.create.limesand": "Limesand",
 	"block.create.limestone": "Limestone",
 	"block.create.limestone_stairs": "Limestone Stairs",
 	"block.create.limestone_slab": "Limestone Slab",
diff --git a/src/main/resources/assets/create/models/block/palettes/limesand.json b/src/main/resources/assets/create/models/block/palettes/limesand.json
new file mode 100644
index 000000000..ae23faed5
--- /dev/null
+++ b/src/main/resources/assets/create/models/block/palettes/limesand.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "create:block/limesand"
+    }
+}
diff --git a/src/main/resources/assets/create/models/item/limesand.json b/src/main/resources/assets/create/models/item/limesand.json
new file mode 100644
index 000000000..8017e9dd1
--- /dev/null
+++ b/src/main/resources/assets/create/models/item/limesand.json
@@ -0,0 +1,3 @@
+{
+    "parent": "create:block/palettes/limesand"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/create/textures/block/limesand.png b/src/main/resources/assets/create/textures/block/limesand.png
new file mode 100644
index 000000000..bfb5f60db
Binary files /dev/null and b/src/main/resources/assets/create/textures/block/limesand.png differ
diff --git a/src/main/resources/data/create/loot_tables/blocks/limesand.json b/src/main/resources/data/create/loot_tables/blocks/limesand.json
new file mode 100644
index 000000000..2299a5e93
--- /dev/null
+++ b/src/main/resources/data/create/loot_tables/blocks/limesand.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "create:limesand",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create:limesand"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json
index 82d506a15..18d9e62c7 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_accelerator.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "SE",
             "BS"
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json
index d0d73b505..ddbfad010 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_amplifier.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "E ",
             "BR"
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json
similarity index 89%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json
index 306f7e53c..a9ef3d8a3 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_body.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             " B ",
             "BEB",
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json
index 9f862adfe..8fdc9b6e2 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_retriever.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "E ",
             "BR"
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json
index 86b2f82f7..5ec675892 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/gold_scope.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "GBG",
             " E "
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json
index db1b49d99..9437cd321 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_accelerator.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "SE",
             "BS"
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json
index c8c585f20..0ed6df7cb 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_amplifier.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
 			"BR",
             "E ",
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json
similarity index 89%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json
index 1a2fc1ccc..9b9895a59 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_body.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             " B ",
             "BEB",
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json
index 7b657d5a4..24debe385 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_retriever.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "E ",
             "BR"
diff --git a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json
similarity index 90%
rename from src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json
rename to src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json
index a3d0ae48b..3af352b8d 100644
--- a/src/main/resources/data/create/recipes/placement_handgun_upgrades/purpur_scope.json
+++ b/src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json
@@ -1,5 +1,5 @@
 {
-    "type": "create:placement_handgun_upgrade",
+    "type": "create:blockzapper_upgrade",
         "pattern": [
             "GBG",
             " E "
diff --git a/src/main/resources/data/create/recipes/crafting/motor.json b/src/main/resources/data/create/recipes/crafting/motor.json
index 5bc80460f..928f7a183 100644
--- a/src/main/resources/data/create/recipes/crafting/motor.json
+++ b/src/main/resources/data/create/recipes/crafting/motor.json
@@ -7,7 +7,7 @@
         ],
         "key": {
             "B": {
-                "item": "create:blaze_brass_cube"
+                "item": "create:chorus_chrome_cube"
             },
 			"A": {
                 "item": "create:iron_sheet"
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini b/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini
deleted file mode 100644
index 2ce3d7e57..000000000
--- a/src/main/resources/data/create/recipes/crafting/palettes/desktop.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[LocalizedFileNames]
-weathered_limestone.json=@weathered_limestone.json,0
-weathered_limestone_bricks.json=@weathered_limestone_bricks.json,0
-limestone_bricks.json=@limestone_bricks.json,0
-polished_weathered_limestone.json=@polished_weathered_limestone.json,0
-polished_limestone.json=@polished_limestone.json,0
-polished_weathered_limestone_slab.json=@polished_weathered_limestone_slab.json,0
-weathered_limestone_bricks_slab.json=@weathered_limestone_bricks_slab.json,0
-weathered_limestone_slab.json=@weathered_limestone_slab.json,0
-polished_limestone_slab.json=@polished_limestone_slab.json,0
-limestone_slab.json=@limestone_slab.json,0
-limestone_bricks_slab.json=@limestone_bricks_slab.json,0
-limestone_bricks_wall.json=@limestone_bricks_wall.json,0
-weathered_limestone_bricks_wall.json=@weathered_limestone_bricks_wall.json,0
-weathered_limestone_wall.json=@weathered_limestone_wall.json,0
-limestone_wall.json=@limestone_wall.json,0
-weathered_limestone_stairs.json=@weathered_limestone_stairs.json,0
-weathered_limestone_bricks_stairs.json=@weathered_limestone_bricks_stairs.json,0
-limestone_bricks_stairs.json=@limestone_bricks_stairs.json,0
-limestone_stairs.json=@limestone_stairs.json,0
-limestone.json=@limestone.json,0
-gabbro.json=@gabbro.json,0
-gabbro_bricks.json=@gabbro_bricks.json,0
-polished_gabbro.json=@polished_gabbro.json,0
-paved_gabbro_bricks_slab.json=@paved_gabbro_bricks_slab.json,0
-indented_gabbro_slab.json=@indented_gabbro_slab.json,0
-gabbro_slab.json=@gabbro_slab.json,0
-gabbro_wall.json=@gabbro_wall.json,0
-gabbro_bricks_wall.json=@gabbro_bricks_wall.json,0
-gabbro_bricks_stairs.json=@gabbro_bricks_stairs.json,0
-gabbro_stairs.json=@gabbro_stairs.json,0
-dolomite.json=@dolomite.json,0
-polished_dolomite.json=@polished_dolomite.json,0
-dolomite_bricks.json=@dolomite_bricks.json,0
-dolomite_slab.json=@dolomite_slab.json,0
-dolomite_wall.json=@dolomite_wall.json,0
-dolomite_stairs.json=@dolomite_stairs.json,0
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json
index 8de7753b7..75a6d0b8e 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/dolomite_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:dolomite_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json
index 7cd9b93f2..0eacbcd24 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_bricks_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:gabbro_bricks_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json
index 3f8d9593a..b2a9d1d38 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/gabbro_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:gabbro_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limesand.json b/src/main/resources/data/create/recipes/crafting/palettes/limesand.json
new file mode 100644
index 000000000..936f5b40e
--- /dev/null
+++ b/src/main/resources/data/create/recipes/crafting/palettes/limesand.json
@@ -0,0 +1,25 @@
+{
+    "type": "crafting_shaped",
+        "pattern": [
+			"WL",
+            "LW"
+        ],
+        "key": {
+			"L": {
+                "item": "minecraft:sand"
+            },
+			"W": {
+                "item": "minecraft:diorite"
+            }
+        },
+	"result": {
+		"item": "create:limesand",
+		"count": 4
+	},
+	"conditions": [
+		{
+			"type": "create:module",
+			"module": "palettes"
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json
index 8b318aaad..65157573e 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/limestone_bricks_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:limestone_bricks_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json
index 401d064ac..7f5eb1c55 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/limestone_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:limestone_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json
index ad69f31e9..cbf762b9e 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_bricks_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:weathered_limestone_bricks_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json
index 542d036ec..f7353945c 100644
--- a/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json
+++ b/src/main/resources/data/create/recipes/crafting/palettes/weathered_limestone_stairs.json
@@ -12,7 +12,7 @@
         },
 	"result": {
 		"item": "create:weathered_limestone_stairs",
-		"count": 8
+		"count": 4
 	},
 	"conditions": [
 		{
diff --git a/src/main/resources/data/create/recipes/crushing/sand.json b/src/main/resources/data/create/recipes/crushing/sand.json
new file mode 100644
index 000000000..3d88700c4
--- /dev/null
+++ b/src/main/resources/data/create/recipes/crushing/sand.json
@@ -0,0 +1,26 @@
+{
+    "type": "create:crushing",
+    "group": "minecraft:misc",
+    "ingredients": [
+    	{
+    		"item": "minecraft:sand"
+    	}
+    ], 
+	"results": [
+		{
+			"item": "create:limesand",
+			"count": 1
+		},
+		{
+			"item": "create:limesand",
+			"count": 1,
+			"chance": 0.5
+		},
+		{
+			"item": "minecraft:bone_meal",
+			"count": 1,
+			"chance": 0.05
+		}
+	],
+	"processingTime": 50
+}
\ No newline at end of file
diff --git a/src/main/resources/data/create/recipes/smelting/limestone.json b/src/main/resources/data/create/recipes/smelting/limestone.json
index 315e75da0..fe20e0a03 100644
--- a/src/main/resources/data/create/recipes/smelting/limestone.json
+++ b/src/main/resources/data/create/recipes/smelting/limestone.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:smelting",
   "ingredient": {
-    "item": "minecraft:sandstone"
+    "item": "create:limesand"
   },
   "result": "create:limestone",
   "experience": 0.1,
diff --git a/src/main/resources/data/create/recipes/splashing/gravel.json b/src/main/resources/data/create/recipes/splashing/gravel.json
index 8a6d02167..19cd6dfa1 100644
--- a/src/main/resources/data/create/recipes/splashing/gravel.json
+++ b/src/main/resources/data/create/recipes/splashing/gravel.json
@@ -10,11 +10,11 @@
 		{
 			"item": "minecraft:flint",
 			"count": 1,
-			"chance": 0.5
+			"chance": 0.25
 		},
 		{
 			"item": "minecraft:iron_nugget",
-			"count": 4,
+			"count": 1,
 			"chance": 0.125
 		}
 	],
diff --git a/src/main/resources/data/create/recipes/splashing/red_sand.json b/src/main/resources/data/create/recipes/splashing/red_sand.json
index 83b9f2a5b..40d00217d 100644
--- a/src/main/resources/data/create/recipes/splashing/red_sand.json
+++ b/src/main/resources/data/create/recipes/splashing/red_sand.json
@@ -9,7 +9,7 @@
 	"results": [
 		{
 			"item": "minecraft:gold_nugget",
-			"count": 4,
+			"count": 3,
 			"chance": 0.125
 		},
 		{
diff --git a/src/main/resources/data/create/tags/blocks/fan_heaters.json b/src/main/resources/data/create/tags/blocks/fan_heaters.json
new file mode 100644
index 000000000..2e38dca24
--- /dev/null
+++ b/src/main/resources/data/create/tags/blocks/fan_heaters.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:fire", "minecraft:campfire", "minecraft:lava", "minecraft:magma_block"
+  ]
+}
\ No newline at end of file