Shaun Bennett ff441f2262 Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java		2014-08-24 16:14:29 -05:00
..
.externalToolBuilders	Sheep Game?	2014-03-04 22:39:48 -08:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/nautilus/game/arcade	Merge remote-tracking branch 'origin/master'	2014-08-24 16:14:29 -05:00
.classpath	Added silence to kits (UtilEnt.silence)	2014-04-08 23:31:32 -07:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Nautilus.Game.Arcade.iml	Update craftbukkit to remove the extra _INVALID mappings	2014-08-19 21:22:04 -05:00
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00