Merge branch 'trunk' into 1.17.1

IMS212 · IMS212 · commit f69e8e0a7717 · 2022-06-06T15:36:40.000-07:00
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.5-pre-development-environment",
+  "version": "1.2.5-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.5-pre-development-environment",`
	`4`	`+ "version": "1.2.5-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",`