Commit Graph

4 Commits

Author SHA1 Message Date
Morten
2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
# 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
2015-11-10 17:15:23 +01:00
libraryaddict
53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
Morten
f9fecebeec Minor update ;) 2015-08-22 11:01:37 +02:00
Jeremiah Bishop
3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00