Merge branch '1.17.1-maintenance' into 1.18.2

IMS212 · IMS212 · commit 040efbcd3113 · 2022-08-27T15:16:29.000-07:00
diff --git a/src/main/java/net/coderbot/iris/pipeline/newshader/NewWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/newshader/NewWorldRenderingPipeline.java
@@ -194,7 +194,7 @@ public NewWorldRenderingPipeline(ProgramSet programSet) throws IOException {
 
 		BufferFlipper flipper = new BufferFlipper();
 
-		this.centerDepthSampler = new CenterDepthSampler(programSet.getPackDirectives().getCenterDepthHalfLife());
+		this.centerDepthSampler = new CenterDepthSampler(renderTargets, programSet.getPackDirectives().getCenterDepthHalfLife());
 
 		this.shadowMapResolution = programSet.getPackDirectives().getShadowDirectives().getResolution();
 
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.2.7-pre-development-environment",
+  "version": "1.2.7-development-environment",
 
   "name": "Iris",
   "description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"schemaVersion": 1,`
`3`	`3`	`"id": "iris",`
`4`		`- "version": "1.2.7-pre-development-environment",`
	`4`	`+ "version": "1.2.7-development-environment",`
`5`	`5`
`6`	`6`	`"name": "Iris",`
`7`	`7`	`"description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",`