Morten 5ca997f2a8 Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes ... # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java		2015-12-12 00:11:27 +01: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 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes	2015-12-12 00:11:27 +01: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