upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Drullkus committed 2015-03-08 14:06:01 -07:00
2 parents 2dcb2b51b4 3e2a5cb524
commit 84a29c7a38
8 files changed
+215 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/Features.java
+2 -2
View File
@@ -1162,7 +1162,7 @@ public enum Features {
jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("litpumpkin")
.setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(1.0f);
jackolantern[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_on");
GameRegistry.registerBlock(jackolantern[metadata], ("jackolantern" + (metadata + 1)));
GameRegistry.registerBlock(jackolantern[metadata], ItemCarvablePumpkin.class, ("jackolantern" + (metadata + 1)));
Carving.chisel.addVariation("jackolantern", jackolantern[metadata], 0, (metadata + 1));
}
Carving.chisel.addVariation("jackolantern", Blocks.lit_pumpkin, 0, 0);
@@ -1832,7 +1832,7 @@ public enum Features {
pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("pumpkin")
.setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
pumpkin[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_off");
GameRegistry.registerBlock(pumpkin[metadata], "pumpkin" + (metadata + 1));
GameRegistry.registerBlock(pumpkin[metadata], ItemCarvablePumpkin.class, "pumpkin" + (metadata + 1));
Carving.chisel.addVariation("pumpkin", pumpkin[metadata], 0, (metadata + 1));
}
Carving.chisel.addVariation("pumpkin", Blocks.pumpkin, 0, 0);