Fixes and cleanup

- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.

src/main/java/appeng/block/AEBaseBlock.java

@@ -67,11 +67,6 @@ 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;