diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java
index dabd416..0919115 100644
--- a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java
+++ b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java
@@ -7,14 +7,12 @@ import com.mojang.blaze3d.platform.DepthTestFunction;
 import com.mojang.blaze3d.vertex.MeshData;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.ShaderDefines;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
-import java.util.Optional;
 
-//Credit: klikli
+//Credit: klikli for the idea and code for this wrapper
 public class CarryOnRenderType extends RenderType {
 
     private static final Map<RenderType, RenderType> remappedTypes = new IdentityHashMap<>();
diff --git a/Forge/build.gradle b/Forge/build.gradle
index d1a1aa3..a5b5d21 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'idea'
     id 'java'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
@@ -36,7 +36,7 @@ jarJar.enable()
 build.dependsOn tasks.jarJar
 
 minecraft {
-    mappings channel: 'parchment', version: "${parchment_mappings}"
+    mappings channel: 'parchment', version: parchment_mappings
     copyIdeResources = true
     reobf = false
 
diff --git a/gradle.properties b/gradle.properties
index fa20bbd..038ddca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,22 +12,22 @@ credits=
 description=Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands.
 minecraft_version_range=[1.21.5, 1.22)
 # Forge
-forge_version=55.0.6
+forge_version=55.0.24
 forge_loader_version_range=[55,)
 forge_version_range=[55,)
-parchment_mappings=2025.04.19-1.21.5
+parchment_mappings=2025.06.15-1.21.5
 //forge_ats_enabled=true
 
 # Fabric
 fabric_version=0.121.0+1.21.5
 fabric_loader_version=0.16.13
-parchment_mappings_fabric=1.21.5:2025.04.19
+parchment_mappings_fabric=1.21.5:2025.06.15
 
 # Neoforge
 neoforge_version=21.5.78
 neoforge_loader_version_range=[4,)
 neogradle.subsystems.parchment.minecraftVersion=1.21.5
-neogradle.subsystems.parchment.mappingsVersion=2025.04.19
+neogradle.subsystems.parchment.mappingsVersion=2025.06.15
 
 
 # Gradle