JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6d9e84b817
Mineplex2018-withcommit/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade
History
xGamingDudex 6d9e84b817 Merge branch 'develop' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
..
addons Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 2015-11-12 17:51:13 -05:00
booster Replace underscores with spaces in booster group 2016-06-24 03:16:42 -05:00
broadcast - Initial broadcast stuff 2015-12-18 21:33:40 -05:00
command Testing persistence fixes 2016-06-25 00:33:36 -03:00
events Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
game Merge branch 'develop' of 2016-06-30 23:08:31 +02:00
gametutorial bug fixes 2016-02-07 14:09:02 +11:00
gui PC-379 2016-06-01 22:40:07 +01:00
kit Reset leap data when needed (death/quit/game end) 2016-06-30 05:18:39 -05:00
managers Merge branch 'develop' of 2016-06-30 23:08:31 +02:00
ore ore changes 2015-06-26 10:36:45 +10:00
player Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
scoreboard Merge branch 'develop' of 2016-06-30 23:08:31 +02:00
shop Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
stats fix playeringametime being 0 2016-06-25 12:35:59 -05:00
wineffect Testing persistence fixes 2016-06-25 00:33:36 -03:00
world UHC is faster now 2016-06-21 22:21:27 -05:00
Arcade.java Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final 2016-06-23 23:02:26 -07:00
ArcadeFormat.java
ArcadeManager.java Merge branch 'develop' of 2016-06-30 23:08:31 +02:00
GameMode.java make it possible to add stats to the brawl games 2016-05-22 00:29:58 +02:00
GameType.java Merge branch 'develop' of 2016-06-30 23:08:31 +02:00
TournamentType.java