From 079dc6125984fbdcd9c53ff7b9700d4bacc28965 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Apr 2013 17:14:56 +1000 Subject: [PATCH] Now that thats out the way.. --- Bukkit | 2 +- Bukkit-Patches/0001-Spigot-POM-Changes.patch | 6 +++--- CraftBukkit | 2 +- CraftBukkit-Patches/0001-POM-Changes.patch | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Bukkit b/Bukkit index 01aabbb034..339554099f 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 01aabbb034c872827e415b456761a1965bb5c19d +Subproject commit 339554099fd7fc2bcb7c54b7a11483f64d86bdf7 diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch index 0d121add9b..fc465c0cb7 100644 --- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch +++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch @@ -1,11 +1,11 @@ -From 1db91f69acf598609351eec2b307131f30d7da36 Mon Sep 17 00:00:00 2001 +From 4145a7b047d2cc0496d18c6326b17811ec6ec5e9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 30 Jan 2013 23:44:29 -0500 Subject: [PATCH] Spigot POM Changes. diff --git a/pom.xml b/pom.xml -index 066717d..67a886a 100644 +index 9fb5ef7..66b7b98 100644 --- a/pom.xml +++ b/pom.xml @@ -1,43 +1,23 @@ @@ -23,7 +23,7 @@ index 066717d..67a886a 100644 + + org.spigotmc + spigot-api - 1.5.1-R0.2 + 1.5.1-R0.3-SNAPSHOT - Bukkit - http://www.bukkit.org + Spigot-API diff --git a/CraftBukkit b/CraftBukkit index 49b0699f4a..cbaf4f32fc 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 49b0699f4a559a25a6354283987ecd5ba868a3d4 +Subproject commit cbaf4f32fc78763d5f9ed3fee3a39c6aec1cff18 diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 3456b273c4..c9d4f86928 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 57dbe4d8f468fc1cecb4a3576df83d46f609a2af Mon Sep 17 00:00:00 2001 +From 6dd764bae1ebff787bcd16c1b055333995c80dbc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:44:24 +1100 Subject: [PATCH] POM Changes. diff --git a/pom.xml b/pom.xml -index 518aa9b..39ee598 100644 +index 9ff95c6..da1a0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,20 @@ @@ -25,7 +25,7 @@ index 518aa9b..39ee598 100644 + org.spigotmc + spigot jar - 1.5.1-R0.2 + 1.5.1-R0.3-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot