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 |
|
Ben
|
036565abb7
|
more
|
2016-03-08 17:44:15 +00:00 |
|
Ben
|
0ff434cf91
|
progress
|
2016-03-08 16:49:32 +00:00 |
|
Ben
|
d86ef81056
|
weaps oops
|
2016-03-08 01:11:16 +00:00 |
|
Ben
|
263e3e7768
|
forgot to push
|
2016-03-08 01:07:35 +00:00 |
|
Ben
|
9953388b92
|
iunvseeeeeeeeeeee
|
2016-03-08 00:32:36 +00:00 |
|
Ben
|
48cfe4d91c
|
fixed & inv see?
|
2016-03-08 00:27:06 +00:00 |
|
NewGarbo
|
ae42aaaab1
|
Sammy changes + cleanup
|
2016-03-07 03:25:22 +00:00 |
|
NewGarbo
|
7e2086df1c
|
flash fix, rares update, and outpost fixes
|
2016-03-06 19:55:58 +00:00 |
|
NewGarbo
|
ae2da31544
|
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-05 23:14:32 +00:00 |
|
NewGarbo
|
8cfbe20a08
|
re-added delay to /spawn
|
2016-03-05 23:09:57 +00:00 |
|
NewGarbo
|
d92f817efc
|
fixed some teleportation bugs and a bit of cleanup
|
2016-03-05 22:50:06 +00:00 |
|
NewGarbo
|
e88736c1aa
|
changes to scepter, NPE fix
|
2016-03-05 20:46:24 +00:00 |
|
NewGarbo
|
d79107eaaa
|
new legendary weapons and nether finzlizations
|
2016-03-05 03:07:25 +00:00 |
|
Shaun Bennett
|
d108679d43
|
Fix compile error
|
2016-03-04 14:09:20 -06:00 |
|
NewGarbo
|
7b9ff288f3
|
nether progresssisiannsnsssss
|
2016-03-03 23:23:20 +00:00 |
|
NewGarbo
|
73d8870daf
|
nether work (forgot to commit days ago oops)
|
2016-03-02 19:42:53 +00:00 |
Shaun Bennett
|
28486c8d65
|
Merge pull request #10 from Mineplex-LLC/Dual_1.9
Dual 1.9 Build
|
2016-03-02 13:00:09 -06:00 |
|
Shaun Bennett
|
3447354814
|
Dual 1.9 Fixes
|
2016-03-02 12:58:30 -06:00 |
|
Shaun Bennett
|
a3b7a3269c
|
Merge branch 'develop' into Dual_1.9
|
2016-03-01 15:14:59 -06:00 |
git
|
2062ca7efc
|
Updated patch
|
2016-03-01 13:05:12 +13:00 |
|
git
|
0284fed2a9
|
Update patch
|
2016-02-28 13:12:59 +13:00 |
|
Shaun Bennett
|
775b6eeffa
|
Merge pull request #7 from Mineplex-LLC/feature/dmt-update
Draw My Thing Update
|
2016-02-26 04:38:10 -06:00 |
|
Shaun Bennett
|
b0301bbf24
|
Merge pull request #4 from Mineplex-LLC/feature/parser-commands
Add extra commands to the map parser
|
2016-02-26 04:34:18 -06:00 |
|
Shaun Bennett
|
923e51483c
|
Remove fill line
|
2016-02-26 04:29:27 -06:00 |
|
Shaun Bennett
|
4472c52432
|
Fix bucket
|
2016-02-26 04:21:26 -06:00 |
William Burns
|
268536ce68
|
push 4 shaun
|
2016-02-26 08:13:28 +00:00 |
|
William Burns
|
e4ba5d9723
|
Fix colour targeting FINALLY!
|
2016-02-25 19:48:15 +00:00 |
|
William Burns
|
dead7a0850
|
Use a different method for targeting blocks.
|
2016-02-25 16:09:00 +00:00 |
|
William Burns
|
9a8c410448
|
Fix lore being null.
|
2016-02-25 15:39:18 +00:00 |
|
William Burns
|
009d48659b
|
Add commands for naming items.
|
2016-02-25 15:29:47 +00:00 |
|
William Burns
|
a97409b64a
|
Adjust max distance for targeting.
|
2016-02-25 15:04:19 +00:00 |
|
William Burns
|
7f6517a823
|
Ignore barrier blocks when drawing.
|
2016-02-25 14:23:16 +00:00 |
|
git
|
e441801032
|
Update patches
|
2016-02-25 18:22:51 +13:00 |
|
git
|
fcc3e8e024
|
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
|
2016-02-25 18:15:12 +13:00 |
|
git
|
2a9d49ccd9
|
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
|
2016-02-25 18:11:12 +13:00 |
|
William Burns
|
19b6c3d95f
|
Make sure the blocks are in the canvas.
|
2016-02-24 21:37:22 +00:00 |
|
William Burns
|
a5060e014b
|
Replace old paint bucket recursive filling.
|
2016-02-24 21:34:41 +00:00 |
|
William Burns
|
35a853a198
|
Remove redo/undo system as per request of @mightysigils.
|
2016-02-24 08:17:13 +00:00 |
|
William Burns
|
33bf3e2e6e
|
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
|
2016-02-24 08:03:42 +00:00 |
|
William Burns
|
700f5ec44a
|
Add Redo/Undo system (WIP).
|
2016-02-24 07:58:50 +00:00 |