Move AXIS_ORIENTATION into QuartzPillarBlock

2016-08-14 10:17:50 +01:00
parent 92b931434e f2cceda471
commit 8882c16cbf
2 changed files with 5 additions and 0 deletions
@@ -67,8 +67,11 @@ import appeng.util.Platform;
 public abstract class AEBaseBlock extends Block implements IAEFeature
 {

+<<<<<<< HEAD
 	public static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );

+=======
+>>>>>>> refs/heads/pr/38
 	private final String featureFullName;
 	private final Optional<String> featureSubName;
 	private boolean isOpaque = true;