Ty 1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java		2014-08-04 18:47:49 -04:00
..
.externalToolBuilders	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-04 18:47:49 -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	Dragon particles	2013-12-21 20:44:56 +11:00
Mineplex.Core.iml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00