Cheese
|
ef4a575d28
|
fixed blocktoss exploits
|
2015-07-16 12:47:39 +10:00 |
|
Shaun Bennett
|
05b1e03598
|
Remove BungeeSigns Module?
|
2015-07-14 21:57:30 -05:00 |
|
Shaun Bennett
|
7f98157890
|
More work/fixes
|
2015-07-14 20:38:30 -05:00 |
|
Shaun Bennett
|
ae71de30db
|
Fixes and changes
|
2015-07-14 01:57:53 -05:00 |
|
Shaun Bennett
|
5c5e7dd4a9
|
Merge master into clans
|
2015-07-13 20:42:10 -05:00 |
|
Shaun Bennett
|
231d4bd494
|
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
|
2015-07-13 20:23:51 -05:00 |
|
Cheese
|
f2cc2a2c86
|
youtubers wont get kicked by mac
|
2015-07-14 10:16:42 +10:00 |
|
Shaun Bennett
|
dc1fe5fc2c
|
Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager
|
2015-07-13 19:11:17 -05:00 |
|
Cheese
|
cb05049c4a
|
youtubes can turn off vel in hubs
|
2015-07-14 10:08:41 +10:00 |
|
Jonathan Williams
|
f652ad8448
|
Removing ancient projects that are no longer used.
|
2015-07-13 13:41:57 -05:00 |
|
libraryaddict
|
66bef4ac00
|
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
|
2015-07-13 21:21:17 +12:00 |
|
Jonathan Williams
|
96a93b6786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 15:32:25 -05:00 |
|
Jonathan Williams
|
7684e1837d
|
Added new support staff to whitelist.
|
2015-07-10 15:31:38 -05:00 |
|
Jonathan Williams
|
f8b3431305
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 11:08:22 -05:00 |
|
Jonathan Williams
|
a20a9ba9e7
|
Fixed issue and updated bungee motd manager.
|
2015-07-09 11:07:43 -05:00 |
|
Jonathan Williams
|
77a63f72cc
|
Updated staff server white list.
|
2015-07-09 11:07:16 -05:00 |
|
Jonathan Williams
|
ecd8e3d7b0
|
Increased wait time for redis.
|
2015-07-09 11:07:00 -05:00 |
|
Cheese
|
49daf597b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 12:47:57 +10:00 |
|
Cheese
|
7d073fdc0d
|
fixed skywars icon
changed LOSSES to GAMESPLAYED for consistency
|
2015-07-09 12:47:40 +10:00 |
|
Shaun Bennett
|
a9e68ff777
|
Completed Energy
|
2015-07-08 21:39:31 -05:00 |
|
Sarah
|
068b7bdd47
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-07-09 03:48:44 +02:00 |
|
Sarah
|
5babd8a41a
|
Fix number formatting for different system locale
|
2015-07-09 03:45:57 +02:00 |
|
libraryaddict
|
7e3fdef2e8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-08 18:43:56 +12:00 |
|
libraryaddict
|
1f250bf951
|
MineWare: Add current progress
|
2015-07-08 18:43:37 +12:00 |
|
Ben Sihota
|
ca880371a6
|
Merge remote-tracking branch 'origin/master'
|
2015-07-07 21:19:43 -07:00 |
|
Cheese
|
480a29b874
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-08 13:55:16 +10:00 |
|
Cheese
|
e36b0440a4
|
Merge branch 'bench'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
|
2015-07-08 13:55:01 +10:00 |
|
Ben Sihota
|
ffbee4a9aa
|
Add more details to /game
Fix NPE with /game set
|
2015-07-07 18:20:27 -07:00 |
|
libraryaddict
|
9eff5b7245
|
Perks: Forgot to include this in last commit, no harm done.
|
2015-07-08 07:51:33 +12:00 |
|
Jonathan Williams
|
7bf440f786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 05:18:15 -04:00 |
|
libraryaddict
|
2bec753a34
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-07 12:30:37 +12:00 |
|
libraryaddict
|
bff3897fab
|
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
|
2015-07-07 12:30:20 +12:00 |
|
Shaun Bennett
|
6c8c3946a3
|
Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d.
|
2015-07-06 17:06:29 -05:00 |
|
Ben Sihota
|
71d696278d
|
Add IntelliJ IDE library files
|
2015-07-06 13:48:47 -07:00 |
|
Cheese
|
cca26165cd
|
swapped sale back to 50%
|
2015-07-06 11:42:54 +10:00 |
|
libraryaddict
|
2c249e37b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-06 07:07:56 +12:00 |
|
libraryaddict
|
e16cb4cef7
|
Disguise: Initite armorstand vector
|
2015-07-06 07:07:41 +12:00 |
|
libraryaddict
|
3d0dda382b
|
Stacker: Fixed an infinite loop
|
2015-07-06 07:07:19 +12:00 |
|
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
|
Cheese
|
7182205fde
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-05 15:13:33 +10:00 |
|
Cheese
|
8d2b1650af
|
world component for MCPE
|
2015-07-05 15:13:18 +10:00 |
|
libraryaddict
|
e002e4af18
|
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
|
2015-07-05 13:37:07 +12:00 |
|
libraryaddict
|
abbf6957b0
|
Update craftbukkit to fix maps and cursors in 1.8
|
2015-07-04 09:08:08 +12:00 |
|
libraryaddict
|
27c7e7be03
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
|
2015-07-04 09:07:29 +12:00 |
|
libraryaddict
|
fbf2935b19
|
Don't display dead players
|
2015-07-04 09:07:14 +12:00 |
|
Shaun Bennett
|
384d1814d7
|
Scoreboard teams display clan relationships
|
2015-07-03 15:12:46 -05:00 |
|
libraryaddict
|
c021c6cc19
|
Added missing but not forgotten MapCommand
|
2015-07-04 07:12:50 +12:00 |
|
libraryaddict
|
24294237ea
|
Add /map command
|
2015-07-04 04:11:35 +12:00 |
|
libraryaddict
|
89a4541275
|
If inventory is empty, add clans map
|
2015-07-04 04:09:18 +12:00 |
|
libraryaddict
|
c75f22b5e0
|
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2015-07-04 03:44:59 +12:00 |
|