Merge branch '1.20.2' into 1.20.3

IrisShaders · Dec 6, 2023 · 1f0cd13 · 1f0cd13
2 parents 6f19634 + 2e5ed76
commit 1f0cd13
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/main/java/net/coderbot/iris/mixin/vertices/MixinBufferBuilder.java b/src/main/java/net/coderbot/iris/mixin/vertices/MixinBufferBuilder.java
@@ -138,12 +138,6 @@ public abstract class MixinBufferBuilder extends DefaultedVertexConsumer impleme
 		}
 	}
 
-	@Override
-	public @NotNull VertexConsumer uv2(int pBufferVertexConsumer0, int pInt1) {
-
-		return BufferVertexConsumer.super.uv2(pBufferVertexConsumer0, pInt1);
-	}
-
 	@ModifyArg(method = "begin", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;switchFormat(Lcom/mojang/blaze3d/vertex/VertexFormat;)V"))
 	private VertexFormat iris$afterBeginSwitchFormat(VertexFormat arg) {
 		if (extending) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "iris",
-  "version": "1.6.11-development-environment",
+  "version": "1.6.12-development-environment",
 
   "name": "Iris",
   "description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",