diff --git a/build.gradle b/build.gradle
index 67207804e..a409492ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,7 @@ import dev.ithundxr.silk.ChangelogText
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3.+" apply false
-    id "io.github.juuxel.loom-vineflower" version "1.+" apply false // Vineflower, a better decompiler
+    id "dev.architectury.loom" version "1.4.+" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.3.4" apply false // https://github.com/modmuss50/mod-publish-plugin
     id "dev.ithundxr.silk" version "0.11.15" // https://github.com/IThundxr/silk
 }
@@ -14,7 +13,6 @@ architectury {
 
 subprojects {
     apply plugin: "dev.architectury.loom"
-    apply plugin: "io.github.juuxel.loom-vineflower"
 
     loom {
         silentMojangMappingsLicense()
@@ -108,14 +106,6 @@ allprojects {
     java {
         withSourcesJar()
     }
-
-    configurations.configureEach {
-        resolutionStrategy.eachDependency {
-            if (requested.module.name == "fabric-loader") {
-                useVersion(fabric_loader_version)
-            }
-        }
-    }
 }
 
 String getChangelogText() {
diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinCarriageContraptionEntity.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinCarriageContraptionEntity.java
index 10cdef644..d50f5b088 100644
--- a/common/src/main/java/com/railwayteam/railways/mixin/MixinCarriageContraptionEntity.java
+++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinCarriageContraptionEntity.java
@@ -19,11 +19,7 @@
 import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
 import com.simibubi.create.content.contraptions.actors.trainControls.ControlsBlock;
 import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
-import com.simibubi.create.content.trains.entity.Carriage;
-import com.simibubi.create.content.trains.entity.CarriageContraption;
-import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
-import com.simibubi.create.content.trains.entity.Navigation;
-import com.simibubi.create.content.trains.entity.Train;
+import com.simibubi.create.content.trains.entity.*;
 import com.simibubi.create.foundation.utility.Pair;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 081d747e5..9a0b7d913 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -63,14 +63,6 @@ repositories {
     } // Cardinal Components (Hex Casting dependency)
 }
 
-configurations.configureEach {
-    resolutionStrategy.eachDependency {
-        if (requested.module.name == "fabric-loader") {
-            useVersion(fabric_loader_version)
-        }
-    }
-}
-
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}")
     common(project(path: ":common", configuration: "namedElements")) { transitive = false }
diff --git a/gradle.properties b/gradle.properties
index 4f38bca29..767ef33f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ parchment_version = 2022.11.27
 
 # Fabric
 # https://fabricmc.net/develop/
-fabric_loader_version = 0.14.22
+fabric_loader_version = 0.15.1
 fabric_api_version = 0.76.0+1.19.2
 
 # Forge
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f..3499ded5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists