diff --git a/.gitmodules b/.gitmodules index bba7461f2..9cfc2efcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "Paper"] path = Paper url = https://github.com/PaperMC/Paper.git - branch = ver/1.16 + branch = master diff --git a/Paper b/Paper index 4fd174452..0dcce21fe 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 4fd17445297b41e7121303bf886b32192346e715 +Subproject commit 0dcce21fe6ff872c7242f7ca92c91b807b2fd073 diff --git a/current-paper b/current-paper index 567e215c7..10936f2c0 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--456103fb9c6742281c95b85d1b69ed8f98e270a3 +1.16.1--95fdac3371d91047af5414cb81b4d2545f270941 diff --git a/scripts/apply.sh b/scripts/apply.sh index a16d0c8ba..edc6f8db6 100755 --- a/scripts/apply.sh +++ b/scripts/apply.sh @@ -57,7 +57,7 @@ function applyPatch { echo "Resetting $target to $what_name..." git remote rm upstream > /dev/null 2>&1 git remote add upstream "$basedir"/"$what" >/dev/null 2>&1 - git checkout ver/1.16 2>/dev/null || git checkout -b ver/1.16 + git checkout master 2>/dev/null || git checkout -b master git fetch upstream >/dev/null 2>&1 git reset --hard upstream/upstream echo " Applying patches to $target..." diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 6e953328c..31196c9b5 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -11,7 +11,7 @@ done if [[ "$1" == up* ]]; then ( cd "$basedir/Paper/" || exit - git fetch && git reset --hard origin/ver/1.16 + git fetch && git reset --hard origin/master cd ../ git add Paper )