Shaun Bennett
|
5c5e7dd4a9
|
Merge master into clans
|
2015-07-13 20:42:10 -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 |
|
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 |
|
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 |
|
libraryaddict
|
3d0dda382b
|
Stacker: Fixed an infinite loop
|
2015-07-06 07:07:19 +12:00 |
|
Cheese
|
1e26ebe0bd
|
disabled ice forming
|
2015-07-02 10:09:39 +10:00 |
|
Cheese
|
0100ca1b8c
|
fixed a derp bug
|
2015-07-02 09:41:33 +10:00 |
|
Cheese
|
dd9fc8e7c6
|
bridge speed increase
|
2015-07-01 15:14:46 +10:00 |
|
Cheese
|
0650b73374
|
more bridge tweaks
|
2015-07-01 14:16:56 +10:00 |
|
Shaun Bennett
|
9ccc85a79e
|
Improved block restore for Events
|
2015-06-30 22:30:49 -05:00 |
|
Cheese
|
190e58c37e
|
bridges update
|
2015-07-01 12:58:54 +10:00 |
|
Cheese
|
de36e3d8e4
|
added WATER_DAMAGE support for maps
modified some bridges code
|
2015-07-01 00:18:06 +10:00 |
|
Cheese
|
e3d060376b
|
disabled double gem
|
2015-06-30 13:10:08 +10:00 |
|
fooify
|
4ff456b722
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-29 11:29:22 -07:00 |
|
Cheese
|
48f5fa118a
|
fixed a few sky bugs
|
2015-06-29 14:26:00 +10:00 |
|
Cheese
|
b0f8369bcd
|
lowered block falling speed.
fixed a bug where some chests didnt fall
|
2015-06-29 10:09:36 +10:00 |
|
Cheese
|
ead402d026
|
skywars art
|
2015-06-28 14:31:25 +10:00 |
|
Shaun Bennett
|
d07c319581
|
Saving some work
|
2015-06-27 22:22:02 -05:00 |
|
Cheese
|
08e4ef199e
|
added twitch to dguisecmd
|
2015-06-28 12:53:18 +10:00 |
|
Cheese
|
faca14dd23
|
fixed disguise permission
|
2015-06-28 12:50:27 +10:00 |
|
Cheese
|
840ebabf2a
|
added delay on mad scientist eggSpawn
fixed Exp bug
|
2015-06-27 20:39:05 +10:00 |
|
Cheese
|
1f34bc40a3
|
increased time you can hold TNT for in CS
|
2015-06-27 14:08:16 +10:00 |
|
Cheese
|
4c164ce2a6
|
enabled double gems
|
2015-06-27 12:44:43 +10:00 |
|
Cheese
|
d0368a19d8
|
Players who quit early do not get full game worth of EXP.
|
2015-06-27 12:38:04 +10:00 |
|
Cheese
|
754026f403
|
chicken teleport fix
scientist minion name fix
|
2015-06-27 12:18:12 +10:00 |
|
Cheese
|
4183d6f21d
|
some balance
|
2015-06-27 11:40:40 +10:00 |
|
Cheese
|
4e06a1aae3
|
fixed a few skywars bugs
improved warning for bridges
|
2015-06-27 11:24:01 +10:00 |
|
fooify
|
4b634d1bc3
|
Fix slashes (this won't affect windows users, right?)
|
2015-06-26 10:14:37 -07:00 |
|
fooify
|
333c54cff9
|
Merge branch 'master' into foo
|
2015-06-26 10:07:13 -07:00 |
|
Cheese
|
9a0ac821a2
|
fixed stat bug
|
2015-06-26 19:44:13 +10:00 |
|
Cheese
|
750769d03a
|
fixed gem thing
|
2015-06-26 19:12:34 +10:00 |
|
Cheese
|
62a7fd6a99
|
you now get levels for kills/assists
fixed scoreboard bug
|
2015-06-26 19:12:11 +10:00 |
|
Cheese
|
b0019242e7
|
skywars scoreboard fix
|
2015-06-26 19:02:34 +10:00 |
|
Jonathan Williams
|
8c427bee24
|
Fix _gameDisplay bug.
Fix Skywars quickmenu link.
|
2015-06-26 03:57:39 -05:00 |
|
Jonathan Williams
|
8f2c0cf9d8
|
Fix file names.
|
2015-06-26 03:15:16 -05:00 |
|
Cheese
|
1aa0832bb9
|
SkyWars to Skywars
|
2015-06-26 17:55:49 +10:00 |
|
Cheese
|
9bf58a2d98
|
disabled pistons
|
2015-06-26 17:47:04 +10:00 |
|
Cheese
|
1564a8bc51
|
disabled hoppers
|
2015-06-26 17:46:05 +10:00 |
|
Shaun Bennett
|
2657ef336a
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 02:33:00 -05:00 |
|
Shaun Bennett
|
60901cc17e
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
|
2015-06-26 02:32:51 -05:00 |
|