Fixed Merge Conflicts, uploaded local main

This commit is contained in:
2025-12-03 20:37:10 +01:00
36 changed files with 204 additions and 379 deletions

View File

@@ -1,2 +1,2 @@
#Wed Dec 03 17:27:55 CET 2025
#Wed Dec 03 20:34:21 CET 2025
gradle.version=8.14