Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java		2015-08-10 03:24:59 -05:00
..
Mineplex_Bungee_Mineplexer_jar.xml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
Mineplex_Bungee_Mineplexer_test.xml	pushing this for my laptop. not final code!	2014-12-11 09:17:19 -06:00
Mineplex_Game_Clans_jar.xml	Master Builders changes for chiss	2015-05-01 17:46:42 -05:00
Mineplex_Game_Clans_test.xml	Updated jOOQ and database tables	2015-02-18 18:51:36 -05:00
Mineplex_Hub_jar.xml	Add more details to /game	2015-07-07 18:20:27 -07:00
Mineplex_Hub_test.xml	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -05:00
Mineplex_MapParser_jar.xml	Add MapParser IntellIj configurations	2014-08-16 12:12:59 -05:00
Mineplex_MapParser_test.xml	Add MapParser IntellIj configurations	2014-08-16 12:12:59 -05:00
Mineplex_ServerMonitor_jar.xml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
Mineplex_Votifier_jar.xml	Votifier fixes	2015-08-06 06:45:47 -05:00
Nautilus_Core_Craftbukkit_jar.xml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
Nautilus_Game_Arcade_jar.xml	xml files are ew	2015-08-01 14:55:01 +01:00
Nautilus_Game_Arcade_test.xml	Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA)	2015-01-03 15:35:47 -05:00