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

2183 Commits

Author SHA1 Message Date
William Burns 7a597d90b7 final push goodnight 2015-12-11 02:48:06 +00:00
Shaun Bennett 5a1892e1ed Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 2015-12-10 21:32:14 -05:00
Shaun Bennett d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
Cheese 31cea3342e some gadget stuff 2015-12-11 13:17:38 +11:00
Shaun Bennett ffd4658740 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:06:50 -05:00
Shaun Bennett 2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett cf73d27a84 Merge remote-tracking branch 'origin/master' 2015-12-10 20:53:42 -05:00
Shaun Bennett 4d05bd5c50 Player count for chiss 2015-12-10 20:53:38 -05:00
Shaun Bennett 16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns 626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett 4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett 7b4f5d5b75 Christmas chest in gui 2015-12-10 19:19:20 -05:00
Shaun Bennett 72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex 44a244caf4 Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics 2015-12-11 01:10:54 +01:00
xGamingDudex a6a4c8be36 Cosmetic Update 
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
 2015-12-11 01:05:32 +01:00
Shaun Bennett d16d9a36e9 Use Account ID from client manager instead of PlayerCache 2015-12-10 17:25:39 -05:00
Shaun Bennett 851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
Sarah 0f8028f6e6 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-10 12:24:11 +01:00
Sarah c94c84f203 Some fixes 2015-12-10 02:59:22 +01:00
Sarah 76b29756ff Fixing some stats and disabling Chat spam messages. 2015-12-10 02:02:36 +01:00
William Burns d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett 7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Sarah 484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Cheese fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
Shaun Bennett ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
Shaun Bennett a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
xGamingDudex b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Shaun Bennett 42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns 55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Shaun Bennett 8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
Shaun Bennett c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Shaun Bennett ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
 2015-12-07 11:25:17 -06:00
Shaun Bennett c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett 4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
xGamingDudex c36182b8d4 Cosmetic Update 
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition

Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
 2015-12-07 02:53:14 +01:00
Mysticate 09f7a03444 Quick changes to improve things. 2015-12-06 20:00:22 -05:00
Mysticate 88dcdaa445 Merge remote-tracking branch 'origin/master' into update-paintball 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-12-06 12:00:06 -05:00
Cheese ccb6456110 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
 2015-12-06 18:09:24 +11:00
Cheese 35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese 9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese 040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett 618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett 8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Shaun Bennett 32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
libraryaddict b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
libraryaddict d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Keir 9bd7869e22 Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved. 2015-12-05 01:08:21 +00:00
fooify d7497ec098 Fixed Micro Battle icon not appearing in stats menu 2015-12-04 15:56:48 -08:00
Cheese 49c735e43c removed duplicate code 2015-12-05 10:34:06 +11:00
Cheese 4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
Shaun Bennett 5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
fooify b1bd2ff5ac Gravity's icon changed to ENDER_PORTAL_FRAME 2015-12-03 16:50:27 -08:00
fooify 348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
Christopher Jozsa 8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
NewGarbo d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
fooify 338e0f1892 fixed naming pets non-alphanumeric characters 2015-12-01 16:23:07 -08:00
Jonathan Williams 633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams 03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Cheese 51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
Cheese 208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex c98b427fde Added missing MountData and SingleEntityMountData files. 
For some reason, git decided that it was a good idea to remove these two
files from the index...
 2015-12-01 00:46:20 +01:00
xGamingDudex 6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex d1d58919f4 Mount bug fix. 
Mount was put in map before removed, resulting in new mount being half
disabled.
 2015-11-29 19:09:55 +01:00
xGamingDudex 509835ea64 Implemented new mount data system replacing instead of entities as data. 
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
 2015-11-29 19:08:00 +01:00
xGamingDudex 327bf8d09b We only need to add the "Go Back" page once... 2015-11-29 18:32:24 +01:00
fooify 61df87b446 Merge remote-tracking branch 'origin/master' into foo 2015-11-29 06:37:30 -08:00
Shaun Bennett 7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
NewGarbo 9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese 5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
fooify 8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
xGamingDudex dc0da3987b TitanMount fixes 
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
 2015-11-28 17:22:17 +01:00
Cheese 51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
NewGarbo 0dceca5cfc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 09:04:15 +00:00
NewGarbo a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Cheese 700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11:00
Cheese 963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Cheese 8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
 2015-11-28 15:59:26 +11:00
Cheese 0871663498 titan stuff 
I HATE YOU SNAKE.
 2015-11-28 15:57:07 +11:00
