merge

SteelCodeTeam · Oct 24, 2024 · b5f642b · b5f642b
1 parent e27f9fb
commit b5f642b
Show file tree

Hide file tree

Showing 6 changed files with 578 additions and 661 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ plugins {
     id 'net.neoforged.gradle.userdev' version '7.0.145'
 }
 
-<<<<<<< HEAD
 tasks.named('wrapper', Wrapper).configure {
     // Define wrapper values here so as to not have to always do so when updating gradlew.properties.
     // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
@@ -17,9 +16,7 @@ tasks.named('wrapper', Wrapper).configure {
 }
 
 version = mod_version
-=======
-version = '1.20.1-1.2.0'
->>>>>>> 1e50cb9e7f31f76ac9b375a95bf7d0ac2bab0a2a
+
 group = mod_group_id
 
 repositories {

diff --git a/runs/client/logs/debug-1.log.gz b/runs/client/logs/debug-1.log.gz
diff --git a/runs/client/logs/debug-2.log.gz b/runs/client/logs/debug-2.log.gz
diff --git a/runs/client/logs/debug-3.log.gz b/runs/client/logs/debug-3.log.gz
diff --git a/runs/client/logs/debug.log b/runs/client/logs/debug.log