Merge branch 'master' into merged

This commit is contained in:
Andrew Steinborn
2018-09-19 14:54:44 -04:00
3 changed files with 0 additions and 130 deletions

View File

@@ -5,8 +5,6 @@ import com.google.common.collect.ImmutableMap;
import com.moandjiezana.toml.Toml;
import com.velocitypowered.api.util.Favicon;
import com.velocitypowered.proxy.util.AddressUtil;
import com.velocitypowered.api.util.LegacyChatColorUtils;
import io.netty.buffer.ByteBufUtil;
import net.kyori.text.Component;
import net.kyori.text.serializer.ComponentSerializers;