mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-16 18:55:06 +00:00
Merge branch 'master' into dev
Conflicts: changelog
This commit is contained in:
commit
8a539dfeaa
7 files changed
+12
-16
No files matched your search
@@ -143,7 +143,7 @@ public enum Features {
|
||||
|
||||
@Override
|
||||
void addRecipes() {
|
||||
// TODO Add a recipe
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, 0), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustGlowstone"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -705,6 +705,11 @@ public enum Features {
|
||||
futura.carverHelper.registerAll(futura, "futura");
|
||||
Carving.chisel.registerOre("futura", "futura");
|
||||
}
|
||||
|
||||
@Override
|
||||
void addRecipes(){
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.futura, 8, 0), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustRedstone"));
|
||||
}
|
||||
},
|
||||
|
||||
GLASS {
|
||||
|
||||
Reference in new issue
Block a user