Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.0.x' into 6.1.x

Browse source 
Conflicts:
	build.gradle
	common/buildcraft/transport/render/FacadeItemRenderer.java
This commit is contained in:
SpaceToad 2014-09-06 12:32:59 +02:00
commit 0381a4edd0
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildcraft_resources/changelog/6.0.18 Executable file
View file

@ -0,0 +1,5 @@
#1982 remove landmark's levitation. [Prototik]
#1979 fixed crashes with third party mods and facades [tterrag1098]
#1969 fix builder/filler not rendering if player is too far away [ganymedes01]
#1967 fixed US grammar [61352151511]
#1961 fixed US grammar [61352151511]

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2 1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16 1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:6.0.17 1.7.10:BuildCraft:6.0.18

21
common/buildcraft/transport/render/FacadeItemRenderer.java
View file

@ -143,21 +143,22 @@ public class FacadeItemRenderer implements IItemRenderer {
} }
private IIcon tryGetBlockIcon(Block block, int side, int decodedMeta) { private IIcon tryGetBlockIcon(Block block, int side, int decodedMeta) {
try { IIcon icon = null;
IIcon icon = block.getIcon(side, decodedMeta);
if (icon != null) { try {
return icon; icon = block.getIcon(side, decodedMeta);
} else {
return PipeIconProvider.TYPE.TransparentFacade.getIcon();
}
} catch (Throwable t) { } catch (Throwable t) {
try { try {
return block.getBlockTextureFromSide(side); icon = block.getBlockTextureFromSide(side);
} catch (Throwable t2) { } catch (Throwable ignored) {
return PipeIconProvider.TYPE.TransparentFacade.getIcon(); }
} finally {
if (icon == null) {
icon = PipeIconProvider.TYPE.TransparentFacade.getIcon();
} }
} }
return icon;
} }
@Override @Override