diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a28924106..4dc5257be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,7 +165,7 @@ multiple places, and if they change, it is important to change them in all place our `Property` component to embed these values into the documentation. An example of this would be: ```jsx - + ``` This will embed the value of the property into the documentation, and if it changes, it will be changed in all places. diff --git a/config-specs/paper/server-properties.yml b/config-specs/paper/server-properties.yml index c8302e4f5..bf20f9003 100644 --- a/config-specs/paper/server-properties.yml +++ b/config-specs/paper/server-properties.yml @@ -1,3 +1,6 @@ +accept-transfers: + default: "false" + description: "Whether this server accepts transfers from other servers using the transfer command/packet. If this is set to false, the server will disconnect the client." allow-flight: default: "false" description: > @@ -167,6 +170,11 @@ rcon.password: rcon.port: default: "25575" description: "The port to start the rcon server on." +region-file-compression: + default: "deflate" + description: > + Specifies the compression type used to compress region files. Possible values are: "deflate", "lz4" and "none". + If set to "none", region files will take up significantly more disk space, but it might make sense together with filesystem-level compression. require-resource-pack: default: "false" description: "If true, a player must have the given resource pack to connect. They will be kicked if they do not have it." diff --git a/config-specs/properties.json b/config-specs/properties.json index 8b1baf58c..12d2ec4a0 100644 --- a/config-specs/properties.json +++ b/config-specs/properties.json @@ -1,5 +1,4 @@ { - "PAPER_JAVA_MIN": "17", - "PAPER_JAVA_RECOMMENDED": "21", + "PAPER_JAVA_MIN": "21", "VELOCITY_JAVA_MIN": "17" } diff --git a/docs/paper/admin/getting-started/getting-started.mdx b/docs/paper/admin/getting-started/getting-started.mdx index c2695c065..774fcc4ae 100644 --- a/docs/paper/admin/getting-started/getting-started.mdx +++ b/docs/paper/admin/getting-started/getting-started.mdx @@ -9,17 +9,16 @@ description: How to get started with downloading and setting up a Paper server. :::tip -Paper requires at least **Java ** to run. We recommend using -**Java **, which [is easy to download and install](/misc/java-install). +Paper requires at least **Java ** to run, which [is easy to download and install](/misc/java-install). ::: -| Paper Version | Recommended Java Version | -|----------------|-------------------------------------------------| -| 1.8 to 1.11 | Java 8 | -| 1.12 to 1.16.4 | Java 11 | -| 1.16.5 | Java 16 | -| 1.17.1-1.18.1+ | Java | +| Paper Version | Recommended Java Version | +|----------------|-----------------------------------------| +| 1.8 to 1.11 | Java 8 | +| 1.12 to 1.16.4 | Java 11 | +| 1.16.5 | Java 16 | +| 1.17.1-1.18.1+ | Java | ## Downloading Paper diff --git a/docs/paper/admin/reference/system-properties.md b/docs/paper/admin/reference/system-properties.md index f5afc6119..d8e734093 100644 --- a/docs/paper/admin/reference/system-properties.md +++ b/docs/paper/admin/reference/system-properties.md @@ -205,3 +205,8 @@ It also remaps plugin CB calls to remove the version information. - **default**: `false` - **description**: Allows cyclic plugin loading. See [here](paper-plugins.md#cyclic-plugin-loading) for more info. + +#### Paper.DisableCommandConverter: + +- **default**: `false` +- **description**: Disables Paper's automatic upgrading of commands, including items with custom data defined in command blocks and other places that may contain commands, to the new component format introduced in version 1.20.5. diff --git a/docs/paper/dev/getting-started/plugin-yml.mdx b/docs/paper/dev/getting-started/plugin-yml.mdx index f28ba445b..9140b8837 100644 --- a/docs/paper/dev/getting-started/plugin-yml.mdx +++ b/docs/paper/dev/getting-started/plugin-yml.mdx @@ -92,8 +92,8 @@ This will be shown in the plugin info commands. The version of the Paper API that your plugin is using. This doesn't include the minor version. Servers with a version lower than the version specified here will refuse to load the plugin. -The valid versions are 1.13 - . -- `api-version: '%%_MAJ_MC_%%'` +The valid versions are 1.13 - . +- `api-version: '%%_MAJ_MIN_MC_%%'` :::info diff --git a/docs/velocity/admin/reference/configuration.md b/docs/velocity/admin/reference/configuration.md index 3964f0fa9..7425c2a52 100644 --- a/docs/velocity/admin/reference/configuration.md +++ b/docs/velocity/admin/reference/configuration.md @@ -78,6 +78,7 @@ These settings mostly cover the basic, most essential settings of the proxy. | `failover-on-unexpected-server-disconnect` | Boolean | This setting allows you to determine if the proxy should failover or disconnect the user in the event of an unclean disconnect. | | `log-command-executions` | Boolean | Determines whether or not the proxy should log all commands run by the user. | | `log-player-connections` | Boolean | Enables logging of player connections when connecting to the proxy, switching servers and disconnecting from the proxy. | +| `accepts-transfers` | Boolean | Determines whether or not the proxy accepts incoming transfers from other servers. If disabled, the proxy will disconnect transferred clients. | ## `query` section