3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-06 00:00:47 +01:00

Merge branch 'master' into dev/1.1.0

# Conflicts:
#	build.gradle
Dieser Commit ist enthalten in:
Andrew Steinborn 2019-06-30 23:52:22 -04:00
Commit 275685f45f
3 geänderte Dateien mit 9 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -42,7 +42,7 @@ Velocity is currently in beta. Production networks are successfully running
Velocity with many hundreds of concurrent players online, but your mileage Velocity with many hundreds of concurrent players online, but your mileage
may vary. may vary.
Velocity supports Minecraft 1.8-1.14.3-pre4. Velocity is best supported with Paper Velocity supports Minecraft 1.8-1.14.3. Velocity is best supported with Paper
and SpongeVanilla. Minecraft Forge is fully supported but mod compatibility and SpongeVanilla. Minecraft Forge is fully supported but mod compatibility
may vary. Generally, Velocity will support many mods better than BungeeCord may vary. Generally, Velocity will support many mods better than BungeeCord
or Waterfall do but compatibility can not always be ensured. or Waterfall do but compatibility can not always be ensured.

Datei anzeigen

@ -30,7 +30,7 @@ public enum ProtocolVersion {
MINECRAFT_1_14(477, "1.14"), MINECRAFT_1_14(477, "1.14"),
MINECRAFT_1_14_1(480, "1.14.1"), MINECRAFT_1_14_1(480, "1.14.1"),
MINECRAFT_1_14_2(485, "1.14.2"), MINECRAFT_1_14_2(485, "1.14.2"),
MINECRAFT_1_14_3(489, "1.14.3-pre4"); MINECRAFT_1_14_3(490, "1.14.3");
private final int protocol; private final int protocol;
private final String name; private final String name;

Datei anzeigen

@ -7,7 +7,13 @@ import net.kyori.text.format.TextColor;
public class VelocityMessages { public class VelocityMessages {
public static final Component ONLINE_MODE_ONLY = TextComponent public static final Component ONLINE_MODE_ONLY = TextComponent
.of("This server only accepts connections from online-mode clients.", TextColor.RED); .builder("This server only accepts connections from online-mode clients.")
.color(TextColor.RED)
.append(
TextComponent.of("\n\nDid you change your username? Sign out of Minecraft, sign back in, "
+ "and try again.", TextColor.GRAY)
)
.build();
public static final Component NO_PROXY_BEHIND_PROXY = TextComponent public static final Component NO_PROXY_BEHIND_PROXY = TextComponent
.of("Running Velocity behind Velocity isn't supported.", TextColor.RED); .of("Running Velocity behind Velocity isn't supported.", TextColor.RED);
public static final Component NO_AVAILABLE_SERVERS = TextComponent public static final Component NO_AVAILABLE_SERVERS = TextComponent