Merge pull request #1 from PaperMC/main

update
Hinterhaeltiger · Jun 26, 2024 · 1fa5fe3 · 1fa5fe3
2 parents 38e6065 + 8b38c01
commit 1fa5fe3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/config-specs/paper/server-properties.yml b/config-specs/paper/server-properties.yml
@@ -15,6 +15,9 @@ broadcast-console-to-ops:
 broadcast-rcon-to-ops:
   default: "true"
   description: "Send rcon command output to all online operators."
+bug-report-link:
+  default: ""
+  description: "A URL value used for the Report Server Bugs button in the Server Links client menu."
 debug:
   default: "false"
   description: "Enables the server's debug mode."
@@ -181,6 +184,9 @@ require-resource-pack:
 resource-pack:
   default: ""
   description: "The URL to the server's resource pack. "
+resource-pack-id:
+  default: ""
+  description: "The UUID of the server resource pack to use."
 resource-pack-prompt:
   default: ""
   description: "The message that is displayed when the client is prompted to download the resource pack."

diff --git a/docs/paper/admin/how-to/anti-xray.mdx b/docs/paper/admin/how-to/anti-xray.mdx
@@ -415,7 +415,7 @@ have enabled Anti-Xray:
 * Anti-Xray cannot hide ores exposed to air or other transparent blocks (in caves for example). In
   principle this is also the case for `engine-mode: 2` and `engine-mode: 3`, however, usually the fake ores obstruct the
   view of real blocks. Hiding those exposed ores too requires additional plugins.
-* The `use-permission` option is enabled and you have the Anti-Xray bypass permission or you have
+* The `use-permission` option is enabled and you have the Anti-Xray bypass permission (`paper.antixray.bypass`) or you have
   operator status.
 * The block type is missing in the configured block lists. This can be the result of using an
   outdated configuration file.

diff --git a/src/components/config/ConfigurationStructureDiagram.tsx b/src/components/config/ConfigurationStructureDiagram.tsx
@@ -20,7 +20,7 @@ const folderData: ExplorerNode[] = [
     name: "logs",
     type: "folder",
     description:
-      "This folder contains all the logs for the server. It compresses old logs into .gz files, but holds the most recent log as a .txt file.",
+      "This folder contains all the logs for the server. It compresses old logs into .gz files, but holds the most recent log as a latest.log file.",
   },
   {
     name: "config",