Updated Upstream (Paper, Tuinity & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b94a99b03 Updated Upstream (CraftBukkit) (#5762)
f5cb169e0 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
3eda860f4 Updated Upstream (Paper)
e9c834821 Revert entity ticking chunk map for tracker

Airplane Changes:
3e07ea8cf Patch container checks for WildChests compat
d04adc933 Updated Upstream (Tuinity)
489bb761c Update gradle
0d5670e62 Merge pull request #24 from HexedHero/spelling-mistake-lightning
c605be6dc Fix typo
This commit is contained in:
Ben Kerllenevich
2021-06-01 17:40:11 -04:00
parent 2b35782c51
commit d2204a3dac
17 changed files with 337 additions and 1200 deletions

View File

@@ -18,7 +18,7 @@ index 5e672a0660d0aceffcdb26d185590ca18aa4f023..4b171a2a60e24947e884f8988920f335
}
final Object val = config.get(key);
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
index a30bb38144acb74f41638cc2b573e09265cde0e1..6b20eb6f2a0a5bcaa88438cf14e1fbfe31c00627 100644
index e1dc7c1025e19f7393a45719af8fe7aae016184d..dd45a896998e4d5637ef0dd08f2b72d6b6f891de 100644
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -1,5 +1,6 @@