Commit Graph

3006 Commits

Author SHA1 Message Date
Mini-Chiss f36d7774cc Gravity update 2015-05-03 18:32:57 -05:00
Shaun Bennett 74474c6227 Use itemstackfactory for formatted name 2015-05-03 18:26:20 -05:00
Shaun Bennett f98ac0874c Merge remote-tracking branch 'origin/master' 2015-05-03 18:22:14 -05:00
Shaun Bennett 83ff3c96aa Close inventory when game starts 2015-05-03 18:21:59 -05:00
Shaun Bennett fbfb5e637e Mob Gui + Ground Change Gui + UtilSkull for special mob skulls 2015-05-03 18:18:16 -05:00
Mini-Chiss a42c71ebb8 more 1.8 stuff 2015-05-03 16:54:02 -05:00
Mini-Chiss bd8bd2dfd6 Abstracted kicking non-1.8 players
Abstracted resource pack msg
2015-05-03 16:51:13 -05:00
Mini-Chiss 40d56c3500 Converted all code to updated UtilParticle methods
/suicide
2015-05-03 16:37:00 -05:00
Mini-Chiss 97a86fde90 builds! 2015-05-03 15:39:15 -05:00
Mini-Chiss a07132df49 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 15:39:04 -05:00
Shaun Bennett c3a7dcfcf8 Update craftbukkit jar 2015-05-03 15:35:42 -05:00
Shaun Bennett 73719e0df3 Fix world particles issues 2015-05-03 15:30:58 -05:00
Mini-Chiss 40c838b030 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 14:50:56 -05:00
Mini-Chiss 8224450b44 Build Update 2015-05-03 14:50:50 -05:00
Shaun Bennett 17cbcc3771 Craftbukkit changes for UtilParticle update, and UtilParticle fix 2015-05-03 14:42:31 -05:00
Shaun Bennett 74dbf7e827 Merge remote-tracking branch 'origin/master' 2015-05-03 14:41:18 -05:00
Shaun Bennett ff6da92fb7 Some Build world, support for far rendered particles 2015-05-03 14:41:09 -05:00
libraryaddict b58bef1bd8 ResourcePack: Lengthen timeout from 10 seconds to 20 seconds 2015-05-04 04:13:23 +12:00
libraryaddict 9986bd6ee5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 04:10:05 +12:00
libraryaddict 3fcec13e68 Wizards: Melee with wands should say it was wands that did it 2015-05-04 04:09:49 +12:00
Shaun Bennett 11b36e6b44 [Build] Show message to players to open inventory until they click something in their inventory 2015-05-02 22:50:27 -05:00
Mini-Chiss 9c08e57602 fixed NPE 2015-05-02 22:45:14 -05:00
Mini-Chiss 122dbad45c added time setting and framework for lightning strikes 2015-05-02 22:26:03 -05:00
Mini-Chiss 6ad09f0ade Master Builder update 2015-05-02 22:05:12 -05:00
Mini-Chiss 5b04d43400 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-02 17:45:39 -05:00
libraryaddict 08140f8863 ResourcePack: Resource pack refused now links to a forum guide 2015-05-03 08:10:25 +12:00
libraryaddict 8cb9493125 Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases 2015-05-02 16:39:20 +12:00
libraryaddict 9c268786aa Wizards: Nerfed lightning strike damage 2015-05-02 16:22:59 +12:00
libraryaddict efed6e129b Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block. 2015-05-02 16:11:57 +12:00
libraryaddict 3e9b64db66 Wizards Implode: Don't cast spell if no blocks are effected 2015-05-02 15:26:23 +12:00
libraryaddict cd1a5793fa Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-02 15:24:16 +12:00
Jonathan Williams 707772d58b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-01 22:07:33 -05:00
Jonathan Williams 2902e6075f Fix for n positive bug. 2015-05-01 22:05:03 -05:00
libraryaddict 05c9174491 Wizards: Prevent using keyboard shortcuts to drop hotbar locked items 2015-05-02 14:59:15 +12:00
Mini-Chiss ab6937a525 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 18:05:55 -05:00
Shaun Bennett e04b61a91d Give build item when game starts 2015-05-01 18:03:56 -05:00
Shaun Bennett 244ffece8a Fixes for build game + fix clans compile 2015-05-01 18:02:06 -05:00
Shaun Bennett 910cdff935 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2015-05-01 17:54:00 -05:00
Shaun Bennett 37f1f7eabb Master Builders changes for chiss 2015-05-01 17:46:42 -05:00
libraryaddict b136be0d47 ResourcePack: Removed code that demanded a enum and changed to boolean 2015-05-02 03:03:53 +12:00
libraryaddict e8cbb2fc29 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 21:26:56 +12:00
libraryaddict 93a25d5a67 ResourcePack: Fixed links and declined message 2015-05-01 21:26:42 +12:00
Jonathan Williams fb634c190e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-01 02:29:54 -05:00
Jonathan Williams 84a5e5e521 Added motd. 2015-05-01 02:29:34 -05:00
Jonathan Williams e800d74976 Disabled Double Gems. 2015-05-01 02:29:20 -05:00
libraryaddict c240a1752f GameType: Update resource pack to use https not http 2015-05-01 19:28:42 +12:00
libraryaddict f85d27db1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 19:25:11 +12:00
libraryaddict cc65830f9b ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code 2015-05-01 19:24:20 +12:00
Jonathan Williams 283d550903 Added Wizards to quick game menu. 2015-05-01 01:24:01 -05:00
Mini-Chiss 1b8ab13160 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 00:51:52 -05:00