From e208ee61028160fa403483367c188ede2b2de090 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 9 Mar 2016 19:48:14 -0600 Subject: [PATCH] Update patch numbers for PR merges --- ...rce-pack-API.patch => 0022-Complete-resource-pack-API.patch} | 2 +- ...-Add-methods-for-working-with-arrows-stuck-in-living-.patch} | 2 +- ...rce-pack-API.patch => 0082-Complete-resource-pack-API.patch} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename Spigot-API-Patches/{0021-Complete-resource-pack-API.patch => 0022-Complete-resource-pack-API.patch} (98%) rename Spigot-Server-Patches/{0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0081-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (96%) rename Spigot-Server-Patches/{0081-Complete-resource-pack-API.patch => 0082-Complete-resource-pack-API.patch} (98%) diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch similarity index 98% rename from Spigot-API-Patches/0021-Complete-resource-pack-API.patch rename to Spigot-API-Patches/0022-Complete-resource-pack-API.patch index b3293384b..0eef6f3ab 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 1fe05b39f496bf67557f4b3141be6df53b3875fa Mon Sep 17 00:00:00 2001 +From fa6a25250e75d5ec7ded2fc985067a64e71e6b0f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0081-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 96% rename from Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to Spigot-Server-Patches/0081-Add-methods-for-working-with-arrows-stuck-in-living-.patch index d5f1760c9..23cac6d9d 100644 --- a/Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0081-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From 080f6f76edc93265017af03097d1a11e744630f1 Mon Sep 17 00:00:00 2001 +From 75bad843fd7489be586bd503a4e6f4155f13474a Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/Spigot-Server-Patches/0081-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0082-Complete-resource-pack-API.patch similarity index 98% rename from Spigot-Server-Patches/0081-Complete-resource-pack-API.patch rename to Spigot-Server-Patches/0082-Complete-resource-pack-API.patch index ade52ec1d..5d2b2debe 100644 --- a/Spigot-Server-Patches/0081-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0082-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 9b4bc274753dc6714b5614577905400cab043360 Mon Sep 17 00:00:00 2001 +From ba76b4cb1be00b84939bdffcb7206f9c18edc838 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API