Shaun Bennett
|
6de7b8a73e
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 01:46:43 -05:00 |
|
NewGarbo
|
972a2d151a
|
simplified combat log npc title
|
2015-11-26 06:21:01 +00:00 |
|
NewGarbo
|
f92849f796
|
that doesn't do what i thought it did
|
2015-11-26 05:32:59 +00:00 |
|
NewGarbo
|
1e4b6b4d0f
|
fixed formatting error in clan tip
|
2015-11-26 05:30:13 +00:00 |
|
NewGarbo
|
7da8b8e3bf
|
fix players hurting each other in safe zones
|
2015-11-26 05:29:35 +00:00 |
|
NewGarbo
|
48ebfc219d
|
removed travel npcs from shops
|
2015-11-26 05:24:33 +00:00 |
|
Shaun Bennett
|
389956240b
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 00:20:41 -05:00 |
|
NewGarbo
|
76d009e0de
|
Unstuck (Spawn) command
|
2015-11-26 05:18:18 +00:00 |
|
NewGarbo
|
33cdd5400d
|
fixed some coloring issues
|
2015-11-26 04:32:41 +00:00 |
|
Shaun Bennett
|
8f14c8beae
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
|
2015-11-25 23:26:29 -05:00 |
|
Shaun Bennett
|
7a663b4f7b
|
Fix legendaries
|
2015-11-25 23:24:07 -05:00 |
|
NewGarbo
|
8bd1f4b3c8
|
reduced hyper axe damage. OP as heck
|
2015-11-26 04:21:30 +00:00 |
|
NewGarbo
|
abcee009dd
|
stuff
|
2015-11-26 04:07:33 +00:00 |
|
NewGarbo
|
670afc17ef
|
clans chat is being weird
|
2015-11-26 03:26:15 +00:00 |
|
NewGarbo
|
5230b25dfd
|
fixed suicide command (?)
|
2015-11-26 03:24:48 +00:00 |
|
NewGarbo
|
4f275d79fa
|
fixed staff tags only displaying if player is in clan
|
2015-11-26 03:19:40 +00:00 |
|
NewGarbo
|
5fb58b1dad
|
added suicide command
|
2015-11-26 03:17:05 +00:00 |
|
NewGarbo
|
8a64a2f4ce
|
fixed world events spawning floating on grass and other boundless blocks
|
2015-11-26 03:06:27 +00:00 |
|
NewGarbo
|
b43cf0b28a
|
got rid of enchanted effect on rare items
|
2015-11-26 03:00:59 +00:00 |
|
NewGarbo
|
7e23f896ca
|
changes
|
2015-11-26 02:49:01 +00:00 |
|
NewGarbo
|
a19ade0739
|
rain rain go away
|
2015-11-26 00:53:01 +00:00 |
|
NewGarbo
|
11deec75dd
|
fixed illusion
|
2015-11-26 00:44:13 +00:00 |
|
Shaun Bennett
|
c150ea6175
|
Potatoes and Tornadoes
|
2015-11-25 19:08:13 -05:00 |
|
Shaun Bennett
|
cc75bafb4c
|
Bugs and thugs
|
2015-11-25 16:45:04 -05: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
|
c5211e0368
|
buuugs
|
2015-11-25 17:40:12 +00:00 |
|
NewGarbo
|
9a8fba543d
|
auto-replanting trees
|
2015-11-25 17:03:48 +00: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 |
|
NewGarbo
|
7e9dc7968e
|
gear gui fixes and legendaries changes
|
2015-11-25 01:32:05 +00:00 |
|
NewGarbo
|
bbdbb209c5
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-25 00:55:37 +00:00 |
|
NewGarbo
|
3a6dab7224
|
stuff
|
2015-11-25 00:55:11 +00:00 |
|
NewGarbo
|
3cb22c8cb7
|
uuid bug fixed finally!
|
2015-11-25 00:47:35 +00:00 |
|
libraryaddict
|
ecf42803f9
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
|
2015-11-25 13:42:31 +13:00 |
|
libraryaddict
|
ca81265b9e
|
Readded PacketHandler debug message
|
2015-11-25 13:42:11 +13:00 |
|
NewGarbo
|
aa52c1be27
|
custom item stuff
|
2015-11-25 00:14:34 +00:00 |
|
NewGarbo
|
6220ce14fe
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-24 23:04:24 +00:00 |
|
NewGarbo
|
98edd0a452
|
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
|
2015-11-24 23:03:19 +00:00 |
|
NewGarbo
|
81c2d2a11f
|
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
|
2015-11-24 22:49:28 +00:00 |
|
NewGarbo
|
31afe9f886
|
removed debug message from undead camp
|
2015-11-24 22:29:20 +00:00 |
|
Shaun Bennett
|
57302221df
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-24 17:27:46 -05:00 |
|
Shaun Bennett
|
cb7422b4fe
|
Re-enable world events
|
2015-11-24 17:27:35 -05:00 |
|
NewGarbo
|
befe4d129d
|
formatted PlayerGear.java (to avoid further confusion)
|
2015-11-24 22:21:01 +00:00 |
|
NewGarbo
|
459e1beeff
|
clans buggy fixers
|
2015-11-24 22:18:48 +00:00 |
|
libraryaddict
|
5799edae50
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-24 23:45:42 +13:00 |
|
libraryaddict
|
ddf7528796
|
Updated CB
|
2015-11-24 23:45:22 +13:00 |
|
Jonathan Williams
|
f8d8b75586
|
Changed how timings is used.
|
2015-11-24 04:36:18 -06:00 |
|
Jonathan Williams
|
fbea0e702b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 02:56:40 -06:00 |
|
Cheese
|
c5b5d07627
|
evade timing
|
2015-11-24 16:07:11 +11:00 |
|
Cheese
|
913d079623
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 15:23:53 +11:00 |
|