From c5578680feeb65ca5247a5835893ddf9697ba68f Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sat, 17 Jan 2015 14:51:29 +0000 Subject: [PATCH] Add requested O2 warning sign --- .../java/com/cricketcraft/chisel/Features.java | 3 ++- src/main/resources/assets/chisel/lang/en_US.lang | 1 + .../chisel/textures/blocks/warning/oxygen.png | Bin 0 -> 3520 bytes 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/oxygen.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index ac9f4c0c..b04053a3 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1674,7 +1674,7 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall, 8), "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall, 4), "pp", "pp", "ppp", ('p'), paperwall)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall_block, 4), "pp", "pp", "ppp", ('p'), ChiselBlocks.paperwall)); } }, @@ -2364,6 +2364,7 @@ public enum Features { warningSign.carverHelper.addVariation("tile.warningSign.11.desc", 11, "warning/sound"); warningSign.carverHelper.addVariation("tile.warningSign.12.desc", 12, "warning/noentry"); warningSign.carverHelper.addVariation("tile.warningSign.13.desc", 13, "warning/cryogenic"); + warningSign.carverHelper.addVariation("tile.warningSign.14.desc", 14, "warning/oxygen"); warningSign.carverHelper.registerAll(warningSign, "warningSign"); Carving.chisel.registerOre("warningSign", "warningSign"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 741b4087..f48deee5 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -108,6 +108,7 @@ tile.warningSign.10.desc=Under Construction tile.warningSign.11.desc=Loud Sounds tile.warningSign.12.desc=No Entry tile.warningSign.13.desc=Cryogenic Freezing in progress +tile.warningSign.14.desc=Oxygen Required #Energised Void Stone Blocks tile.voidstone2.name=Energised Voidstone diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/oxygen.png b/src/main/resources/assets/chisel/textures/blocks/warning/oxygen.png new file mode 100755 index 0000000000000000000000000000000000000000..27f6e41efce2f259705b7be2a926d1d96d997d42 GIT binary patch literal 3520 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