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

735 Commits

Author SHA1 Message Date
NewGarbo
2be917e623 give enemy info about time before siege and after outpost is built, the health of the outpost 2016-02-10 13:01:31 +00:00
NewGarbo
35f0162882 make catapults rideableeeeeee 2016-02-10 11:09:17 +00:00
NewGarbo
99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
NewGarbo
052d3c3380 siege system updates 2016-02-08 21:33:12 +00:00
NewGarbo
2c13824f9b possesive method in UtilText 2016-02-08 20:46:45 +00:00
Virizion
008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion
a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
NewGarbo
fa460dbd45 catapult rotatyyyy 2016-02-04 21:50:47 +00:00
NewGarbo
b13494f399 more modifications to siege weapons. 2016-02-04 16:00:41 +00:00
Cheese
5c22c841fe val1 2016-02-04 10:55:29 +11:00
NewGarbo
9086188280 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-02-02 22:02:06 +00:00
NewGarbo
6fea76a8e4 finalized alpha patches 2016-02-02 21:38:38 +00:00
NewGarbo
23883148dd alpha fixes 2016-02-02 20:55:23 +00:00
NewGarbo
9fa5927240 siege weapon base progress 2016-02-02 19:41:25 +00:00
Keir Nellyer
eb329ec845 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-02-01 22:38:51 +00:00
Cheese
610522bdd9 mac fix 2016-02-02 09:25:46 +11:00
NewGarbo
b4ed912f7d siege weapon modular system beginnings 2016-02-01 19:52:53 +00:00
Keir Nellyer
9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-31 17:38:08 +00:00
NewGarbo
cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
 2016-01-31 16:27:14 +00:00
NewGarbo
002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
Shaun Bennett
c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
Keir Nellyer
8cf32ef8bf Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-30 00:46:43 +00:00
NewGarbo
7d28bc69c9 collision boxes on siege weapons and other stuff 2016-01-29 20:55:56 +00:00
Shaun Bennett
1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett
c1f91cbfb0 Final changes 2016-01-29 03:56:49 -05:00
Shaun Bennett
50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
Shaun Bennett
d30fb8d8ef Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-29 03:40:28 -05:00
Shaun Bennett
0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett
f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop 
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
 2016-01-28 21:02:23 -06:00
NewGarbo
f86262dc0e catapult and cannon progress 2016-01-28 23:32:23 +00:00
teddy
63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
teddy
eed55b48ac Descriptions changed 2016-01-28 09:55:48 +00:00
NewGarbo
682a243c31 fixed catapult state being mapped to incorrect blocks 2016-01-28 09:18:58 +00:00
Keir Nellyer
ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
NewGarbo
7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo
9215d0d3ff NegativeArraySizeException fix 2016-01-26 18:40:55 +00:00
NewGarbo
fde5a5af28 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:47:08 +00:00
NewGarbo
0b7cec60ae put cmod above support so that support can't bypass clans home block 2016-01-25 08:44:17 +00:00
Virizion
219b86ae55 Chiss' checklist. 2016-01-25 03:01:54 -05:00
NewGarbo
0252436990 cannons updates 2016-01-24 20:56:47 +00:00
NewGarbo
24011c4af4 cannons work 2016-01-23 12:46:52 +00:00
Shaun Bennett
311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
NewGarbo
cc48d98208 pushing to beta to change to alpha 2016-01-22 11:06:19 +00:00
Shaun Bennett
4bbd956e14 Don't use the same build twice (untested!) 2016-01-22 01:37:47 -05:00
Virizion
6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Teddy
1e72ebcbe6 Merge branch 'master' into rankdescriptions 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-01-21 12:54:12 +00:00
md_5
447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett
037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Shaun Bennett
9884742552 Fix OrderedObjectives, Starting CombatTutorial work 2016-01-19 16:34:51 -05:00
Shaun Bennett
80d55b2c9c It works! 2016-01-19 13:34:17 -05:00
Shaun Bennett
0f83263871 Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2016-01-19 11:01:11 -05:00
Shaun Bennett
947ce254da Tutorial Gui, Fixes 2016-01-19 10:59:56 -05:00
Shaun Bennett
976779b9f2 Tutorial Work 2016-01-17 22:45:38 -05:00
NewGarbo
1042edb134 CANNONZ! 2016-01-16 08:18:06 +00:00
NewGarbo
70444ff508 cannon + siege work with outposts, also moved outposts to the clans.siege package 2016-01-15 06:53:58 +00:00
Keir
53133d51ee Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-01-13 11:47:13 +00:00
Shaun Bennett
6c055c31a0 Fix flashing through doors, Update to 0.18c 2016-01-10 20:39:56 -05:00
Shaun Bennett
d361ce948e Merge branch 'develop' into william-gladiators 
# Conflicts:
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
 2016-01-08 02:21:32 -05:00
Shaun Bennett
b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop 
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
 2016-01-08 00:35:15 -06:00
