William Burns
|
e83b49d490
|
Reformatting titles
|
2015-11-18 13:43:22 +00:00 |
|
William Burns
|
e19d4e11e1
|
Added GlobalGiveCoins. Changes Gems a little and the manager.
|
2015-11-17 18:54:39 +00:00 |
|
William Burns
|
a28adc9673
|
More global stuff! Added GlobalGiveGems.
|
2015-11-17 18:26:19 +00:00 |
|
William Burns
|
0f7c52391f
|
Global Packet work. Added giveitem sub-command.
|
2015-11-17 08:19:36 +00:00 |
|
Cheese
|
adfc2f19eb
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-17 09:20:15 +11:00 |
|
Cheese
|
46505a8e8e
|
converted to new res pack locations
|
2015-11-17 09:19:33 +11:00 |
|
Shaun Bennett
|
007d5a00dc
|
Merge remote-tracking branch 'origin/master'
|
2015-11-16 16:39:43 -05:00 |
|
Shaun Bennett
|
e35eec4cb1
|
Update motdmanager and compiler.xml
|
2015-11-16 16:39:34 -05:00 |
|
libraryaddict
|
208d90c4bc
|
Fixed getTargetBlock being 0 when its infinite
|
2015-11-17 10:18:42 +13:00 |
|
Jonathan Williams
|
88dbe261db
|
Added logging for stacker.
|
2015-11-15 18:34:35 -06:00 |
|
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 |
|
AlexTheCoder
|
217509b75a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
|
2015-11-15 18:58:20 -05:00 |
|
libraryaddict
|
e5b376bc5c
|
Fixed wrong CB
|
2015-11-16 12:48:26 +13:00 |
|
AlexTheCoder
|
667edc8a90
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-15 17:48:16 -05:00 |
|
AlexTheCoder
|
ecaa4a49b4
|
- Fix for stats
|
2015-11-15 17:48:00 -05:00 |
|
libraryaddict
|
aaf3705cc7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-16 06:57:09 +13:00 |
|
libraryaddict
|
6e55074211
|
Add entitydismountevent
|
2015-11-16 06:56:39 +13:00 |
|
Jonathan Williams
|
daee44d262
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-14 02:01:24 -06:00 |
|
Shaun Bennett
|
9f37e3e595
|
Merge remote-tracking branch 'origin/master'
|
2015-11-14 01:46:44 -05:00 |
|
Shaun Bennett
|
2bb82da735
|
Motd update
|
2015-11-14 01:45:55 -05: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 |
|
Cheese
|
9de3981dec
|
ms update
|
2015-11-13 11:24:11 +11:00 |
|
Cheese
|
3122397f7a
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
|
2015-11-13 09:19:44 +11: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 |
|
Cheese
|
3ed680e1c2
|
ms update
|
2015-11-11 15:55:48 +11:00 |
|
Cheese
|
ef2411b7d5
|
Merge branch 'master' into minestrike-update
|
2015-11-11 13:43:36 +11: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 |
|
Cheese
|
d971e3c8a3
|
ms update
|
2015-11-11 12:46:58 +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
|
e3c22b356b
|
Merge branch 'master' into minestrike-update
|
2015-11-11 07:54:28 +11:00 |
|
Cheese
|
4eaa165826
|
such format
|
2015-11-11 07:54:13 +11:00 |
|
Cheese
|
59a054eeba
|
fixed merge erorr
|
2015-11-11 07:52:02 +11:00 |
|
Cheese
|
520eb55b88
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
|
2015-11-11 07:43:50 +11:00 |
|