Updated upstream

This commit is contained in:
William Blake Galbreath
2019-05-07 20:49:42 -05:00
committed by BillyGalbreath
parent b8fed8aaf2
commit 4944e87d37
6 changed files with 14 additions and 15 deletions

View File

@@ -13,7 +13,7 @@ cd $basedir
paperVer=$(cat current-paper)
minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
decompile="Paper/work/Minecraft/$minecraftversion/forge"
decompile="Paper/work/Minecraft/$minecraftversion/spigot"
mkdir -p mc-dev/src/net/minecraft/server

View File

@@ -11,7 +11,7 @@ done
if [[ "$1" == up* ]]; then
(
cd "$basedir/Paper/"
git fetch && git reset --hard origin/ver/1.14-pre5
git fetch && git reset --hard origin/ver/1.14
cd ../
git add Paper
)