Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2

# Conflicts:
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java

1 files changed, 7 insertions, 9 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
index 0a59b313d..566b52c22 100644
--- a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
+++ b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
@@ -62,7 +62,7 @@ public class RoughlyEnoughItemsInitializerImpl {
             RoughlyEnoughItemsState.error("Architectury API is not installed!", "https://www.curseforge.com/minecraft/mc-mods/architectury-fabric/files/all");
         } else {
             Version version = FabricLoader.getInstance().getModContainer("architectury").get().getMetadata().getVersion();
-    
+            
             try {
                 if (version instanceof SemanticVersion && SemanticVersion.parse("2.6.0").compareTo((SemanticVersion) version) > 0) {
                     RoughlyEnoughItemsState.error("Architectury API is too old, please update!", "https://www.curseforge.com/minecraft/mc-mods/architectury-fabric/files/all");
@@ -72,14 +72,8 @@ public class RoughlyEnoughItemsInitializerImpl {
             }
         }
         if (isClient()) {
-            try {
-                if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) {
-                    RoughlyEnoughItemsState.error("Cloth Config is not installed!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
-                } else if (SemanticVersion.parse(FabricLoader.getInstance().getModContainer("cloth-config2").get().getMetadata().getVersion().getFriendlyString()).compareTo(SemanticVersion.parse("5.1")) < 0) {
-                    RoughlyEnoughItemsState.error("Your Cloth Config version is too old!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
-                }
-            } catch (VersionParsingException e) {
-                e.printStackTrace();
+            if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) {
+                RoughlyEnoughItemsState.error("Cloth Config is not installed!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
             }
         }
     }
@@ -87,4 +81,8 @@ public class RoughlyEnoughItemsInitializerImpl {
     public static boolean isDev() {
         return FabricLoader.getInstance().isDevelopmentEnvironment();
     }
+    
+    public static String getMinecraftVersion() {
+        return FabricLoader.getInstance().getModContainer("minecraft").get().getMetadata().getVersion().getFriendlyString();
+    }
 }