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
..
.externalToolBuilders	Removed BungeeSigns	2013-11-06 19:48:00 -08:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/bungee	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-11 01:26:20 -05:00
.classpath	Changed PlayerCache to Cache	2015-12-11 01:24:16 -05:00
.project	Fixed Game.Core build issue.	2013-11-06 20:19:56 -08:00
Mineplex.Bungee.Mineplexer.iml	April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA	2015-03-31 17:22:50 -04:00
plugin.yml	Added in dynamic servermanager updating.	2013-09-11 13:53:24 -07:00