From 55b91d0083ace9fed0d68e346ef052e05d5334c2 Mon Sep 17 00:00:00 2001
From: Nick <speedynutty68@gmail.com>
Date: Sat, 9 Jan 2016 22:40:18 -0800
Subject: [PATCH] Standardize BloodStone/Crystal variant names

---
 .../java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java | 2 +-
 src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java    | 2 +-
 .../assets/bloodmagic/blockstates/BlockBloodStoneBrick.json   | 2 +-
 .../resources/assets/bloodmagic/blockstates/BlockCrystal.json | 2 +-
 src/main/resources/assets/bloodmagic/lang/de_DE.lang          | 4 ++--
 src/main/resources/assets/bloodmagic/lang/en_US.lang          | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
index a0221eda..9d647b25 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
@@ -7,7 +7,7 @@ import net.minecraft.block.material.Material;
 
 public class BlockBloodStoneBrick extends BlockString
 {
-    public static final String[] names = { "large", "normal" };
+    public static final String[] names = { "large", "brick" };
 
     public BlockBloodStoneBrick()
     {
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
index 1c9b06f6..1cae8638 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
@@ -7,7 +7,7 @@ import net.minecraft.block.material.Material;
 
 public class BlockCrystal extends BlockString
 {
-    public static final String[] names = { "normal", "brick" };
+    public static final String[] names = { "large", "brick" };
 
     public BlockCrystal()
     {
diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json
index b37270ff..9cce5ef3 100644
--- a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json
+++ b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodStoneBrick.json
@@ -12,7 +12,7 @@
           "all": "bloodmagic:blocks/LargeBloodStoneBrick"
         }
       },
-      "normal": {
+      "brick": {
         "textures": {
           "all": "bloodmagic:blocks/BloodStoneBrick"
         }
diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json b/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json
index 2119d373..c997259c 100644
--- a/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json
+++ b/src/main/resources/assets/bloodmagic/blockstates/BlockCrystal.json
@@ -7,7 +7,7 @@
   },
   "variants": {
     "type": {
-      "normal": {
+      "large": {
         "textures": {
           "all": "bloodmagic:blocks/ShardCluster"
         }
diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang
index a559a250..6bdcac09 100644
--- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang
+++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang
@@ -133,9 +133,9 @@ tile.BloodMagic.ritualStone.air.name=Luftritualstein
 tile.BloodMagic.ritualStone.dusk.name=Morgendämmerungsritualstein
 tile.BloodMagic.ritualStone.dawn.name=Abenddämmerungsritualstein
 
-tile.BloodMagic.bloodstonebrick.normal.name=Blutsteinziegel
 tile.BloodMagic.bloodstonebrick.large.name=Großer Blutsteinziegel
-tile.BloodMagic.crystal.normal.name=Kristallklumpen
+tile.BloodMagic.bloodstonebrick.brick.name=Blutsteinziegel
+tile.BloodMagic.crystal.large.name=Kristallklumpen
 tile.BloodMagic.crystal.brick.name=Kristallklumpenziegel
 tile.BloodMagic.bloodLight.name=Blutlampe
 tile.BloodMagic.spectralBlock.name=Spektralblock
diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang
index 76300192..efaeb7f9 100644
--- a/src/main/resources/assets/bloodmagic/lang/en_US.lang
+++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang
@@ -148,9 +148,9 @@ tile.BloodMagic.ritualStone.air.name=Ritual Stone of Air
 tile.BloodMagic.ritualStone.dusk.name=Ritual Stone of Dusk
 tile.BloodMagic.ritualStone.dawn.name=Ritual Stone of Dawn
 
-tile.BloodMagic.bloodstonebrick.normal.name=Bloodstone Brick
 tile.BloodMagic.bloodstonebrick.large.name=Large Bloodstone Brick
-tile.BloodMagic.crystal.normal.name=Crystal Cluster
+tile.BloodMagic.bloodstonebrick.brick.name=Bloodstone Brick
+tile.BloodMagic.crystal.large.name=Crystal Cluster
 tile.BloodMagic.crystal.brick.name=Crystal Cluster Brick
 tile.BloodMagic.bloodLight.name=Blood Light
 tile.BloodMagic.spectralBlock.name=Spectral Block