NewGarbo
15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00
NewGarbo
e1e8c2bb97 changed outpost forcefields to be a bit larger to surround the outpost more. 2016-01-07 21:02:55 +00:00
NewGarbo
43f075014a made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. 2016-01-07 20:05:33 +00:00
NewGarbo
fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo
b685a207bc quick modification to outposts, and fixed the legendary announcements being weird 2016-01-07 09:34:16 +00:00
NewGarbo
52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
libraryaddict
c920d4efa1 Modify MapText to actually work, modify UtilText to save the images of characters 2016-01-07 04:48:44 +13:00
Shaun Bennett
05ef4d30c7 Store a set of active members for objective goals 2016-01-04 15:56:33 -05:00
Shaun Bennett
ce8586e5c5 More work and refactoring on the tutorial 2016-01-04 14:18:58 -05:00
NewGarbo
b47665e115 lots of work on outposts, 
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
 2016-01-02 14:02:50 +00:00
libraryaddict
92c4450eea Update the dual version 2015-12-30 21:12:11 +13:00
Keir
5841ab1101 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-29 23:47:00 +00:00
Shaun Bennett
d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
libraryaddict
2d974a781f Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-24 14:06:59 +13:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
William Burns
f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +00:00
Keir
6f82f8349d Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-16 14:07:56 +00:00
Cheese
52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Shaun Bennett
e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Shaun Bennett
fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
xGamingDudex
64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
xGamingDudex
6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese
98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese
05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese
3447de9a92 Merge branch 'master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
 2015-12-11 15:20:50 +11:00
Cheese
a5b28422cd cosmetics 2015-12-11 15:19:20 +11:00
libraryaddict
3cd187ff04 Move LineFormat.java 2015-12-11 16:57:21 +13:00
Shaun Bennett
bc46518a05 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 22:54:53 -05:00
libraryaddict
4cfa7c436b Add missing file 2015-12-11 16:48:40 +13:00
Shaun Bennett
557f3e97a5 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:32:35 -05:00
William Burns
563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
libraryaddict
1661c056c1 Added line stuff 2015-12-11 15:21:05 +13:00
Shaun Bennett
2694787590 Reverting 2015-12-10 20:59:57 -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
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
Cheese
fabf3dab59 updated blocksearch 2015-12-10 13:12:01 +11:00
Keir
8459cf0f95 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-09 18:13:26 +00:00
Cheese
09d8367b4b fixed method 2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6 Merge pull request #92 in MIN/mineplex from update-SSM to master 
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
  SSM kit description change, grammar mistake
  SSM Pig bomb bug fix
 2015-12-08 14:29:32 -06:00
Teddy
2bf1012fa4 SSM Pig bomb bug fix 2015-12-08 16:34:07 +00:00
Shaun Bennett
a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
Cheese
fe1f763374 changed order blocks will be added to the list 2015-12-08 15:26:32 +11: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
Keir
d38ce9ef1e Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-12-07 18:54:53 +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
Keir
67b3fe1d23 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-07 18:11:40 +00: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
Cheese
fa6418769b YT name change 2015-12-06 21:26:02 +11:00
Keir
ef6fd0eaa3 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-05 00:05:05 +00:00
Cheese
e01d30b920 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-04 13:19:07 +11:00
Cheese
ef2511434d tuber arnk 2015-12-04 13:18:23 +11: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
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
Christopher Jozsa
fc0cae8e0f Merge pull request #85 in MIN/mineplex from virizion_utils to master 
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
  Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
 2015-12-02 18:53:30 -06:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion
bf92af647a Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames). 2015-12-02 00:00:32 -05:00
NewGarbo
f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Virizion
666b9963e4 Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values. 2015-11-30 17:42:48 -05:00
xGamingDudex
6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex
2c2370f8a0 Added method to edit NoAI field on entities. 2015-11-29 19:08:26 +01:00
Shaun Bennett
f82396d485 Clans changes/fixes 2015-11-29 02:41:53 -05: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
libraryaddict
28947643e0 More updates for dual version 2015-11-29 02:54:16 +13:00
NewGarbo
d8ae035f84 creative scoreboard team. and fixed npe in tutorials 2015-11-28 09:20:42 +00:00
libraryaddict
d4ab57e4e7 Update for 1.9 dual version 2015-11-28 19:38:58 +13: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
Sarah
e81aa72c7e Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-27 20:33:18 +01:00
libraryaddict
5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
NewGarbo
3be2986cea sethome command now places bed even if theres grass 2015-11-27 13:26:12 +00: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
98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo
0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo
56d5c10481 oops util ent new method didn't commit in last commit 2015-11-26 07:29:59 +00:00
Cheese
193c5fe487 fixed static 2015-11-26 15:26:57 +11:00
Cheese
059a9a32cd fixed method 2015-11-26 14:51:45 +11:00
Cheese
1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
NewGarbo
11deec75dd fixed illusion 2015-11-26 00:44:13 +00: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