Merge upstream

This commit is contained in:
Vincent Lee committed 2016-04-06 09:51:50 -05:00
commit 4ec22a0417
23 files changed
+209 -209

No files matched your search

@@ -54,7 +54,6 @@ public interface IFloatingFlower {
return type == null ? GRASS : type;
}
@Override
public String toString() {
return this.typeName;
}
@@ -128,7 +128,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); // todo 1.9
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
GlStateManager.popMatrix();
if(renderedOne)
@@ -10,6 +10,7 @@
*/
package vazkii.botania.client.render.tile;
import java.awt.*;
import java.util.Random;
import net.minecraft.block.state.IBlockState;