Ben
|
a27fb90c2a
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 02:21:03 +00:00 |
|
Ben
|
0e276474c5
|
fixerroooniissssss
|
2016-03-11 02:20:18 +00:00 |
|
Ben
|
01ba099d74
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:38 +00:00 |
|
Ben
|
c9eb2c9559
|
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:31 +00:00 |
|
Ben
|
57c65cf5ff
|
some changes and vanish fixes maybe?
|
2016-03-11 01:47:14 +00:00 |
|
Ben
|
8ce32fcdfa
|
little tweakers
|
2016-03-11 00:58:47 +00:00 |
|
Ben
|
bcd250cf25
|
gitingore
|
2016-03-11 00:48:56 +00:00 |
|
Ben
|
8ec3542c1d
|
update .gitingore
|
2016-03-11 00:45:02 +00:00 |
|
Ben
|
a568db6d90
|
remove eclipse file
|
2016-03-11 00:43:30 +00:00 |
|
Ben
|
bcfe4a42c0
|
changerooonis
|
2016-03-11 00:41:28 +00:00 |
|
Ben
|
33d978c6d6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-10 22:12:41 +00:00 |
|
Ben
|
20ade492a8
|
tnt generator changes
|
2016-03-10 22:09:45 +00:00 |
|
Shaun Bennett
|
76782fd420
|
Fix issues
|
2016-03-10 15:07:22 -06:00 |
|
Ben
|
c2f6217d9f
|
allowed sr. mods to use /we (TEMP)
|
2016-03-10 17:38:16 +00:00 |
|
Ben
|
0fd0a7fb44
|
mak esupply drop beacons more specific
|
2016-03-10 17:38:03 +00:00 |
|
git
|
557b0bf978
|
Fix Wither disguise
|
2016-03-11 01:55:49 +13:00 |
|
Ben
|
2d2e88e069
|
some fixes and updates
|
2016-03-10 02:47:48 +00:00 |
|
Ben
|
9b40496a1e
|
siege weapon picking up
|
2016-03-09 23:56:25 +00:00 |
|
Joseph Prezioso Jr
|
4955abb519
|
Hopefully, ELO Rating will be grabbed from the correct column now...
|
2016-03-09 17:12:04 -05:00 |
|
Ben
|
1532abcc62
|
disable nether and legendary fixes
|
2016-03-09 21:12:02 +00:00 |
|
Ben
|
70aa5d63fd
|
touched up on some messages
|
2016-03-09 13:10:39 +00:00 |
|
Ben
|
51e5552e2d
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-09 11:56:25 +00:00 |
|
Ben
|
cf6645cec7
|
Legendaries and other preparation for beta
|
2016-03-09 11:55:40 +00:00 |
|
phobia
|
e3fb40805c
|
all siege items shouldn't be able to be placed or used while on PvP timer.
Fixes to Jagged prefix
|
2016-03-09 22:46:45 +11:00 |
|
Virizion
|
67e844db29
|
Added /e bridge <seconds> PC-17
|
2016-03-08 21:21:53 -05:00 |
|
Ben
|
5b3da3d06f
|
Consistency. (Changed Vanish to Incognito)
|
2016-03-09 01:53:01 +00:00 |
|
Virizion
|
6c0d18662f
|
Added /e clear <player or @a> PC-16
|
2016-03-08 20:45:23 -05:00 |
|
Ben
|
befb27d3db
|
Finalized Vanish system
|
2016-03-09 01:45:17 +00:00 |
|
Virizion
|
c89669aec9
|
Add /e announce <text> PC-15
|
2016-03-08 20:23:33 -05:00 |
|
Virizion
|
b1c8158e2f
|
Added @a argument to /shard, /gem and /giveitem PC-13
|
2016-03-08 19:52:31 -05:00 |
|
Joseph Prezioso Jr
|
059b964f22
|
eloRating now after warLosses so that it matches better with the SQL table
|
2016-03-08 17:06:13 -05:00 |
|
Joseph Prezioso Jr
|
19375e5720
|
callEvent now has a return type
|
2016-03-08 16:20:53 -05:00 |
|
Joseph Prezioso Jr
|
ac91ba690c
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 16:08:14 -05:00 |
|
Joseph Prezioso Jr
|
b8f06374cd
|
Made changes to accommodate for Clan ELO's
|
2016-03-08 16:07:52 -05:00 |
|
Ben
|
abdf61de0a
|
*more fixes*
|
2016-03-08 21:02:25 +00:00 |
|
Ben
|
af8f0fff16
|
vanish error fixes
|
2016-03-08 21:00:19 +00:00 |
|
Ben
|
69091c079f
|
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 20:58:11 +00:00 |
|
Shaun Bennett
|
9b65926d42
|
Fix rank monthly rewards description
|
2016-03-08 13:26:26 -06:00 |
|
Joseph Prezioso Jr
|
97f5b60404
|
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 13:56:05 -05:00 |
|
Ben
|
1f09616784
|
chat packet listener
|
2016-03-08 18:28:54 +00:00 |
|
Shaun Bennett
|
99c2fefed2
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:27:45 -06:00 |
|
Shaun Bennett
|
3283b873e7
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-08 12:19:28 -06:00 |
|
Ben
|
26b7ea2d59
|
fixes
|
2016-03-08 18:19:12 +00:00 |
|
Shaun Bennett
|
876a568bd0
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
|
2016-03-08 12:17:07 -06:00 |
|
Shaun Bennett
|
ffd9d98d2e
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:15:47 -06:00 |
|
Shaun Bennett
|
e39b3de237
|
Fix errors
|
2016-03-08 12:12:44 -06:00 |
|
Ben
|
86ef10456c
|
packet hnadler beginning, switching to clans to fix errors
|
2016-03-08 18:10:57 +00:00 |
|
Shaun Bennett
|
890a3f4bc9
|
Merge develop into clans/beta
|
2016-03-08 12:09:04 -06:00 |
|
Ben
|
f24e196efd
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-08 18:07:57 +00:00 |
|
Ben
|
6b61d4aecd
|
Disable Alpha Manager.
|
2016-03-08 18:03:07 +00:00 |
|