Keir Nellyer a8e891f247 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/report/ReportManager.java		2016-08-11 14:53:57 +01:00
..
clans	Merge branch 'update/clans' into develop	2016-08-10 21:27:43 -04:00
economy	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
fields	Use DBPool for everything	2016-02-19 00:17:38 -06:00
gameplay	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
items	Stop runes being applied to stacks of items	2016-08-07 18:53:05 -04:00
legacytutorial	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
message	I'm committing this so I can checkout to a different branch	2016-04-05 16:41:50 -04:00
restart	Implement auto restart system for clans servers in off-peak times	2016-08-05 14:24:00 -04:00
shop	Stop bows from selling in stacks	2016-08-07 18:52:48 -04:00
spawn	Update clans drop aesthetics and spawn/shop locations	2016-07-27 15:07:11 -04:00
texttutorial	I'm committing this so I can checkout to a different branch	2016-04-05 16:41:50 -04:00
tutorial	Complete rework of disguising and antihack hook	2016-08-10 21:03:30 -04:00
world	Don't log if culled is 0	2016-05-26 14:29:13 -05:00
Clans.java	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-11 14:53:57 +01:00
Farming.java	Clean up Farming	2016-05-24 13:15:29 -04:00
Recipes.java	some fixes and updates	2016-03-10 02:47:48 +00:00