Merge branch 'master' into Strip-MixinExtras

drori200 · Oct 14, 2023 · 424b8fc · 424b8fc
2 parents 81e2fa1 + cec3048
commit 424b8fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/module-all/build.gradle b/module-all/build.gradle
@@ -75,9 +75,9 @@ task createMergedAnnotationProcessorConfig() {
 	doLast {
 		// MixinExtras's APs have to be registered before Mixin's,
 		// so we manually merge the APs to ensure this is the case.
-		file(path).text = """com.llamalad7.mixinextras.MixinExtrasAP
+		file(path).text = """com.llamalad7.mixinextras.ap.MixinExtrasAP
 io.github.tox1cozz.mixinextras.MixinExtrasAnnotationProcessor
-com.gtnewhorizon.mixinextras.MixinExtrasAP
+com.gtnewhorizon.mixinextras.ap.MixinExtrasAP
 org.spongepowered.tools.obfuscation.MixinObfuscationProcessorInjection
 org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets
 """

diff --git a/module-common/build.gradle b/module-common/build.gradle
@@ -1 +1 @@
-archivesBaseName = archivesBaseName.replace("-1.7.10", "-common-1.7.10")
+archivesBaseName = archivesBaseName.replace("-1.7.10", "-common-1.7.10" )
diff --git a/module-gtnhmixins/gradle.properties b/module-gtnhmixins/gradle.properties
@@ -1 +1 @@
-extraVersion=2.1.13
+extraVersion=2.1.13
diff --git a/module-mixinextras/gradle.properties b/module-mixinextras/gradle.properties
@@ -1 +1 @@
-mixinExtrasVersion=0.2.0-beta.8
+mixinExtrasVersion=0.2.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		archivesBaseName = archivesBaseName.replace("-1.7.10", "-common-1.7.10")
		archivesBaseName = archivesBaseName.replace("-1.7.10", "-common-1.7.10" )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mixinExtrasVersion=0.2.0-beta.8
		mixinExtrasVersion=0.2.0