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

2024-07-06 12:12:51 +08:00
parent 94ebec4b6d 62df1e321d
commit 51dc58379b
62 changed files with 493 additions and 278 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -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=7a6694c636
+archash=b857594d11