3e9b64db66
Wizards Implode: Don't cast spell if no blocks are effected
2015-05-02 15:26:23 +12:00
cd1a5793fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 15:24:16 +12:00
707772d58b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 22:07:33 -05:00
2902e6075f
Fix for n positive bug.
2015-05-01 22:05:03 -05:00
05c9174491
Wizards: Prevent using keyboard shortcuts to drop hotbar locked items
2015-05-02 14:59:15 +12:00
e04b61a91d
Give build item when game starts
2015-05-01 18:03:56 -05:00
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
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
37f1f7eabb
Master Builders changes for chiss
2015-05-01 17:46:42 -05:00
b136be0d47
ResourcePack: Removed code that demanded a enum and changed to boolean
2015-05-02 03:03:53 +12:00
e8cbb2fc29
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 21:26:56 +12:00
93a25d5a67
ResourcePack: Fixed links and declined message
2015-05-01 21:26:42 +12:00
fb634c190e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 02:29:54 -05:00
84a5e5e521
Added motd.
2015-05-01 02:29:34 -05:00
e800d74976
Disabled Double Gems.
2015-05-01 02:29:20 -05:00
c240a1752f
GameType: Update resource pack to use https not http
2015-05-01 19:28:42 +12:00
f85d27db1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 19:25:11 +12:00
cc65830f9b
ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code
2015-05-01 19:24:20 +12:00
283d550903
Added Wizards to quick game menu.
2015-05-01 01:24:01 -05:00
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
88bd99e11f
Wizards: Update UtilTextBottom text for the custom method
2015-05-01 16:57:11 +12:00
af86586d74
Added 'Sloth' to draw my thing list.
2015-04-30 23:57:11 -05:00
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
b33828f5a1
Added LibraryAddict's crash exploit patch for craftbukkit.jar
2015-04-30 23:48:58 -05:00
21800d83c6
Build fixes
2015-04-30 23:16:30 -05:00
319cde5c46
Wizards: Update resource pack url
2015-05-01 16:14:59 +12:00
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
fbafeca150
Wizards: Remove block burn flag true
2015-05-01 15:44:11 +12:00
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
c660e0e3c7
Wizards: Re-sorted spells
2015-05-01 14:19:13 +12:00
7bd133f704
Wizards: Temporary resource pack
2015-05-01 13:04:05 +12:00
ed1c7e2336
Master Builders initial push (dont worry jon it doesnt effect anything for the update!)
2015-04-30 18:20:35 -05:00
5d36ddce3a
Arcade: Close only non-player inventories at 5 seconds
2015-04-30 21:17:08 +12:00
23ea7bbce4
Spectators: Set fire ticks to 0 on damage
2015-04-30 20:55:30 +12:00
152f5d3046
Ditto previous commit...
2015-04-29 16:52:06 -04:00
69d4d2dfdb
Another try at build changes.
2015-04-29 16:47:06 -04:00
33bbe96964
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
2015-04-30 01:33:43 +12:00
497550549b
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
2015-04-30 01:33:21 +12:00
c2b7001fcc
Wizards: Current progress
2015-04-30 01:32:22 +12:00
1e6084bfb2
Another compilation order change.
2015-04-28 10:31:25 -04:00
93abe301c2
More compilation depedency changes.
2015-04-28 10:18:53 -04:00
1dc9864e4c
Added necessary libraries to compilation targets.
2015-04-28 10:00:12 -04:00
e1ddf55860
Adjusting build order of compile targets in common.xml.
2015-04-28 09:36:43 -04:00
e68e99d1f6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-04-28 09:25:05 -04:00
0ce7f657e1
Added compilation targets for Arcade/Hub building with Ant.
2015-04-28 09:24:35 -04:00
45b801ba81
hitbox changes
2015-04-27 19:21:33 -05:00
1c1ab9bbe3
Throwing TNT: Fixed tnt not being movable from other inventories
2015-04-23 08:30:23 +12:00
ae1480fb1e
Little bit of spacing fixed.
2015-04-21 23:36:33 -05:00
a662c93a92
Fix so 0.0.0.0 doesn't get selected for DNS rotation.
2015-04-21 23:36:12 -05:00
d8ed866ada
Fix for duplicate names in db.
...
Adjusted staff server whitelist and op list.
2015-04-21 23:35:41 -05:00
libraryaddict
Jonathan Williams
Shaun Bennett
Mini-Chiss
libraryaddict
Peter Miller