Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4514f41 Correct duplicate attribute check (#10901)
This commit is contained in:
granny 2024-06-18 02:20:36 -07:00
parent dd826a31ca
commit 778995ddce
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar" />
<option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.21-R0.1-SNAPSHOT-mojmap.jar" />
<option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
<option name="ALTERNATIVE_JRE_PATH" />

View File

@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21-R0.1-SNAPSHOT
mcVersion = 1.21
paperCommit = b4b820851f5291c467b1a9590750a10ec67af4f6
paperCommit = 4514f41ffa6c899c19c74d4473a2da5766d4a883
org.gradle.caching = true
org.gradle.parallel = true