Merge branch '1.12.2' into 1.12.2-dev

2018-06-05 21:44:17 +01:00
parent dec5b1ac2c 9c1042f686
commit 438f5d7a2e
52 changed files with 1079 additions and 805 deletions
@@ -61,7 +61,6 @@ public abstract class ParticleCustomTexture extends ParticleWizardry {
 			float rotationYZ, float rotationXY, float rotationXZ){
 		
 		GlStateManager.pushMatrix();
-		GlStateManager.pushAttrib();

 		this.applyGLStateChanges();

@@ -111,7 +110,6 @@ public abstract class ParticleCustomTexture extends ParticleWizardry {

 		this.undoGLStateChanges();

-		GlStateManager.popAttrib();
 		GlStateManager.popMatrix();

 	}