Merge remote-tracking branch 'origin/delta'

This commit is contained in:
Jenkins 2022-04-16 00:35:08 -05:00
commit 447e25881d
2 changed files with 3 additions and 4 deletions

4
.gitignore vendored
View File

@ -203,5 +203,5 @@ plugins/dynmap/*.pending
plugins/WorldEdit/.archive-unpack/ plugins/WorldEdit/.archive-unpack/
!plugins/LuckPerms/*.db !plugins/LuckPerms/*.db
# Ignore the update script # Ignore environment scripts.
update.sh env/**

3
run.sh
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
./update.sh
/usr/lib/jvm/java-18-openjdk/bin/java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui /usr/lib/jvm/java-18-openjdk/bin/java -XX:+UseG1GC -Xmx5G -jar paper.jar nogui