Jonathan Williams 92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java		2014-09-03 03:47:15 -07:00
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core/common	Minestrike update	2014-09-03 14:49:38 +10:00
.classpath	Updated to latest spigot with 1.8 support.	2014-09-03 03:46:24 -07:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Core.Common.iml	Update craftbukkit to remove the extra _INVALID mappings	2014-08-19 21:22:04 -05:00