diff --git a/Common/src/main/resources/assets/carryon/lang/fr_fr.json b/Common/src/main/resources/assets/carryon/lang/fr_fr.json index 916c10e..803474b 100644 --- a/Common/src/main/resources/assets/carryon/lang/fr_fr.json +++ b/Common/src/main/resources/assets/carryon/lang/fr_fr.json @@ -13,4 +13,4 @@ "key.carry.desc": "Saisir", "key.carry.category": "Carry On" -} +} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index c686fd6..7e2d556 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -119,12 +119,10 @@ repositories { dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" compileOnly project(":Common") - minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") - annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") + minecraftLibrary(annotationProcessor(shade(("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")))) //implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2") //implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2") annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' - shade("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") fileTree("libs").matching { include "*.jar" @@ -139,9 +137,9 @@ dependencies { shadowJar { configurations = [project.configurations.shade] - relocate 'com.github.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras' + relocate 'com.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras' finalizedBy 'reobfShadowJar' - classifier = "" + archiveClassifier = "" } assemble.dependsOn shadowJar diff --git a/gradle.properties b/gradle.properties index 2067c5a..d27460c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=2.0.3 +version=2.0.4 group=tschipp.carryon # Common