Jonathan Williams
|
ac792dcd02
|
Removed some unnecessary code in updateRank and opened up all ranks to be used.
|
2015-11-15 18:33:43 -06:00 |
|
Jonathan Williams
|
daee44d262
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-14 02:01:24 -06:00 |
|
Jonathan Williams
|
4a73bce586
|
Added gadget and projectileUser logging.
|
2015-11-14 00:36:34 -06:00 |
Cheese
|
e7b86b4462
|
hub skytext
|
2015-11-14 13:05:11 +11:00 |
|
Cheese
|
60a6a81587
|
faster cleanup
|
2015-11-14 13:03:41 +11:00 |
|
Cheese
|
9518b64e3c
|
clean up snowballs
|
2015-11-14 12:55:43 +11:00 |
|
Cheese
|
259397b6ae
|
READY 2 GO
|
2015-11-14 12:52:14 +11:00 |
|
Cheese
|
770e2be44b
|
Merge branch 'master' into alex-ctf
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
|
2015-11-14 11:07:44 +11:00 |
|
Cheese
|
5586132429
|
champions balance
|
2015-11-14 11:05:51 +11:00 |
AlexTheCoder
|
016e54977d
|
- Finish game [FINALLY]
|
2015-11-12 21:16:58 -05:00 |
|
AlexTheCoder
|
bc1b185f0e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-12 02:44:54 -05:00 |
|
AlexTheCoder
|
a8b27e66d1
|
- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit
- Fixed items ever being lost from treasurechests
|
2015-11-12 00:06:21 -05:00 |
libraryaddict
|
25f299b490
|
Fix interact types
|
2015-11-12 14:34:12 +13:00 |
|
libraryaddict
|
ba7515f761
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-12 04:27:17 +13:00 |
|
libraryaddict
|
b915131407
|
Fix some armorstands and interaction bugs
|
2015-11-12 04:26:55 +13:00 |
|
Jonathan Williams
|
27ef2c0bbb
|
Fixed UtilEnt.Leash method.
|
2015-11-11 04:36:10 -06:00 |
|
Jonathan Williams
|
0e6146d5c9
|
Added expire to Stacker throw.
|
2015-11-11 04:32:56 -06:00 |
|
libraryaddict
|
3e6d73221b
|
Disabled a fix
|
2015-11-11 15:21:17 +13:00 |
|
Cheese
|
4dd9b0967a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 12:50:07 +11:00 |
|
Cheese
|
a47752cfe2
|
disabled usage of /minecraft: commands in 1..8
|
2015-11-11 12:49:19 +11:00 |
|
libraryaddict
|
ee286c2676
|
Disable /minecraft commands
|
2015-11-11 13:49:06 +13:00 |
|
libraryaddict
|
7559d1feb5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-11 11:45:40 +13:00 |
|
libraryaddict
|
f18c55cbd9
|
Fix schedulers
|
2015-11-11 11:45:17 +13:00 |
|
Cheese
|
4eaa165826
|
such format
|
2015-11-11 07:54:13 +11:00 |
|
Cheese
|
b3125e40ff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 07:43:01 +11:00 |
|
libraryaddict
|
6983af944f
|
Fix a craftbukkit bug
|
2015-11-11 00:25:20 +13:00 |
|
libraryaddict
|
37fdf53a51
|
Fixed champion's Illusion crash
|
2015-11-11 00:21:28 +13:00 |
|
AlexTheCoder
|
d654f1f4b1
|
- Fixed class edit in lobbies
- Fixed conflict between rave suit and assassin
|
2015-11-10 06:17:25 -05:00 |
|
libraryaddict
|
1a2c163ce2
|
Fix scoreboard out of bounds error
|
2015-11-11 00:03:08 +13:00 |
|
AlexTheCoder
|
e165cad50f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-10 04:53:32 -05:00 |
|
Jonathan Williams
|
6e90052480
|
Updated StaffServer to 1.8
|
2015-11-10 02:01:39 -06:00 |
|
Cheese
|
0a9c97c32a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 18:05:01 +11:00 |
Shaun Bennett
|
2707173a8b
|
Merge with 1.8 Branch
|
2015-11-10 01:48:33 -05:00 |
|
Cheese
|
83248a8fec
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 09:11:27 +11:00 |
|
Cheese
|
0ae5330634
|
squid changes
|
2015-11-10 09:11:10 +11:00 |
|
Jonathan Williams
|
5c89124eb6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-09 03:25:02 -06:00 |
|
Jonathan Williams
|
ba7d5bbcdc
|
Fixed Arcade!
|
2015-11-09 03:24:20 -06:00 |
|
Shaun Bennett
|
ec3427bcc0
|
Giveaway manager bug fix
|
2015-11-09 04:08:26 -05:00 |
|
Shaun Bennett
|
05b52614fe
|
Forgot to remove debug code for testing
|
2015-11-09 03:49:12 -05:00 |
|
Shaun Bennett
|
2eaa326929
|
Merge remote-tracking branch 'origin/master'
|
2015-11-09 03:27:50 -05:00 |
|
Shaun Bennett
|
2c54e9e59a
|
Giveaway extras
|
2015-11-09 03:27:42 -05:00 |
|
Jonathan Williams
|
fb4978305f
|
Fixed up EnjinTranslator
Added extra overload for inventoryManager if you have the accountId already.
|
2015-11-09 02:26:45 -06:00 |
|
Shaun Bennett
|
2a7b272de3
|
Merge remote-tracking branch 'origin/master'
|
2015-11-09 01:55:36 -05:00 |
|
Jonathan Williams
|
283a774e03
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-09 00:04:55 -06:00 |
|
Jonathan Williams
|
4915ebc5ad
|
Added Purchase logging manager for Enjin.
Added extra callback method for SaveRank.
|
2015-11-09 00:04:38 -06:00 |
|
Jonathan Williams
|
ff936784d3
|
Remove debug code.
|
2015-11-08 17:27:00 -06:00 |
|
Jonathan Williams
|
e86623c8d0
|
Disabled TrickOrTreatManager to test for Lobby lockups.
|
2015-11-08 17:26:43 -06:00 |
|
Jonathan Williams
|
fd3ccf7ce0
|
Fix Bungee lobby balancer code.
|
2015-11-08 17:25:54 -06:00 |
|
libraryaddict
|
d466005c35
|
Fix custom names not changing
|
2015-11-09 05:08:08 +13:00 |
libraryaddict
|
752d8152d2
|
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
|
2015-11-08 08:23:20 -06:00 |