JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,125 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

3079 Commits

Author SHA1 Message Date
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
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