diff options
| author | Jake Potrebic <[email protected]> | 2022-07-22 11:18:00 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-22 11:18:00 -0700 |
| commit | 52a60ad9462bad027c3a2e7c5a7a9f9d9260697b (patch) | |
| tree | 07048f81f6aa87397324f89361442beb9afbdba1 /scripts | |
| parent | d0e7fa4dc95adf25d01736194a389e768250537f (diff) | |
| download | Paper-52a60ad9462bad027c3a2e7c5a7a9f9d9260697b.tar.gz Paper-52a60ad9462bad027c3a2e7c5a7a9f9d9260697b.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8172)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
23f557a0 SPIGOT-5380, SPIGOT-6958, PR-772: Add some missing entity API
CraftBukkit Changes:
fc3071161 SPIGOT-5380, SPIGOT-6958, PR-1085: Add some missing entity API
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upstreamCommit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index fbf791c34e..3e5e79f1b9 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -5,7 +5,7 @@ PS1="$" function changelog() { base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1) - cd $1 && git log --oneline ${base}...HEAD | sed -E 's/(^[0-9a-f]{8,} |Revert ")#([0-9]+)/\1PR-\2/' + cd $1 && git log --oneline ${base}...HEAD | sed -E 's/(^[0-9a-f]{8,}( SPIGOT-[0-9]{1,4},?)* |Revert ")#([0-9]+)/\1PR-\3/' } bukkit=$(changelog work/Bukkit) cb=$(changelog work/CraftBukkit) |