From 778995ddce1e6ee032f8e6fce5ff6b70838bf992 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Tue, 18 Jun 2024 02:20:36 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4514f41 Correct duplicate attribute check (#10901)
---
 .idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml | 2 +-
 gradle.properties                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index 05a5aa732..ec876d75d 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -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" />
diff --git a/gradle.properties b/gradle.properties
index 3f810c3bc..6ee7412ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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