Merged into main 1.21 branch

Updated everything to work with 1.21
TeamGalacticraft · Sep 3, 2024 · 8e8a2e2 · 8e8a2e2
1 parent 8d8cd83
commit 8e8a2e2
Show file tree

Hide file tree

Showing 50 changed files with 891 additions and 701 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,20 +1,20 @@
-# Windows files (CRLF)
-*.bat           text eol=crlf
-
-# Text
-*.properties    text
-
-# Java
-*.java          text diff=java
-*.gradle        text diff=java
-*.gradle.kts    text diff=kotlin
-
-# Binary
-*.class         binary
-*.dll           binary
-*.ear           binary
-*.jar           binary
-*.so            binary
-*.war           binary
-
-**/.cache/*     linguist-generated=true
+# Windows files (CRLF)
+*.bat           text eol=crlf
+
+# Text
+*.properties    text
+
+# Java
+*.java          text diff=java
+*.gradle        text diff=java
+*.gradle.kts    text diff=kotlin
+
+# Binary
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.jar           binary
+*.so            binary
+*.war           binary
+
+**/.cache/*     linguist-generated=true