R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed shadowing of mixinextras, added french translation

Browse Source
This commit is contained in:
Tschipp 2023-01-26 22:59:14 +01:00
parent 3339a68564
commit efe2aef40b
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Common/src/main/resources/assets/carryon/lang/fr_fr.json Normal file
View File

@ -0,0 +1,16 @@
{
"carryon.category.settings": "Paramètres",
"carryon.category.blacklist": "Liste noire",
"carryon.category.modeloverrides": "Modèle de Remplacement (Avancé)",
"carryon.category.custompickupconditions": "Conditions de ramassage personalisés (Avancé)",
"carryon.category.whitelist": "Liste blanche",
"carryon.general.modeloverrides.modeloverrides": "Modèle de Remplacement",
"carryon.general.blacklist.forbiddenentities": "Entités que le joueur ne peut pas saisir",
"carryon.general.blacklist.forbiddentiles": "Blocs que le joueur ne peut pas saisir",
"carryon.category.custompickupconditions.custompickupconditionsblocks": "Conditions de ramassage de blocs personalisés",
"carryon.category.custompickupconditions.custompickupconditionsentities": "Conditions de ramassage d'entités personalisés",
"key.carry.desc": "Saisir",
"key.carry.category": "Carry On"
}

8
Forge/build.gradle
View File

@ -121,10 +121,8 @@ dependencies {
compileOnly project(":Common") compileOnly project(":Common")
implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2") implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.2:16.1.9") implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.2:16.1.9")
minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}") minecraftLibrary(annotationProcessor(shade(("com.github.LlamaLad7:MixinExtras:${mixinextras_version}"))))
annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
shade("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
fileTree("libs").matching { fileTree("libs").matching {
include "*.jar" include "*.jar"
@ -139,9 +137,9 @@ dependencies {
shadowJar { shadowJar {
configurations = [project.configurations.shade] configurations = [project.configurations.shade]
relocate 'com.github.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras' relocate 'com.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras'
finalizedBy 'reobfShadowJar' finalizedBy 'reobfShadowJar'
classifier = "" archiveClassifier = ""
} }
assemble.dependsOn shadowJar assemble.dependsOn shadowJar

2
gradle.properties
View File

@ -1,5 +1,5 @@
# Project # Project
version=2.0.3 version=2.0.4
group=tschipp.carryon group=tschipp.carryon
# Common # Common