Commit Graph

3269 Commits

Author SHA1 Message Date
Mini-Chiss c26174ffa2 fixed team name 2015-05-13 13:20:05 -05:00
Jonathan Williams 3b024de521 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-13 01:35:05 -07:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks.
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
2015-05-13 00:58:45 -07:00
libraryaddict bfb5e85efd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 19:14:56 +12:00
libraryaddict 938386bf77 Wizards: Removed chainmail loot, added gold armor instead 2015-05-13 19:14:40 +12:00
Jonathan Williams 98dcb9747a Added UHC support to server sorter. 2015-05-13 00:10:17 -07:00
Jonathan Williams 82903fde47 Updates for task conversion. 2015-05-13 00:00:37 -07:00
Mini-Chiss a744a466a3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 00:05:10 -05:00
Mini-Chiss f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
libraryaddict 20aeccb3be Wizards: Lowered ice shards max level to 3, removed damage from web shot 2015-05-13 14:04:19 +12:00
libraryaddict 744c867990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:19:09 +12:00
libraryaddict d2e37df4ca DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word 2015-05-13 13:18:54 +12:00
libraryaddict a75aab7f98 DrawMyThing: Added more words, fixed the multiple guesses prevention never firing. 2015-05-13 13:15:53 +12:00
Shaun Bennett 678c2c514a Oops! 2015-05-12 18:45:01 -05:00
Shaun Bennett aa5898e1db Merge remote-tracking branch 'origin/master' 2015-05-12 18:43:48 -05:00
Shaun Bennett f9269b534f [Core] Add look AI to NPC's 2015-05-12 18:43:26 -05:00
Shaun Bennett 32338cfce4 [MB] More words for update 2015-05-12 17:25:37 -05:00
Shaun Bennett d703070810 [Core] Shrink stat page 2015-05-12 17:20:58 -05:00
Shaun Bennett bdfffa3a4c Merge remote-tracking branch 'origin/master' 2015-05-12 17:14:57 -05:00
Shaun Bennett 53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
libraryaddict 03c384e7e6 Wizards: Remove boat from loot, fix napalm typo 2015-05-13 10:04:05 +12:00
Shaun Bennett 26db4fa269 [MB] Add more build themes 2015-05-12 16:15:44 -05:00
Mini-Chiss e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Mini-Chiss 2928c73767 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 14:46:30 -05:00
Mini-Chiss e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
Shaun Bennett 90fc4656fa [Core] Attempt at mitigating spam bots without hurting normal players 2015-05-12 08:09:13 -05:00
Shaun Bennett 5d13b6a144 [Core] Disable writing on signs for muted players 2015-05-12 07:11:35 -05:00
Shaun Bennett 87f495e376 [Core] Filter text on placed signs with Chat Module 2015-05-12 07:02:34 -05:00
Shaun Bennett c7a9ae8cd5 [Arcade] Attempt at fixing spectator gui bugs 2015-05-12 06:23:32 -05:00
Shaun Bennett 06a0f3d0d5 Merge remote-tracking branch 'origin/master' 2015-05-12 00:37:40 -05:00
Shaun Bennett 270ef37a7c [MB] More words and more ground types 2015-05-12 00:37:13 -05:00
Mini-Chiss 4cae02f2d8 set LT as higher than Owner for perms. 2015-05-11 21:31:37 -05:00
Mini-Chiss e0e79d79a5 LT rank 2015-05-11 21:28:25 -05:00
Mini-Chiss ed90e97c68 removed border attack stuff 2015-05-11 21:00:38 -05:00
Shaun Bennett 9d959ee7a3 Fix/Enable Look at me Button 2015-05-11 20:46:37 -05:00
Mini-Chiss 643ed2c047 Fixed most enchants not working
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
libraryaddict 18c6022437 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 11:01:18 +12:00
libraryaddict 214a750f6e UHC: Add borders from SG 2015-05-12 11:01:04 +12:00
Mini-Chiss 8d585ce807 admins can giveitem 2015-05-11 17:59:13 -05:00
Mini-Chiss 55b6d29468 Just shufflin some location 2015-05-11 17:57:21 -05:00
libraryaddict a558995e12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 09:52:21 +12:00
Shaun Bennett d57bab7430 Merge remote-tracking branch 'origin/master' 2015-05-11 15:17:50 -05:00
Shaun Bennett e799ea0909 [MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes 2015-05-11 15:17:35 -05:00
Mini-Chiss e3f2c02836 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-11 14:11:00 -05:00
Mini-Chiss 5e73441b9a UHC world loading 2015-05-11 14:10:51 -05:00
Mini-Chiss 123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Shaun Bennett c0dc531252 [MB] Allow Item Frames and Paintings 2015-05-11 12:38:21 -05:00
Mini-Chiss 5ec60d234a UHC changes 2015-05-11 12:27:43 -05:00
Mini-Chiss 9b0736816b UHC changes
abstracted out some common attribs
2015-05-11 12:21:32 -05:00
Jonathan Williams b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Shaun Bennett 46c07665e1 Merge remote-tracking branch 'origin/master' 2015-05-11 00:44:34 -05:00
Shaun Bennett 2e7428e79a Temporary fletcher fix 2015-05-11 00:42:55 -05:00
libraryaddict 5ee3f48754 Wizards: Nerf rumble max level from level 5 to level 3 2015-05-11 14:08:40 +12:00
Shaun Bennett 800ce68637 Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking) 2015-05-10 16:58:04 -05:00
libraryaddict 241935ef63 SurvivalGames: Removed description of deep freeze and updated to beware of borders 2015-05-11 09:13:04 +12:00
Mini-Chiss 3e64115f05 vote colors 2015-05-09 17:45:08 -05:00
Mini-Chiss 41599de06f build vote update 2015-05-09 17:34:07 -05:00
Mini-Chiss 6e2b437e55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 12:28:16 -05:00
Mini-Chiss 822718095d cannot PM from spawn
first push of cards game
2015-05-09 12:23:07 -05:00
libraryaddict 7faee918af Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 14:13:03 +12:00
libraryaddict 0751876622 Wizards: Do a null check and event is cancelled check on damage 2015-05-09 14:12:46 +12:00
Shaun Bennett ef86f8bb6f merge 2015-05-08 12:22:58 -05:00
Shaun Bennett bca162588f Fix Achievement page bugs (layout needs to be reviewed by chiss) 2015-05-08 02:27:53 -05:00
libraryaddict 689ca94c57 Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness 2015-05-08 18:57:33 +12:00
libraryaddict 29c4a033a7 Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout 2015-05-08 18:56:00 +12:00
libraryaddict 5ec04263d4 Map stuff: First commit (or second?) 2015-05-08 07:31:03 +12:00
Jonathan Williams f2c8086421 Updated default motd on bungees. 2015-05-06 22:41:36 -07:00
Jonathan Williams e999f943b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-06 20:20:07 -07:00
Jonathan Williams d3e5dd9c8a Fixed so name searching only returns the last account logged in with that name. 2015-05-06 20:19:58 -07:00
libraryaddict 3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00
libraryaddict 531fe11916 Maps: Rename Map.class to BlockMap.class 2015-05-07 02:57:12 +12:00
libraryaddict 7a8efee1e0 Modify builder to include png files in the built jar 2015-05-07 02:56:37 +12:00
libraryaddict 47acf7fb85 DrawMyThing: Ignore guesses containing more than two answers. 2015-05-07 02:54:55 +12:00
Jonathan Williams a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams f9f1d9b1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-04 22:31:14 -05:00
Shaun Bennett ae03743c63 Build sort of bug fix for teleported into block 2015-05-04 19:27:16 -05:00
Mini-Chiss 4cb0c01f59 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 15:35:10 -05:00
Mini-Chiss 7505bbc1a2 gravity fix 2015-05-04 15:34:57 -05:00
Peter Miller 4f54b9aa04 Bamboo... 2015-05-04 05:10:37 -04:00
Peter Miller ad82e9733a Moarerer Bamboo changes. 2015-05-04 04:33:28 -04:00
Peter Miller 93656f7659 Moarer Bamboo changes. 2015-05-04 04:28:34 -04:00
Peter Miller c93cd0d36c Moar Bamboo changes. 2015-05-04 04:25:44 -04:00
Peter Miller 3b518aec3f More build changes for Bamboo. 2015-05-04 04:14:19 -04:00
Jonathan Williams 4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Mini-Chiss 0d1de153ec Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 00:56:19 -05:00
Mini-Chiss b959bcaa90 fixed 1.8 req 2015-05-04 00:56:12 -05:00
Jonathan Williams 677c8d1198 Updated default MOTD. 2015-05-04 00:42:59 -05:00
Jonathan Williams c8b5c84aa6 Added Master Builder quick game menu option.
Added player counts to quick game menu
2015-05-04 00:42:49 -05:00
Mini-Chiss 50cd692c62 fixed wither morph damaging blocks in grav lobby 2015-05-04 00:34:03 -05:00
Mini-Chiss 4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss fa1ac52f78 grav balance 2015-05-03 20:21:00 -05:00
Mini-Chiss 838c369b7c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 20:12:13 -05:00
Mini-Chiss 95c9be47b6 missing kit 2015-05-03 20:12:06 -05:00
Shaun Bennett cb2666c4a5 Merge remote-tracking branch 'origin/master' 2015-05-03 20:06:19 -05:00
Shaun Bennett af1f735a43 Add lightning packets, various gui improvements 2015-05-03 20:06:10 -05:00
Mini-Chiss e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss 58671fa229 more words 2015-05-03 19:36:50 -05:00
Mini-Chiss 6978a176b1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 19:10:55 -05:00
Mini-Chiss 7f0e175ba1 build update 2015-05-03 19:10:49 -05:00
Shaun Bennett 044d1098f4 Merge remote-tracking branch 'origin/master' 2015-05-03 19:10:22 -05:00
Shaun Bennett a435ed5bae More build changes 2015-05-03 19:10:13 -05:00
Mini-Chiss 1576085d87 more words 2015-05-03 18:33:31 -05:00
Mini-Chiss 73132d96b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 18:33:03 -05:00
Mini-Chiss f36d7774cc Gravity update 2015-05-03 18:32:57 -05:00
Shaun Bennett de1f432be4 Build bug fixes 2015-05-03 18:31:56 -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
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 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
Mini-Chiss ed1c7e2336 Master Builders initial push (dont worry jon it doesnt effect anything for the update!) 2015-04-30 18:20:35 -05:00
libraryaddict 5d36ddce3a Arcade: Close only non-player inventories at 5 seconds 2015-04-30 21:17:08 +12:00
libraryaddict 23ea7bbce4 Spectators: Set fire ticks to 0 on damage 2015-04-30 20:55:30 +12:00
Peter Miller 152f5d3046 Ditto previous commit... 2015-04-29 16:52:06 -04:00
Peter Miller 69d4d2dfdb Another try at build changes. 2015-04-29 16:47:06 -04:00
libraryaddict 33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict 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
libraryaddict c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Peter Miller 1e6084bfb2 Another compilation order change. 2015-04-28 10:31:25 -04:00
Peter Miller 93abe301c2 More compilation depedency changes. 2015-04-28 10:18:53 -04:00
Peter Miller 1dc9864e4c Added necessary libraries to compilation targets. 2015-04-28 10:00:12 -04:00
Peter Miller e1ddf55860 Adjusting build order of compile targets in common.xml. 2015-04-28 09:36:43 -04:00
Peter Miller e68e99d1f6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-28 09:25:05 -04:00
Peter Miller 0ce7f657e1 Added compilation targets for Arcade/Hub building with Ant. 2015-04-28 09:24:35 -04:00
Mini-Chiss 45b801ba81 hitbox changes 2015-04-27 19:21:33 -05:00
libraryaddict 1c1ab9bbe3 Throwing TNT: Fixed tnt not being movable from other inventories 2015-04-23 08:30:23 +12:00
Jonathan Williams ae1480fb1e Little bit of spacing fixed. 2015-04-21 23:36:33 -05:00
Jonathan Williams a662c93a92 Fix so 0.0.0.0 doesn't get selected for DNS rotation. 2015-04-21 23:36:12 -05:00
Jonathan Williams d8ed866ada Fix for duplicate names in db.
Adjusted staff server whitelist and op list.
2015-04-21 23:35:41 -05:00
Shaun Bennett 5c6c4a23d5 Rename SDK to 1.8 instead of 1.7 (IDEA) 2015-04-21 20:10:01 -04:00
libraryaddict 2aaa93e58f ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name 2015-04-22 05:38:32 +12:00
libraryaddict b29893ff60 Merge branch 'ResourcePack' into Wizards 2015-04-22 03:46:25 +12:00
libraryaddict 9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
libraryaddict aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
Shaun Bennett 2b8137fc66 Merge remote-tracking branch 'origin/master' 2015-04-21 00:20:40 -04:00
libraryaddict 0196a5c359 Wizards: Latest changes by Chiss 2015-04-21 13:54:19 +12:00
Shaun Bennett 3dddd7112c Update MOTD to not use animation anymore (Bug fixed in 1.8.4!) 2015-04-20 17:16:57 -04:00
Cheese c73a6ae62f champs balance 2015-04-19 13:49:46 +10:00
Cheese f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10:00
libraryaddict cd47da179a Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining 2015-04-18 06:12:34 +12:00
libraryaddict 9db8aff37a Wizards: Changed spell icons for resource pack 2015-04-18 06:10:23 +12:00
Cheese 91a70d6a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-16 21:06:19 +10:00
Cheese b352b28fdc fixed MAC still being disabled 2015-04-16 21:05:56 +10:00
libraryaddict 25dfeacb09 Wizards: Spell levels are now viewable on items in chest as item amount 2015-04-16 16:20:01 +12:00
libraryaddict 8803941bd8 Wizards: More changes as per demand. 2015-04-16 05:51:08 +12:00
Jonathan Williams 99436b4a42 Added Tab event back :D 2015-04-14 02:01:04 -05:00
Jonathan Williams 556a9df945 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:59:59 -05:00
Jonathan Williams c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05:00
Jonathan Williams eea4b98069 Removed unused AccountManager.java 2015-04-14 01:59:09 -05:00
Cheese f7ef44b007 More hitbox nerfs 2015-04-14 16:43:02 +10:00
Cheese 6cc18b61d1 reduced hitbox on flesh hook and lightning orb 2015-04-14 16:38:11 +10:00
Jonathan Williams 3d6dce24ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:32:11 -05:00
Jonathan Williams e3a328c70d Revert "Work on FriendRepository, still not enabled yet."
This reverts commit 405d0fec18.

