Merge branch 'beta'1.7-REL1.6-REL

uh yeah its pretty necessary guys

1 files changed, 13 insertions, 0 deletions

diff --git a/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag
new file mode 100644
index 00000000..c4472679
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag
@@ -0,0 +1,13 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+uniform sampler2D textureIn;
+
+uniform int millis;
+
+void main() {
+    vec4 texture = texture2D(textureIn, gl_TexCoord[0].st);
+
+    gl_FragColor = vec4(texture.rgb*shading, gl_FragColor.a);
+}