Keir Nellyer acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java		2016-09-05 14:26:06 +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-09-05 14:26:06 +01:00
plugin.yml	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
pom.xml	Use Maven for Compilation	2016-01-20 11:20:58 +11:00