pre-release stuff

vadis365 · Jan 31, 2015 · 898691b · 898691b
1 parent 81b9d17
commit 898691b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/erebus/recipes/RecipeHandler.java b/src/main/java/erebus/recipes/RecipeHandler.java
@@ -234,7 +234,7 @@ private static void registerRecipes() {
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.craftingAltar), "xxx", "xxx", "xxx", 'x', ModBlocks.altarBase);
 		GameRegistry.addRecipe(Materials.createStack(Materials.DATA.jade), "xxx", "xxx", "xxx", 'x', Materials.createStack(Materials.DATA.jadeBerries));
 		GameRegistry.addRecipe(Materials.createStack(Materials.DATA.waterRepellent), "xxx", "xrx", "xxx", 'x', Materials.createStack(Materials.DATA.hydrofuge), 'r', Materials.createStack(Materials.DATA.repellent));
-		GameRegistry.addShapelessRecipe(Materials.createStack(Materials.DATA.stewPot), Blocks.cauldron);
+		GameRegistry.addShapelessRecipe(Materials.createStack(Materials.DATA.stewPot), Items.cauldron);
 		GameRegistry.addRecipe(new ShapelessOreRecipe(Materials.createStack(Materials.DATA.titanStew), Materials.createStack(Materials.DATA.stewPot), new ItemStack(ModItems.food, 1, Food.FoodType.titanChop.ordinal()), Items.potato, Items.carrot, new ItemStack(ModItems.food, 1, Food.FoodType.cabbage.ordinal()), "foodMushroom", "foodMushroom"));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(Materials.createStack(Materials.DATA.titanStew), Materials.createStack(Materials.DATA.stewPot), Items.beef, Items.beef, Items.potato, Items.carrot, new ItemStack(ModItems.food, 1, Food.FoodType.cabbage.ordinal()), "foodMushroom", "foodMushroom"));
 

diff --git a/src/main/resources/assets/erebus/lang/en_US.lang b/src/main/resources/assets/erebus/lang/en_US.lang
@@ -77,9 +77,9 @@ tile.erebus.amberBrickStairs.name=Amber Brick Stairs
 tile.erebus.waspNestStairs.name=Wasp Nest Stairs
 tile.erebus.petrifiedWoodStairs.name=Petrified Wood Stairs
 tile.erebus.gneissStairs0.name=Gneiss Stairs
-tile.erebus.gneissStairs1.name=Hieroglyphic Gneiss Stairs
+tile.erebus.gneissStairs1.name=Carved Gneiss Stairs
 tile.erebus.gneissStairs2.name=Layered Gneiss Stairs
-tile.erebus.gneissStairs3.name=Slabbed Gneiss Stairs
+tile.erebus.gneissStairs3.name=Brick Gneiss Stairs
 tile.erebus.gneissStairs4.name=Smooth Gneiss Stairs
 tile.erebus.gneissStairs5.name=Tiled Gneiss Stairs
 
@@ -174,9 +174,9 @@ tile.erebus.antlionEgg.name=Antlion Egg
 
 tile.erebus.thorns.name=Thorns
 tile.erebus.gneiss_0.name=Gneiss
-tile.erebus.gneiss_1.name=Hieroglyphic Gneiss
+tile.erebus.gneiss_1.name=Carved Gneiss
 tile.erebus.gneiss_2.name=Layered Gneiss
-tile.erebus.gneiss_3.name=Gneiss Slabs
+tile.erebus.gneiss_3.name=Gneiss Brick
 tile.erebus.gneiss_4.name=Smooth Gneiss
 tile.erebus.gneiss_5.name=Gneiss Tiles
 tile.erebus.templeBrick.name=Temple Brick