Merge remote-tracking branch 'origin/1.20' into 1.20.4

Author: embeddedt

buildSrc/src/main/groovy/modernfix.common-conventions.gradle

@@ -77,5 +77,4 @@ repositories {
     maven {
         url 'https://maven.terraformersmc.com/releases'
     }
-    maven { url = "https://jitpack.io" }
 }

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 junit_version=5.10.0-M1
-mixinextras_version=0.3.1
+mixinextras_version=0.3.2
 
 mod_id=modernfix
 minecraft_version=1.20.4

neoforge/build.gradle

@@ -35,8 +35,7 @@ repositories {
 
 dependencies {
     neoForge "net.neoforged:neoforge:${rootProject.forge_version}"
-    //implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
-    //implementation(include("com.github.llamalad7.mixinextras:mixinextras-forge:${rootProject.mixinextras_version}"))
+
     // Remove the next line if you don't want to depend on the API
     // modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}"