Updated Upstream (Paper & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
04324c58b2 Disable enderpearls when they hit non-ticking chunk if disableEnderpearlExploit is enabled
310c718ed5 Fix CocaoDecorator causing a crash during generation (Fixes #6028)
295703efb6 Fixup enderpearl patch
c3d50184eb Do not create nether portals that delete undestroyable blocks Fixes #5773
1b383d7e9b Fix VanillaGoals when in reobfuscated environment (#6580)
8a2b23a6a4 Remove method rename and fix reobf for Goal#getFlags (#6528)
d060913a61 [ci skip] Fix typos in Paper comments (#6588)

Airplane Changes:
01dd14c643 Remove tuinity from list of configs
ee3acc2118 Improve compat of container bitset patch
e7d60ac96f Upstream
b2e5f77cbe Fix including old snakeyaml in server jar
007e960396 Merge pull request #58 from Machine-Maker/fix/old-snakeyaml-dep
2386904e30 Revert .gitignore change
This commit is contained in:
William Blake Galbreath
2021-09-11 12:06:44 -05:00
parent 6115484b6e
commit 6856a5dd2c
6 changed files with 128 additions and 83 deletions

View File

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
mcVersion = 1.17.1
packageVersion = 1_17_R1
paperCommit = 5960af9d8707cae5e612820e3b7794575048c23b
paperCommit = d060913a61b7fc578455684ceb39b735b0c1d238
org.gradle.caching = true
org.gradle.parallel = true