Shaun Bennett 1a87d85174 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-27 23:13:43 -05:00
xGamingDudex 24f8a98545 Added titan particle trail. 2015-11-28 02:22:41 +01:00
NewGarbo fe085c1571 loaaads of stuff 2015-11-27 19:42:15 +00:00
libraryaddict 636dcdf9f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
 2015-11-28 05:28:04 +13:00
libraryaddict 5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
Shaun Bennett a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese 4e2f48b37e Merge branch 'master' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
 2015-11-27 19:16:30 +11:00
Cheese f55b6761a8 disabled titan gadgets! 2015-11-27 19:14:35 +11:00
Cheese 77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese 2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
Cheese 05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
NewGarbo 0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict 3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict 0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo 0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
libraryaddict 3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Shaun Bennett 1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
NewGarbo 2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
xGamingDudex 3b89d65a09 Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
 2015-11-25 15:59:18 +01:00
libraryaddict ca81265b9e Readded PacketHandler debug message 2015-11-25 13:42:11 +13:00
Sarah 46362a3d5f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-24 15:38:52 +01:00
Cheese 837be048a6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:38:47 +11:00
Jonathan Williams f8d8b75586 Changed how timings is used. 2015-11-24 04:36:18 -06:00
fooify f300fd2c98 Merge remote-tracking branch 'origin/master' into foo 2015-11-23 15:34:27 -08:00
Shaun Bennett ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo a551e89310 fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT 2015-11-23 09:44:35 +00:00
AlexTheCoder 3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Cheese 6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00
Cheese d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Sarah 6f7d49b71b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-20 19:04:51 +01:00
AlexTheCoder 386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams 700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Cheese 3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Shaun Bennett 3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
Sarah bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-11-18 18:08:51 +01:00
NewGarbo 5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
Shaun Bennett 1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns 04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns 2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
NewGarbo f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
William Burns e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Mysticate 448dd33c1a Switching branches c: 2015-11-17 11:38:02 -05:00
William Burns 0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Cheese adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese 46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
libraryaddict 208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
Jonathan Williams ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder 217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
 2015-11-15 18:58:20 -05:00
AlexTheCoder ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -05:00
NewGarbo 24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
fooify db21d627d8 Merge remote-tracking branch 'origin/master' into foo 2015-11-14 09:13:51 -08:00
Jonathan Williams daee44d262 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-14 02:01:24 -06:00
Jonathan Williams 4a73bce586 Added gadget and projectileUser logging. 2015-11-14 00:36:34 -06:00
Cheese 259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
Shaun Bennett bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett 639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Cheese 3122397f7a Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2015-11-13 09:19:44 +11:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
AlexTheCoder bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit 
- Fixed items ever being lost from treasurechests
 2015-11-12 00:06:21 -05:00
fooify 8a0906587d Merge remote-tracking branch 'origin/master' into foo 2015-11-11 20:15:31 -08:00
Shaun Bennett 875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
libraryaddict 25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Shaun Bennett e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
libraryaddict b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13:00
Cheese ef2411b7d5 Merge branch 'master' into minestrike-update 2015-11-11 13:43:36 +11:00
libraryaddict 3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11:00
Cheese 59a054eeba fixed merge erorr 2015-11-11 07:52:02 +11:00
Cheese 520eb55b88 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-11 07:43:50 +11:00
fooify 394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
AlexTheCoder e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Shaun Bennett 2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Shaun Bennett ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo 7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
Shaun Bennett 05b52614fe Forgot to remove debug code for testing 2015-11-09 03:49:12 -05:00
Shaun Bennett 2eaa326929 Merge remote-tracking branch 'origin/master' 2015-11-09 03:27:50 -05:00
Shaun Bennett 2c54e9e59a Giveaway extras 2015-11-09 03:27:42 -05:00
Jonathan Williams fb4978305f Fixed up EnjinTranslator 
Added extra overload for inventoryManager if you have the accountId already.
 2015-11-09 02:26:45 -06:00
Jonathan Williams 283a774e03 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 00:04:55 -06:00
Jonathan Williams 4915ebc5ad Added Purchase logging manager for Enjin. 
Added extra callback method for SaveRank.
 2015-11-09 00:04:38 -06:00
libraryaddict d466005c35 Fix custom names not changing 2015-11-09 05:08:08 +13:00
libraryaddict 752d8152d2 Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
  Fix for some preferences not applying correctly.
 2015-11-08 08:23:20 -06:00
AlexTheCoder dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
libraryaddict c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Cheese cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11:00
Shaun Bennett addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
Shaun Bennett bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict 79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
Shaun Bennett ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Shaun Bennett 4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett 3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
AlexTheCoder fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir 783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
libraryaddict cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
AlexTheCoder 87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder 61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder 9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo 3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo ecd3b0ef76 removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay! 2015-11-03 22:06:23 +00:00