Keir Nellyer 1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java		2016-08-05 17:05:01 +01:00
..
src/mineplex/game/clans	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-05 17:05:01 +01:00
plugin.yml	Serious tweaks to gameplay and begin documentation	2016-07-25 10:59:03 -04:00
pom.xml	Use Maven for Compilation	2016-01-20 11:20:58 +11:00