Morten 5ca997f2a8 Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes ... # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java		2015-12-12 00:11:27 +01:00
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Updated to JAVA 8... Weird bugs happened :(	2015-12-12 00:06:28 +01:00
src/nautilus/game/arcade	Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes	2015-12-12 00:11:27 +01:00
.classpath	updated blocksearch	2015-12-10 13:12:01 +11: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