Ty 0d38ac4e96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java		2014-08-15 11:40:15 -04:00
..
.externalToolBuilders	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
src/mineplex/serverdata	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 11:40:15 -04:00
.classpath	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
.project	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
build.xml	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
Mineplex.ServerData.iml	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00