Andrew Steinborn 9efda3d42d Merge branch 'l10n_dev/2.0.0' into dev/2.0.0 ... # Conflicts: # proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties # proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_nl_NL.properties # proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ru_RU.properties		2021-05-16 03:14:03 -04:00
..
src	Merge branch 'l10n_dev/2.0.0' into dev/2.0.0	2021-05-16 03:14:03 -04:00
build.gradle	Add support for resolving dependencies that require a version range	2021-05-15 08:16:17 -04:00