libraryaddict
|
79d0466355
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
|
2015-11-07 21:36:36 +13:00 |
|
Shaun Bennett
|
ec7600a4a2
|
Giveaway tweaks
|
2015-11-07 01:10:27 -05:00 |
|
libraryaddict
|
dab258dcdd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
|
2015-10-12 16:22:52 +13:00 |
|
Shaun Bennett
|
cf618abd4e
|
BotSpam Module
|
2015-09-22 01:38:45 -04:00 |
|
William Burns
|
0c5cc25634
|
Stuff
|
2015-08-03 12:48:17 +01:00 |
|
William Burns
|
a964f343c7
|
xml files are ew
|
2015-08-01 14:55:01 +01:00 |
|
Shaun Bennett
|
16bad71dcc
|
1.8 Updates
|
2015-07-27 20:26:37 -05:00 |
|
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
|
Shaun Bennett
|
3f9010fb7a
|
Fix GameScore comparator
|
2015-06-09 13:21:15 -05:00 |
|
Shaun Bennett
|
2cb87b23e6
|
Stat Gui, Start of Treasure Gui (disabled)
|
2014-08-24 16:08:19 -05:00 |
|
Chiss
|
508ef65fcf
|
Added missing file
|
2014-08-16 14:17:15 +10:00 |
|
CoderTim
|
aa6b5324eb
|
Set up IntelliJ IDEA
|
2014-05-20 00:39:50 -04:00 |
|