Merge remote-tracking branch 'origin/main'

build.gradle

@@ -230,7 +230,7 @@ subprojects { p ->
         forgeShadowMe("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}")
         
         // Netty
-        implementation("io.netty:netty-all:${rootProject.netty_version}")
+        forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}")
 
         // Remember, for lwjgl dependancies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
         forgeShadowMe("org.lwjgl:lwjgl-jawt:3.2.2") {
@@ -311,6 +311,9 @@ subprojects { p ->
 
         // SVG
         relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
+        
+        // Netty
+        relocate "io.netty", "${librariesLocation}.netty"
 
         mergeServiceFiles()
     }