Merge branch 'main' into gamma

Browse Source

# Conflicts:
#	ansible/files/paper-config/config/paper-world-defaults.yml
#	ansible/files/paper-config/server.properties
#	ansible/files/proxy-config/plugins/minimotd-velocity/extra-configs/main.conf
#	ansible/files/proxy-config/plugins/minimotd-velocity/extra-configs/pvp.conf
#	ansible/files/proxy-config/plugins/minimotd-velocity/main.conf
#	ansible/variables/settings.yml

...

This commit is contained in:

okx-code

2025-08-19 23:52:38 +01:00

parent fe9291a333 b456cbbb5f

commit 0883f2d40f

34 changed files with 787 additions and 82 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

ansible/src/paper-plugins/JoinBypass-1.0.jar

Binary file not shown.