twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream Spigot and upstreamMerge script

Browse Source 
Also remove paperclip from upstream merge, it shouldn't need merging very often
This commit is contained in:
Zach Brown
2016-03-21 12:32:05 -05:00
parent 291d1f7d21
commit 2241a54955
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot

Submodule Spigot updated: 04266858e3...f04e043eb1

3
upstreamMerge.sh
View File

@@ -12,5 +12,4 @@ function update {
update Bukkit update Bukkit
update CraftBukkit update CraftBukkit
update Paperclip update Spigot