152 Commits

Author	SHA1	Message	Date
Ty	2e43d565bd	Resolve merge conflicts.	2014-08-04 19:14:04 -04:00
Ty	6a9255e97b	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