Ty 36d6a58e0a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java		2014-08-11 15:39:56 -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
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/enjinTranslator	Added ability to store gem boosters in enjin.	2014-08-09 07:25:58 -05:00
.classpath	Added LobbyBalancer for BungeeCord	2013-08-30 01:36:55 -07:00
.project	Added more files and updated ignore list.	2014-05-28 11:23:32 -07:00
EnjinTranslator.iml	Added more files and updated ignore list.	2014-05-28 11:23:32 -07:00
plugin.yml	Added possible second option for pulling purchases to Enjin plugin.	2013-08-30 09:45:25 -07:00