Shaun Bennett
73719e0df3
Fix world particles issues
2015-05-03 15:30:58 -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
Mini-Chiss
ba5802cc14
wizards kit availability
2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
libraryaddict
88bd99e11f
Wizards: Update UtilTextBottom text for the custom method
2015-05-01 16:57:11 +12:00
Jonathan Williams
af86586d74
Added 'Sloth' to draw my thing list.
2015-04-30 23:57:11 -05:00
Jonathan Williams
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
Jonathan Williams
b33828f5a1
Added LibraryAddict's crash exploit patch for craftbukkit.jar
2015-04-30 23:48:58 -05:00
Mini-Chiss
21800d83c6
Build fixes
2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46
Wizards: Update resource pack url
2015-05-01 16:14:59 +12:00
libraryaddict
ec5d25b04b
Merge pull request #15 in MIN/mineplex from Wizards to master
...
* commit 'fbafeca1503c782aedf328c9561352595bcf2a46': (27 commits)
Wizards: Remove block burn flag true
Wizards: Re-sorted spells
Wizards: Temporary resource pack
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
Wizards: Current progress
ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name
Wizards: Latest changes by Chiss
Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining
Wizards: Changed spell icons for resource pack
Wizards: Spell levels are now viewable on items in chest as item amount
Wizards: More changes as per demand.
Wizards Napalm: Make glazed blocks more common, raise damage
CustomExplosion: Fixed loop, added max damage
UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion
Wizards: Balancing
UtilParticle: Added lore for future reference on colored particles.
UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals
CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?)
Wizards changes
IcePathData: Compare Material instead of integers
...
2015-04-30 22:45:53 -05:00
libraryaddict
fbafeca150
Wizards: Remove block burn flag true
2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7
Wizards: Re-sorted spells
2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704
Wizards: Temporary resource pack
2015-05-01 13:04:05 +12:00
