Merge pull request #454 from Tschipp/1.19.2
Fixed shadowing of mixinextras, added french translation
This commit is contained in:
commit
7aacc4a524
|
|
@ -13,4 +13,4 @@
|
|||
|
||||
"key.carry.desc": "Saisir",
|
||||
"key.carry.category": "Carry On"
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Project
|
||||
version=2.0.3
|
||||
version=2.0.4
|
||||
group=tschipp.carryon
|
||||
|
||||
# Common
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user