Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gradle/8.4/checksums/checksums.lock
#	.gradle/8.4/checksums/sha1-checksums.bin
#	.gradle/8.4/executionHistory/executionHistory.bin
#	.gradle/8.4/executionHistory/executionHistory.lock
#	.gradle/8.4/fileHashes/fileHashes.bin
#	.gradle/8.4/fileHashes/fileHashes.lock
#	.gradle/8.4/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/file-system.probe
#	build/sourcesSets/main/assets/cryptoworld/lang/en_us.json
#	build/sourcesSets/main/assets/cryptoworld/lang/fr_fr.json
#	build/sourcesSets/main/fr/jachou/cryptoworld/item/ModCreativeModTabs.class
#	build/sourcesSets/main/fr/jachou/cryptoworld/item/ModItems.class
#	build/tmp/compileJava/compileTransaction/stash-dir/ModCreativeModTabs.class.uniqueId0
#	build/tmp/compileJava/compileTransaction/stash-dir/ModItems.class.uniqueId0
#	build/tmp/compileJava/previous-compilation-data.bin
#	run/logs/debug-1.log.gz
#	run/logs/debug-2.log.gz
#	run/logs/debug-3.log.gz
#	run/logs/debug-4.log.gz
#	run/logs/debug-5.log.gz
#	run/logs/debug.log
#	run/logs/latest.log
#	run/saves/New World/DIM-1/data/raids.dat
#	run/saves/New World/DIM1/data/raids_end.dat
#	run/saves/New World/data/raids.dat
#	run/saves/New World/entities/r.-1.-1.mca
#	run/saves/New World/entities/r.-1.0.mca
#	run/saves/New World/entities/r.0.-1.mca
#	run/saves/New World/entities/r.0.0.mca
#	run/saves/New World/level.dat
#	run/saves/New World/level.dat_old
#	run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat
#	run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old
#	run/saves/New World/region/r.-1.-1.mca
#	run/saves/New World/region/r.-1.0.mca
#	run/saves/New World/region/r.0.-1.mca
#	run/saves/New World/region/r.0.0.mca
#	run/saves/New World/stats/380df991-f603-344c-a090-369bad2a924a.json
#	run/usercache.json
#	src/main/java/fr/jachou/cryptoworld/item/ModCreativeModTabs.java
#	src/main/resources/assets/cryptoworld/lang/en_us.json
#	src/main/resources/assets/cryptoworld/lang/fr_fr.json

.github/workflows/gradle.yml

@@ -0,0 +1,51 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+
+    - name: Make gradlew executable
+      run: chmod +x ./gradlew
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build
+
+    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
+    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
+    #
+    # - name: Setup Gradle
+    #   uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+    #   with:
+    #     gradle-version: '8.5'
+    #
+    # - name: Build with Gradle 8.5
+    #   run: gradle build

build/_applyBinpatches_2/log.txt

@@ -1,8 +1,8 @@
-Java Launcher: C:\Users\matis\.jdks\corretto-17.0.6\bin\java.exe
+Java Launcher: C:\Program Files\Java\jdk-17\bin\java.exe
 Arguments: '--clean, C:\Users\matis\.gradle\caches\forge_gradle\mcp_repo\net\minecraft\joined\1.20.4-20231207.112700\joined-1.20.4-20231207.112700-srg.jar, --output, C:\Users\matis\.gradle\caches\forge_gradle\minecraft_user_repo\net\minecraftforge\forge\1.20.4-49.1.0\forge-1.20.4-49.1.0-binpatched.jar, --apply, C:\Users\matis\.gradle\caches\forge_gradle\minecraft_user_repo\net\minecraftforge\forge\1.20.4-49.1.0\forge-1.20.4-49.1.0-binpatches.lzma'
 Classpath:
  - C:\Users\matis\.gradle\caches\forge_gradle\maven_downloader\net\minecraftforge\binarypatcher\1.2.0\binarypatcher-1.2.0-fatjar.jar
-Working directory: C:\Users\matis\IdeaProjects\untitled\build\_applyBinpatches_2
+Working directory: C:\Users\matis\IdeaProjects\CryptoWorld\build\_applyBinpatches_2
 Main class: net.minecraftforge.binarypatcher.ConsoleTool
 ====================================
 Applying: