Merge remote-tracking branch 'origin/QuestCraft' into QuestCraft

# Conflicts:
#	src/main/jni/adrenotools/libadrenotools.so
#	src/main/jniLibs/arm64-v8a/libOSMesa_8.so
#	src/main/jniLibs/arm64-v8a/libbacktrace.so
#	src/main/jniLibs/arm64-v8a/libcutils.so
#	src/main/jniLibs/arm64-v8a/libdrm.so
#	src/main/jniLibs/arm64-v8a/libdrm_freedreno.so
#	src/main/jniLibs/arm64-v8a/libfile_redirect_hook.so
#	src/main/jniLibs/arm64-v8a/libgsl_alloc_hook.so
#	src/main/jniLibs/arm64-v8a/libhardware.so
#	src/main/jniLibs/arm64-v8a/libhook_impl.so
#	src/main/jniLibs/arm64-v8a/liblinkernsbypass.so
#	src/main/jniLibs/arm64-v8a/liblog.so
#	src/main/jniLibs/arm64-v8a/libmain_hook.so
#	src/main/jniLibs/arm64-v8a/libnativewindow.so
#	src/main/jniLibs/arm64-v8a/libsync.so
#	src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so

.gitattributes

@@ -2,9 +2,9 @@
 # https://help.github.com/articles/dealing-with-line-endings/
 # Linux start script should use lf
 /gradlew        text eol=lf
-
 # These are Windows script files and should use crlf
 *.bat           text eol=crlf
+*.so filter=lfs diff=lfs merge=lfs -text
 *.yml filter=lfs diff=lfs merge=lfs -text
 *.gitignore filter=lfs diff=lfs merge=lfs -text
 *.xml filter=lfs diff=lfs merge=lfs -text
@@ -22,7 +22,6 @@
 *.java filter=lfs diff=lfs merge=lfs -text
 *.mk filter=lfs diff=lfs merge=lfs -text
 *.h filter=lfs diff=lfs merge=lfs -text
-*.so filter=lfs diff=lfs merge=lfs -text
 *.a filter=lfs diff=lfs merge=lfs -text
 *.c filter=lfs diff=lfs merge=lfs -text
 *.cpp filter=lfs diff=lfs merge=lfs -text