Merge branch 'viaversion'

# Conflicts: # src/main/java/net/earthcomputer/multiconnect/protocols/generic/TagLoader.java
Earthcomputer · Dec 7, 2022 · 8a8b128 · 8a8b128
2 parents aa005bf + 517bde8
commit 8a8b128
Show file tree

Hide file tree

Showing 1,768 changed files with 2,767 additions and 482,918 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,6 @@
+The MIT license below applies to all files in this project except for those under the via-translator directory. Those
+files are instead licensed under GPLv3, specified in the license file in that directory.
+
 MIT License
 
 Copyright (c) 2019 Joseph Burton (Earthcomputer)

diff --git a/annotationProcessor/build.gradle.kts b/annotationProcessor/build.gradle.kts
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/ErrorConsumer.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/ErrorConsumer.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageProcessor.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageProcessor.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageType.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageType.kt
diff --git a/...ionProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageVariantProcessor.kt b/...ionProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageVariantProcessor.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageVariantType.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MessageVariantType.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectAP.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectAP.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectField.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectField.kt
diff --git a/...tationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectFunction.kt b/...tationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectFunction.kt
diff --git a/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectType.kt b/annotationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/MulticonnectType.kt
diff --git a/...tationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/NetworkEnumProcessor.kt b/...tationProcessor/src/main/kotlin/net/earthcomputer/multiconnect/ap/NetworkEnumProcessor.kt