diff options
| author | Jake Potrebic <[email protected]> | 2023-11-25 14:34:42 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-25 14:34:42 -0800 |
| commit | 0b20f94297fbd032e5d4251427962d6b0f9afed7 (patch) | |
| tree | 8df44a0531c565907b594c1aea67a132ce267e51 /patches/server/0001-Setup-Gradle-project.patch | |
| parent | 8eac3e1b93084f045251cd83f5714c2e8a776a9c (diff) | |
| download | Paper-0b20f94297fbd032e5d4251427962d6b0f9afed7.tar.gz Paper-0b20f94297fbd032e5d4251427962d6b0f9afed7.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9953)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
96340858 PR-938: Various Sound API improvements
cbfe0ff0 PR-937: Minor improvements to World#rayTrace documentation
e979ee95 PR-935: Change Consumer and Predicates to super
27ae46dc SPIGOT-3641, SPIGOT-7479, PR-931: Add missing values to EntityEffect
0616ec8b Add eclipse .factorypath file to .gitignore
CraftBukkit Changes:
8e162d008 PR-1301: Various Sound API improvements
eeb7dfc2d SPIGOT-7520: Attribute LootTableSeed missing for generated containers with attached LootTable
d433f086d PR-1297: Change Consumer and Predicates to super
864f616da SPIGOT-7518: Fix NullPointerException when calling Block#applyBoneMeal()
5a2d905af Add eclipse .factorypath file to .gitignore
7c6bf15d4 Fix SkullMeta configuration serialization / deserialization with note block sound
Spigot Changes:
7de1049b Rebuild patches
Diffstat (limited to 'patches/server/0001-Setup-Gradle-project.patch')
| -rw-r--r-- | patches/server/0001-Setup-Gradle-project.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index b62a9a1e77..2636d0cfaf 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -8,7 +8,7 @@ apply if there are changes made to it from upstream - thus notifying us that changes were made. diff --git a/.gitignore b/.gitignore -index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45bf990d799 100644 +index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f7f570448 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ @@ -18,7 +18,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b # Eclipse stuff /.classpath /.project -@@ -38,3 +41,7 @@ dependency-reduced-pom.xml +@@ -39,3 +42,7 @@ dependency-reduced-pom.xml /src/main/resources/achievement /src/main/resources/lang |