Merge branch '1.17.1' into 1.18.2

# Conflicts:
#	src/main/resources/fabric.mod.json

Author: IMS212

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",
@@ -58,7 +58,8 @@
     "batchedentityrendering": "*",
     "canvas": "*",
     "optifabric": "*",
-    "worldeditcui": "<1.18.1"
+    "worldeditcui": "<1.18.1",
+    "immersive_portals": "<=1.4.2"
   },
 
   "custom": {