AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
This commit is contained in:
payonel 2018-11-14 19:35:18 -08:00
commit c704bdb6f3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
View File

@ -9,6 +9,7 @@ import li.cil.oc.integration.util.Wrench
import li.cil.oc.util.RenderState import li.cil.oc.util.RenderState
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.GlStateManager
import net.minecraft.client.renderer.OpenGlHelper
import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.Tessellator
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
import net.minecraft.client.renderer.vertex.DefaultVertexFormats import net.minecraft.client.renderer.vertex.DefaultVertexFormats
@ -61,6 +62,7 @@ object ScreenRenderer extends TileEntitySpecialRenderer[Screen] {
RenderState.pushAttrib() RenderState.pushAttrib()
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 0xFF, 0xFF)
RenderState.disableEntityLighting() RenderState.disableEntityLighting()
RenderState.makeItBlend() RenderState.makeItBlend()
GlStateManager.color(1, 1, 1, 1) GlStateManager.color(1, 1, 1, 1)