Automatically merged delta branch to master.

This commit is contained in:
Jenkins 2022-01-10 04:26:07 -06:00
commit 4c958fba06
3 changed files with 7 additions and 4 deletions

4
run.sh
View File

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
git reset --hard ./update.sh
git pull origin master --ff-only
git checkout master@{'24 hours ago'}
java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui

View File

@ -1,3 +1,3 @@
env.VER_MAJOR=0 env.VER_MAJOR=0
env.VER_MINOR=0 env.VER_MINOR=0
env.VER_PATCH=7 env.VER_PATCH=9

5
update.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
git reset --hard
git pull origin master --ff-only
git checkout master@{'24 hours ago'}