Merge branch 'master' into do-you-hear-the-voices-too

This commit is contained in:
Mythril382
2024-06-17 02:06:46 +08:00
committed by GitHub
67 changed files with 1295 additions and 1168 deletions

View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000
archash=480129c79d
archash=7a6694c636