Jonathan Williams 95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java		2015-12-11 01:26:20 -05:00
..
lobbyBalancer	Fix Bungee lobby balancer code.	2015-11-08 17:25:54 -06:00
motd	Winter MOTD, Stat fixes (maybe?!)	2015-12-07 13:21:11 -05:00
playerCount	Fixed lobby balancing technique.	2015-09-26 18:25:29 -04:00
playerStats	Changed PlayerCache to Cache	2015-12-11 01:24:16 -05:00
playerTracker	Made PlayerTracker use existing code for determining region.	2015-11-19 22:11:45 -06:00
status	Convert PlayerStatus trackers, Bungee MOTD, and Bungee Server status' from MySQL storage to redis-based system using DataRepository's.	2015-03-14 01:03:22 -04:00
FileUpdater.java	Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.	2014-08-08 17:35:37 -04:00
Mineplexer.java	Changed login deets for new new db cluster.	2015-04-14 01:59:29 -05:00