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
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Various fixes, and added the new data to Zoologist kit	2015-06-21 23:38:25 -04:00
src/nautilus/game/arcade	Merge remote-tracking branch 'remotes/origin/master' into Bonus	2015-08-10 03:24:59 -05:00
.classpath	Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths	2015-02-25 13:56:32 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Nautilus.Game.Arcade.iml	Revert "Add IntelliJ IDE library files"	2015-07-06 17:06:29 -05:00
plugin.yml	Initial Commit	2013-08-27 08:14:08 -07:00