Shaun Bennett ec81e9f511 Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java		2014-10-16 17:51:32 -05:00
..
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src/mineplex/core/common	Merge remote-tracking branch 'origin/master'	2014-10-16 17:51:32 -05: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 IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00