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 branch 'revert' into dev

Browse Source
This commit is contained in:
Arona Jones committed 2015-01-11 20:54:24 +00:00
2 parents 8321be7a5e 749254ef02
commit 83d3f7e0a9
33 files changed
+260 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java
+4 -3
View File
@@ -5,12 +5,14 @@ import net.minecraft.block.Block;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.block.BlockCarvable;
import com.cricketcraft.chisel.block.BlockCarvableGlass;
import com.cricketcraft.chisel.block.BlockCarvableLayered;
import com.cricketcraft.chisel.block.BlockCarvablePane;
import com.cricketcraft.chisel.block.BlockCarvablePowered;
import com.cricketcraft.chisel.block.BlockCarvablePumpkin;
import com.cricketcraft.chisel.block.BlockCarvableSand;
import com.cricketcraft.chisel.block.BlockCarvableSlab;
import com.cricketcraft.chisel.block.BlockCarvableStairs;
import com.cricketcraft.chisel.block.BlockCarvableTorch;
import com.cricketcraft.chisel.block.BlockCloud;
import com.cricketcraft.chisel.block.BlockConcrete;
import com.cricketcraft.chisel.block.BlockGrimstone;
@@ -104,16 +106,15 @@ public final class ChiselBlocks {
public static final BlockCarvable technical = null;
public static final BlockCarvableGlass technical2 = null;
public static final BlockCarvable futura = null;
public static final BlockCarvable bone = null;
public static final BlockCarvable scorching = null;
public static final BlockCarvable brickCustom = null;
public static final BlockCarvable sign = null;
public static final BlockCarvableLayered sign = null;
public static final BlockCarvable arcane = null;
public static final BlockCarvable thaumium = null;
public static final BlockCarvable tallow = null;
public static final BlockCarvable bloodRune = null;
public static final BlockCarvableSand colored_sand = null;
public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16];
// Arrays can't be final because of how @ObjectHolder works
public static BlockCarvable[] planks = new BlockCarvable[6];