JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27daace524
Mineplex2018-withcommit/Plugins/Mineplex.Hub/src/mineplex/hub
History
Thanos paravantis 854ebf70c4 Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.classpath
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
..
commands Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
mail Update DBPool to load from file 2015-12-18 00:32:07 -05:00
modules Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
notification More refactors 2015-02-27 22:53:55 -05:00
profile Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
queue Update DBPool to load from file 2015-12-18 00:32:07 -05:00
server Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
tutorial Ignore this 2015-09-25 18:03:10 +02:00
Hub.java Merge pull request #117 in MIN/mineplex from clans/alpha to develop 2016-01-08 00:35:15 -06:00
HubClient.java fixed old staff being stuck invis. 2015-12-08 10:31:11 +11:00
HubManager.java Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
HubRepository.java Update DBPool to load from file 2015-12-18 00:32:07 -05:00
HubType.java Commit left-over changes to merge and pull. 2015-08-29 15:44:29 -07:00