Mineplex2018-withcommit/Plugins/Mineplex.Hub
Thanos paravantis e0bb8f60d4 Merge branch 'MortensRawBugFixes' into thanos-mineware
Conflicts:
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeAnvilDance.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBlockLobbers.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBuildRace.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFallingBlocks.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFastFood.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeWaveCrush.java
2015-11-25 23:14:22 +02:00
..
.externalToolBuilders Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
.settings Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
src/mineplex/hub Merge branch 'MortensRawBugFixes' into thanos-mineware 2015-11-25 23:14:22 +02:00
.classpath Ignore this 2015-09-25 18:03:10 +02:00
.project Initial Commit 2013-08-27 08:14:08 -07:00
Mineplex.Hub.iml Changes to IntellIJ Files 2015-02-03 14:12:52 -05:00
plugin.yml Initial Commit 2013-08-27 08:14:08 -07:00