Tim203 67d63ebc40 Merge remote-tracking branch 'camo/languagesupport' into development ...

# Conflicts:
#	bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
#	bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
#	bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
#	common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
#	common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
#	common/src/main/resources/proxy-config.yml
#	pom.xml
#	spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java
#	spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
#	velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
#	velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java

2020-09-19 17:12:37 +02:00

..

src/main/java/org/geysermc/floodgate/api

Merge remote-tracking branch 'camo/languagesupport' into development

2020-09-19 17:12:37 +02:00

pom.xml

More 2.0 changes. Most important change is the switch from RSA to AES

2020-09-12 15:26:47 +02:00