User: joe
Date: 14 Nov 26 02:04
Revision: d89d461b1eb18d4a1bee68f81204fbd6ee304e6f
Summary:
Merge branch '2026.1' into 2026.2

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10772&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision bf5a985d23f2f425bca2a98d7bf3619b1af3dade)
+++ gradle.properties	(revision d89d461b1eb18d4a1bee68f81204fbd6ee304e6f)
@@ -30,3 +30,6 @@
 
 org.gradle.parallel=true
 org.gradle.caching=true
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true