From efe2aef40ba7b65e082ddfd0d305d1400149e3c9 Mon Sep 17 00:00:00 2001
From: Tschipp <11649893+Tschipp@users.noreply.github.com>
Date: Thu, 26 Jan 2023 22:59:14 +0100
Subject: [PATCH] Fixed shadowing of mixinextras, added french translation

---
 .../resources/assets/carryon/lang/fr_fr.json     | 16 ++++++++++++++++
 Forge/build.gradle                               |  8 +++-----
 gradle.properties                                |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 Common/src/main/resources/assets/carryon/lang/fr_fr.json

diff --git a/Common/src/main/resources/assets/carryon/lang/fr_fr.json b/Common/src/main/resources/assets/carryon/lang/fr_fr.json
new file mode 100644
index 0000000..22ff47e
--- /dev/null
+++ b/Common/src/main/resources/assets/carryon/lang/fr_fr.json
@@ -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"
+}
\ No newline at end of file
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 0bf4905..31d86e5 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -121,10 +121,8 @@ dependencies {
     compileOnly project(":Common")
     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")
-    minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
-    annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
+    minecraftLibrary(annotationProcessor(shade(("com.github.LlamaLad7:MixinExtras:${mixinextras_version}"))))
     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 b004558..2fc8cf4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version=2.0.3
+version=2.0.4
 group=tschipp.carryon
 
 # Common