upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2015-08-07 21:18:47 +02:00
2 parents 50441d79c1 ad04566799
commit db8f60b01e
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
+1
View File
@@ -506,6 +506,7 @@ public class SmelteryGui extends ActiveContainerGui
this.zLevel = 0.0F;
itemRender.zLevel = 0.0F;
RenderHelper.enableGUIStandardItemLighting();
}
}
src/main/java/tconstruct/util/IMCHandler.java
+1 -1
View File
@@ -288,7 +288,7 @@ public final class IMCHandler {
if(FluidType.getFluidType(liquid.getFluid()) == null)
FluidType.registerFluidType(liquid.getFluid().getName(), Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid.getFluid(), false);
Smeltery.addMelting(Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid);
Smeltery.addMelting(item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid);
TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " + liquid.amount + "mb " + liquid.getLocalizedName());
}
else if(type.equals("addSmelteryFuel")) {