Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering

# Conflicts:
#	src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

#	src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json
# Changed naming convention.
This commit is contained in:
elix-x
2016-08-19 12:49:25 +02:00
57 changed files with 2566 additions and 168 deletions
@@ -320,9 +320,15 @@ public enum UVLModelLoader implements ICustomModelLoader
lightmap[1] = brightness.getLeft();
}
@Override
public void setQuadTint( int tint )
{
// Tint requires a block state which we don't have at this point
}
};
trans.setParent( builder );
quad.pipe( trans );
builder.setQuadTint( quad.getTintIndex() );
builder.setQuadOrientation( quad.getFace() );
return builder.build();
}