Fixed Merge Conflicts, uploaded local main

2025-12-03 20:37:10 +01:00
parent c10de39091 90fbacadaa
commit 0db43fe51a
36 changed files with 204 additions and 379 deletions
--- a/.gradle/8.14/executionHistory/executionHistory.bin
+++ b/.gradle/8.14/executionHistory/executionHistory.bin
--- a/.gradle/8.14/expanded/expanded.lock
+++ b/.gradle/8.14/expanded/expanded.lock
--- a/.gradle/8.14/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.14/fileHashes/resourceHashesCache.bin
--- a/.gradle/9.1.0/checksums/checksums.lock
+++ b/.gradle/9.1.0/checksums/checksums.lock
--- a/.gradle/9.1.0/checksums/md5-checksums.bin
+++ b/.gradle/9.1.0/checksums/md5-checksums.bin
--- a/.gradle/9.1.0/checksums/sha1-checksums.bin
+++ b/.gradle/9.1.0/checksums/sha1-checksums.bin
--- a/.gradle/9.1.0/executionHistory/executionHistory.bin
+++ b/.gradle/9.1.0/executionHistory/executionHistory.bin
--- a/.gradle/9.1.0/executionHistory/executionHistory.lock
+++ b/.gradle/9.1.0/executionHistory/executionHistory.lock
--- a/.gradle/9.1.0/expanded/expanded.lock
+++ b/.gradle/9.1.0/expanded/expanded.lock
--- a/.gradle/9.1.0/fileChanges/last-build.bin
+++ b/.gradle/9.1.0/fileChanges/last-build.bin
--- a/.gradle/9.1.0/fileHashes/fileHashes.bin
+++ b/.gradle/9.1.0/fileHashes/fileHashes.bin
--- a/.gradle/9.1.0/fileHashes/fileHashes.lock
+++ b/.gradle/9.1.0/fileHashes/fileHashes.lock
--- a/.gradle/9.1.0/fileHashes/resourceHashesCache.bin
+++ b/.gradle/9.1.0/fileHashes/resourceHashesCache.bin
--- a/.gradle/9.1.0/gc.properties
+++ b/.gradle/9.1.0/gc.properties
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Wed Dec 03 17:27:55 CET 2025
+#Wed Dec 03 20:34:21 CET 2025
 gradle.version=8.14
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe