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

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Williams
91954d43df Added DataWatcher Vector support. 2014-12-10 03:42:31 -08:00
Chiss
358d5fde44 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-10 22:38:19 +11:00
Chiss
450d3eb923 merge 2014-12-10 22:38:08 +11:00
Jonathan Williams
c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/.classpath
 2014-12-10 03:34:53 -08:00
Jonathan Williams
11e09b202c Fixed PullWhileLeashed bug and ghost bug. 2014-12-10 03:34:05 -08:00
Jonathan Williams
ea034812b9 Fixed path finder crap in UtilEnt 
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
 2014-12-10 03:32:35 -08:00
Chiss
db8e0484ab missing files + new pet 2014-12-10 18:23:22 +11:00
Chiss
0aba82eee6 fixed some eclipse java6 stuff with mail 
Christmas game update
 2014-12-10 15:38:57 +11:00
Chiss
6de278bb4f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-09 20:24:07 +11:00
Chiss
bee81ff455 lowered coin rewards 2014-12-09 20:23:56 +11:00
Chiss
828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00
Jonathan Williams
625d517058 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-08 00:55:43 -08:00
Jonathan Williams
342c44affc Fixed a bunch of clans bugs 2014-12-08 00:55:20 -08:00
Chiss
50358c0c30 removed EULA breach in bridges private blocks 2014-12-08 18:23:47 +11:00
Chiss
ef8e5104f1 SnD Kits 
minor bug fixes
 2014-12-08 17:28:18 +11:00
Chiss
64c8edc292 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-08 17:25:03 +11:00
Shaun Bennett
0759a373da Fix treasure chest hologram 2014-12-07 01:25:36 -06:00
Jonathan Williams
60a46d5adf Replaced Dwarf Toss with Block Toss in Clans. 2014-12-06 04:23:26 -08:00
Shaun Bennett
4a7b6bd33f Blame chips 2014-12-06 01:10:08 -06:00
Shaun Bennett
7402eb2f91 Merge remote-tracking branch 'origin/master' 2014-12-06 01:00:40 -06:00
Shaun Bennett
b99da44873 Disable mail and notifications 2014-12-06 01:00:02 -06:00
Shaun Bennett
1276e0c0d5 Chat Slow Command 2014-12-05 21:33:31 -06:00
libraryaddict
41a1ff5842 Merge pull request #4 from blockhunt to master 
* commit '048aa40590b2d64b9219d2459ab865e3f273117e':
  Remove comments and add comments
  Read merge message
 2014-12-05 08:26:37 -06:00
libraryaddict
048aa40590 Remove comments and add comments 2014-12-06 03:25:53 +13:00
libraryaddict
307d280534 Read merge message 2014-12-06 02:22:52 +13:00
Jonathan Williams
21e80af6cb Fixed Cosmetic menu buttons 
Removed map in wrong location
Removed message for removing armor.
 2014-12-05 01:15:25 -08:00
Jonathan Williams
828e8d4115 Fixed bug with ok buttons still active after clicking ok in confirmation page. 2014-12-04 23:48:22 -08:00
Jonathan Williams
3d3f9012ff Added some base Clans shops. 
Added support for Gold

Refactored failed db call code a bit.
 2014-12-04 23:41:49 -08:00
Chiss
80971c2fe7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-05 16:27:30 +11:00
Chiss
4430efd7be minor updates 2014-12-05 16:25:34 +11:00
Shaun Bennett
54d8fe21fb Notifications and stuffs? 2014-12-04 22:48:54 -06:00
Shaun Bennett
03bd2ed2c1 Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text 2014-12-04 17:48:06 -06:00
Shaun Bennett
f48085d5ca Merge remote-tracking branch 'origin/master' 2014-12-04 17:41:40 -06:00
Shaun Bennett
0bb2d1db5b Some changes *_* 2014-12-04 17:29:47 -06:00
Jonathan Williams
fbcc774383 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-04 05:05:43 -08:00
Jonathan Williams
59f93d46ec Refactored IButton 
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
 2014-12-04 05:05:27 -08:00
Chiss
38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
 2014-12-04 13:34:08 +11:00
Chiss
6cc4ec034b Champs Updates 
UHC Y Limit in middle
 2014-12-04 13:33:31 +11:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names 
Added support for negative amounts in Support server.

Clans in core testing state.
 2014-12-03 13:06:50 -08:00
Jonathan Williams
1fd1e5cc34 Removed unused gem booster code. 2014-12-02 12:50:53 -08:00
Jonathan Williams
b0f13cc7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 23:53:42 -08:00
Jonathan Williams
63506c9ebc Changed message in CUST-1 
Fixed how QueuedCommands are handled, don't rerun website api call if it succeeded.
 2014-12-01 23:53:35 -08:00
Chiss
a8deee5292 fixed a spelling error 2014-12-02 18:04:48 +11:00
Chiss
340f5d87a4 removed debug 2014-12-02 12:30:59 +11:00
Chiss
e63ef8a607 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 11:50:03 +11:00
Chiss
5695e845ef resistence no longer effects hold position. 2014-12-02 11:49:39 +11:00
Jonathan Williams
7a3b4771ee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 16:14:15 -08:00
Jonathan Williams
384f296d60 checkPlayerName returns actual name (casing correct) 
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
 2014-12-01 16:14:02 -08:00
Chiss
6319bffd42 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 09:50:47 +11:00
Chiss
185b182061 fixed teleports removing you from the game 2014-12-02 09:50:30 +11:00