Re-enabled friends.
2015-04-14 01:32:03 -05:00
Cheese 058e5b9045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 09:44:58 +10:00
Cheese 482ee6eb79 changed builder rank name 2015-04-14 09:35:35 +10:00
libraryaddict 073c7d16c2 Wizards Napalm: Make glazed blocks more common, raise damage 2015-04-13 15:06:52 +12:00
libraryaddict e0b0975195 Bridge: Prevent hoppers being crafted to prevent abuse 2015-04-13 14:38:32 +12:00
libraryaddict c36c800bb5 AchievementManager: Add SnrMod as a min MP level of 15 2015-04-13 14:05:50 +12:00
libraryaddict 12b3a582b2 CustomExplosion: Fixed loop, added max damage 2015-04-12 23:21:19 +12:00
libraryaddict be21968805 UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion 2015-04-12 23:20:52 +12:00
libraryaddict 03fb8c203e Wizards: Balancing 2015-04-12 23:20:15 +12:00
libraryaddict 81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00
Cheese d290078790 Damage multipliers now effect damage modifiers - this also fixes a bug! 2015-04-11 16:33:18 +10:00
Cheese 1378dcb815 Properly fixed MS spec bug 2015-04-11 11:45:27 +10:00
Cheese 9b2c4662c3 fixed minestrike bug where newly joined specs could buy/drop items
removed easter baskets
2015-04-11 11:25:25 +10:00
libraryaddict afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
libraryaddict 43163cd7d7 UtilParticle: Added lore for future reference on colored particles. 2015-04-11 12:14:12 +12:00
libraryaddict 28d0e28607 UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals 2015-04-11 12:13:37 +12:00
libraryaddict 2d59bb4010 CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?) 2015-04-11 12:12:47 +12:00
libraryaddict fc7c6e5831 Wizards changes 2015-04-11 12:11:50 +12:00
Jonathan Williams 49431da509 Fix for pulling account UUID with multiple. 2015-04-10 10:53:11 -05:00
Cheese 3d95a5cfa4 bloock toss fix 2015-04-10 14:09:21 +10:00
Cheese 85c9f9010e Added Twitch Rank
fixes hitbox on glacial
2015-04-10 13:11:02 +10:00
Cheese c3798834c3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-07 08:30:45 +10:00
Cheese 18ba446764 re-enabled MAC 2015-04-07 08:30:32 +10:00
Jonathan Williams 9f6a89bfc6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-06 04:14:12 -07:00
Jonathan Williams 679d5faa9b Motd pull on start. 2015-04-06 04:14:04 -07:00
Jonathan Williams 4eb1f67d82 Removed code to set default motd. 2015-04-06 04:13:13 -07:00
Cheese e0a58ba165 champions exploit fix update 2015-04-06 19:57:33 +10:00
Cheese cdb86d3ebb champions exploit fixes and balance 2015-04-06 17:17:36 +10:00
Cheese 6c3fc3009b fixed sheep quest bug where players were unable to pick up sheep rapidly
fixed bug where falling blocks were instantly hitting players
2015-04-06 13:03:59 +10:00
Jonathan Williams 782db26d10 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-04 01:27:08 -07:00
Cheese 93abca0c01 can no logner break levers and other usables in SG 2015-04-04 16:12:33 +11:00
Cheese db1a3afa19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-04 16:02:24 +11:00
Cheese dc84621b6c blizzard snowballs expire 2015-04-04 16:01:48 +11:00
libraryaddict 9518d9f438 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-04-04 17:33:51 +13:00
libraryaddict c1c4e8b417 Disguises: Fixed DisguisePlayer not using a random UUID to prevent conflicts, fixed non-player living entities not being disguisable 2015-04-04 17:33:33 +13:00
Cheese c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Jonathan Williams d25b39058a Fixed bunny morph name. 2015-04-03 04:19:48 -07:00
Cheese ae298644e2 removed random egg color, looked ugly 2015-04-03 22:02:22 +11:00
Cheese 3cadbf3a34 fixed color in egg 2015-04-03 22:00:54 +11:00
Cheese f87511331e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 21:47:57 +11:00
Cheese ff0883e7d7 fixed easter egg duration
parser list improvement
2015-04-03 21:47:43 +11:00
Jonathan Williams 8567701e1d Updated Motd. 2015-04-03 03:20:11 -07:00