diff --git a/build.gradle b/build.gradle
index 96ff34a0..c8b58241 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
 	//REI
 	modImplementation("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}")
-	modRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
+	//modRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
 
 	//Wrenchable api
 	def wrenchVersion = "com.zundrel:wrenchable:${project.wrenchable_version}"
diff --git a/gradle.properties b/gradle.properties
index 4d462419..48560bd2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 	minecraft_version=1.17
-	yarn_mappings=build.11
+	yarn_mappings=build.13
 	loader_version=0.11.6
 
 # Mod Properties
@@ -13,7 +13,7 @@ org.gradle.jvmargs=-Xmx1G
 	mod_version = 2.1.0
 
 # Dependencies
-	fabric_version=0.35.2+1.17
-	patchouli_version=1.17-52-FABRIC-SNAPSHOT
-	rei_version=6.0.251-alpha
+	fabric_version=0.36.0+1.17
+	patchouli_version=1.17-55-FABRIC-SNAPSHOT
+	rei_version=6.0.258-alpha
 	wrenchable_version=1.1.0+1.17
\ No newline at end of file
diff --git a/src/main/java/modfest/lacrimis/util/DuctUtil.java b/src/main/java/modfest/lacrimis/util/DuctUtil.java
index 44c43956..19bdb7c3 100644
--- a/src/main/java/modfest/lacrimis/util/DuctUtil.java
+++ b/src/main/java/modfest/lacrimis/util/DuctUtil.java
@@ -27,7 +27,7 @@
 public class DuctUtil {
 
     public static List<BlockPos> scanDucts(World world, BlockPos pos, boolean extracting, int goal, Tester test) {
-        if(world == null || world instanceof ClientWorld)
+        if(world == null || world.isClient)
             return new ArrayList<>();
 
         //Set up block lists
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index fab106b3..74ecde27 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -14,7 +14,7 @@
   ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/lacrimis",
-    "sources": "https://github.com/2xsaiko/modfest-1.16.git"
+    "sources": "https://github.com/2xsaiko/lacrimis.git"
   },
 
   "icon": "assets/lacrimis/icon.png",