mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d4a95784 Experimental annotation changes (#12028) PaperMC/Paper@5bcfb12a Fix activation range config and water animal status (#12047) PaperMC/Paper@e0711af5 Deprecate UnsafeValues#getSpawnEggLayerColor (#12041)
This commit is contained in:
@@ -40,5 +40,5 @@ ij_java_use_fq_class_names = true
|
|||||||
[purpur-server/src/minecraft/resources/data/**/*.json]
|
[purpur-server/src/minecraft/resources/data/**/*.json]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[paper-api/src/generated/**/*.java]
|
[paper-api/src/generated/java/**/*.java]
|
||||||
ij_java_imports_layout = $*,|,*
|
ij_java_imports_layout = $*,|,*
|
||||||
|
|||||||
@@ -243,7 +243,8 @@ required.
|
|||||||
with `// Purpur end - <COMMIT DESCRIPTION>`.
|
with `// Purpur end - <COMMIT DESCRIPTION>`.
|
||||||
- One-line changes should have `// Purpur - <COMMIT DESCRIPTION>` at the end of the line.
|
- One-line changes should have `// Purpur - <COMMIT DESCRIPTION>` at the end of the line.
|
||||||
|
|
||||||
> [!NOTE] These comments are incredibly important to be able to keep track of changes
|
> [!NOTE]
|
||||||
|
> These comments are incredibly important to be able to keep track of changes
|
||||||
> across files and to remember what they are for, even a decade into the future.
|
> across files and to remember what they are for, even a decade into the future.
|
||||||
|
|
||||||
Here's an example of how to mark changes by Purpur:
|
Here's an example of how to mark changes by Purpur:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
|||||||
version = 1.21.4-R0.1-SNAPSHOT
|
version = 1.21.4-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.4
|
mcVersion = 1.21.4
|
||||||
paperCommit = 54b2e9d9738ce32e2f415c321f20e3fc07063c14
|
paperCommit = e0711af5d5b485ff507f5168c8c146689941421d
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
Reference in New Issue
Block a user