Merge branch 'master' into dev/1.1.0

# Conflicts:
#	build.gradle
This commit is contained in:
Andrew Steinborn
2019-06-30 23:52:22 -04:00
3 changed files with 9 additions and 3 deletions

View File

@@ -7,7 +7,13 @@ import net.kyori.text.format.TextColor;
public class VelocityMessages {
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
.of("Running Velocity behind Velocity isn't supported.", TextColor.RED);
public static final Component NO_AVAILABLE_SERVERS = TextComponent