diff --git a/build.gradle b/build.gradle
index b26bbb5..6ff1ff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
 
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
-    mod_version = '1.20.6-1.0.1' + "." + "${env.GITHUB_RUN_NUMBER}"
+    mod_version = '1.21-1.0.1' + "." + "${env.GITHUB_RUN_NUMBER}"
 }
 
 version = mod_version
@@ -78,9 +78,9 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    runtimeOnly "mezz.jei:jei-1.20.6-neoforge:18.0.0.62"
-    compileOnly "appeng:appliedenergistics2-neoforge:18.1.3-alpha"
-    runtimeOnly "appeng:appliedenergistics2-neoforge:18.1.3-alpha"
+    runtimeOnly "mezz.jei:jei-1.21-neoforge:19.0.0.5"
+    compileOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha"
+    runtimeOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha"
 }
 
 tasks.withType(ProcessResources).configureEach {
@@ -126,7 +126,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     mainFile.releaseType = 'release'
     mainFile.changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     mainFile.changelogType = 'markdown'
-    mainFile.gameVersions = ['1.20.6']
+    mainFile.gameVersions = ['1.21']
     mainFile.addModLoader("neoforge")
     mainFile.displayName = "AEInfinityBooster ${version}"
 
@@ -139,9 +139,9 @@ modrinth {
     versionName = "AEInfinityBooster $version"
     changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     uploadFile = jar
-    gameVersions = ["1.20.6"]
+    gameVersions = ["1.21"]
     loaders = ["neoforge"]
     dependencies {
-        required.version "ae2", "18.1.3-alpha"
+        required.version "ae2", "19.0.4-alpha"
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 1b90078..26685ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,13 +4,13 @@ org.gradle.daemon=false
 neogradle.subsystems.parchment.minecraftVersion=1.20.6
 neogradle.subsystems.parchment.mappingsVersion=2024.05.01
 
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6,1.21)
+minecraft_version=1.21
+minecraft_version_range=[1.21,1.21.1)
 
-neo_version=20.6.112-beta
-neo_version_range=[20.6,)
+neo_version=21.0.18-beta
+neo_version_range=[21.0.0-beta,)
 
-loader_version_range=[2,)
+loader_version_range=[4,)
 
 ## Mod Properties
 mod_id=aeinfinitybooster
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
index 877bd70..8cfec44 100644
--- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
+++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,5 +1,5 @@
-// 1.20.6	2024-06-14T07:38:03.303348	Recipes
-999f2de23df4045d930cc5c6f13e5e99cdbe8f1b data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
-67dfca204b213514d07f518b8ed53de18ad64a64 data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
-a8aaa987085afbbd29c17987057086df95515aa0 data/aeinfinitybooster/recipes/dimension_card.json
-24e3b977ab090b5add6378dfb8625a4cd8b10f39 data/aeinfinitybooster/recipes/infinity_card.json
+// 1.21	2024-06-19T07:19:19.880141	Recipes
+999f2de23df4045d930cc5c6f13e5e99cdbe8f1b data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json
+67dfca204b213514d07f518b8ed53de18ad64a64 data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json
+a8aaa987085afbbd29c17987057086df95515aa0 data/aeinfinitybooster/recipe/dimension_card.json
+24e3b977ab090b5add6378dfb8625a4cd8b10f39 data/aeinfinitybooster/recipe/infinity_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json
similarity index 100%
rename from src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/dimension_card.json
rename to src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json
similarity index 100%
rename from src/generated/resources/data/aeinfinitybooster/advancements/recipes/misc/infinity_card.json
rename to src/generated/resources/data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json b/src/generated/resources/data/aeinfinitybooster/recipe/dimension_card.json
similarity index 100%
rename from src/generated/resources/data/aeinfinitybooster/recipes/dimension_card.json
rename to src/generated/resources/data/aeinfinitybooster/recipe/dimension_card.json
diff --git a/src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json b/src/generated/resources/data/aeinfinitybooster/recipe/infinity_card.json
similarity index 100%
rename from src/generated/resources/data/aeinfinitybooster/recipes/infinity_card.json
rename to src/generated/resources/data/aeinfinitybooster/recipe/infinity_card.json
diff --git a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java
index d2ddc92..095c9e5 100644
--- a/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java
+++ b/src/main/java/uk/co/hexeption/aeinfinitybooster/datagen/RecipeGenerator.java
@@ -36,14 +36,14 @@ protected void buildRecipes(RecipeOutput pRecipeOutput) {
                 .define('S', Items.NETHER_STAR)
                 .define('N', Items.NETHERITE_INGOT)
                 .unlockedBy("has_item", has(Items.NETHERITE_INGOT))
-                .save(pRecipeOutput, new ResourceLocation(AEInfinityBooster.MODID, "infinity_card"));
+                .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(AEInfinityBooster.MODID, "infinity_card"));
         ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.DIMENSION_CARD.get())
                 .pattern("RNR").pattern("NEN").pattern("RNR")
                 .define('R', ModItems.INFINITY_CARD.get())
                 .define('E', Items.ENDER_EYE)
                 .define('N', Items.NETHER_STAR)
                 .unlockedBy("has_item", has(ModItems.INFINITY_CARD.get()))
-                .save(pRecipeOutput, new ResourceLocation(AEInfinityBooster.MODID, "dimension_card"));
+                .save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(AEInfinityBooster.MODID, "dimension_card"));
     }
 
 }
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
index 34ea87f..b905ed1 100644
--- a/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -34,6 +34,6 @@ config="AEInfinityBooster.mixins.json"
 [[dependencies.${mod_id}]]
 modId="ae2"
 type="required"
-versionRange="[18.1.3-alpha,)"
+versionRange="[19.0.4-alpha,)"
 ordering="AFTER"
 side="BOTH"
diff --git a/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png b/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png
index 139336d..2cc8874 100644
Binary files a/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png and b/src/main/resources/assets/aeinfinitybooster/textures/item/dimension_card.png differ
diff --git a/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png b/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png
index 166c4e9..c198129 100644
Binary files a/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png and b/src/main/resources/assets/aeinfinitybooster/textures/item/infinity_card.png differ