diff --git a/.github/workflows/gradlebuild.yml b/.github/workflows/gradlebuild.yml
index f7f5daa..59841f8 100755
--- a/.github/workflows/gradlebuild.yml
+++ b/.github/workflows/gradlebuild.yml
@@ -1,9 +1,6 @@
 name: Gradle Build
 
-on:
-  push:
-    branches:
-      - '*'
+on: [ push, pull_request ]
 
 jobs:
   build:
diff --git a/build.gradle b/build.gradle
index 9efa182..50e55c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-    id 'org.quiltmc.loom' version '0.8.+'
+    id 'fabric-loom' version '0.9.+'
+    id 'io.github.juuxel.loom-quiltflower' version '1.1.1'
     id 'java-library'
     id 'maven-publish'
     id 'org.cadixdev.licenser' version '0.6.1'
@@ -53,17 +54,13 @@ minecraft {
 }
 
 repositories {
-    maven {
-        name 'Fabric'
-        url 'https://maven.fabricmc.net/'
-    }
 }
 
 dependencies {
     //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "org.quiltmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2"
-    modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
+    mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}") {
         exclude group: 'net.fabricmc'
diff --git a/gradle.properties b/gradle.properties
index 76b4186..cbd4e68 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 # Quilt properties
 minecraft_version=1.17.1
 yarn_mappings=1
-loader_version=0.13.1-rc.10
+loader_version=0.11.6
 fabric_api_version=0.36.1+1.17
 
 # Mod properties
diff --git a/settings.gradle b/settings.gradle
index bb9e991..d24a1c8 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,14 @@ pluginManagement {
             name 'Quilt'
             url 'https://maven.quiltmc.org/repository/release'
         }
+        maven {
+            name 'Fabric'
+            url 'https://maven.fabricmc.net/'
+        }
+        maven {
+            name = 'Cotton'
+            url = 'https://server.bbkr.space/artifactory/libs-release/'
+        }
         gradlePluginPortal()
     }
 }
\ No newline at end of file