fooify
|
8149d61343
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-07-07 07:59:46 -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 |
|
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 |
|
Cheese
|
556e524e18
|
changed notifications back to 75% sale
|
2015-07-02 16:14:47 +10:00 |
|
fooify
|
e7b51ac1c1
|
add jnr_dev to updaterank
|
2015-07-01 16:40:15 -07:00 |
|
fooify
|
b9b9c5f801
|
ishh also wanted this :P (let me know if I should remove it)
|
2015-06-30 13:37:46 -07:00 |
|
fooify
|
c824a39058
|
ishh wanted it...k
|
2015-06-30 13:33:41 -07:00 |
|
Jonathan Williams
|
2069524f15
|
Merge remote-tracking branch 'remotes/origin/foo'
|
2015-06-29 18:14:07 -04:00 |
|
Jonathan Williams
|
bbb661d686
|
Fixed up BenefitManager.
|
2015-06-29 18:07:06 -04:00 |
|
fooify
|
4ff456b722
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-29 11:29:22 -07:00 |
|
Jonathan Williams
|
d426c24970
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:14:30 -04:00 |
|
Cheese
|
da3c5eeaaf
|
40k b enefit
|
2015-06-29 20:14:15 +10:00 |
|
Jonathan Williams
|
9f384b0d3e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:02:57 -04:00 |
|
Cheese
|
48f5fa118a
|
fixed a few sky bugs
|
2015-06-29 14:26:00 +10:00 |
|
Cheese
|
0ea388379a
|
reduced win req for skywars ach
enabled beenfit for 40k reward
|
2015-06-28 15:16:05 +10:00 |
|
Jonathan Williams
|
65a10461cd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
|
2015-06-27 02:29:07 -05:00 |
|
Jonathan Williams
|
9a4bcd29a1
|
Fixed Sparks problems...
|
2015-06-27 02:26:29 -05:00 |
|
fooify
|
333c54cff9
|
Merge branch 'master' into foo
|
2015-06-26 10:07:13 -07:00 |
|
Shaun Bennett
|
8ef52ea103
|
Mineplex Gold Rush 2.0
|
2015-06-26 10:50:37 -05:00 |
|
Cheese
|
c0bc522614
|
split achievement text over 2 lines
|
2015-06-26 19:32:18 +10:00 |
|
Cheese
|
1aa0832bb9
|
SkyWars to Skywars
|
2015-06-26 17:55:49 +10:00 |
|
Jonathan Williams
|
f906f08a18
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:34:36 -05:00 |
|
Shaun Bennett
|
7c698f65cf
|
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
|
2015-06-26 02:31:35 -05:00 |
|
Jonathan Williams
|
c78ef9d93d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:30:01 -05:00 |
|
Cheese
|
2498f7756c
|
skyawrs stats icon
|
2015-06-26 17:16:16 +10:00 |
|
Cheese
|
027efe02fc
|
skywars!
|
2015-06-26 16:38:44 +10:00 |
|
Jonathan Williams
|
efa06d370b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 01:13:42 -05:00 |
|
Jonathan Williams
|
86e2514e37
|
Fixed callbacks for gem/coin rewards.
|
2015-06-26 01:13:28 -05:00 |
|
Cheese
|
caa51d0e89
|
Merge branch 'SkyWars'
|
2015-06-26 16:04:46 +10:00 |
|
Cheese
|
338797f4a6
|
skywars update
|
2015-06-26 15:57:47 +10:00 |
|
Cheese
|
aef8a00017
|
update!
|
2015-06-26 15:25:43 +10:00 |
|
Cheese
|
2d1d65b239
|
skywars fixes
|
2015-06-26 13:15:03 +10:00 |
|
Jeremiah Bishop
|
0342a5ac61
|
Fixed Achievements
Reordered Kits
Added new Kit
etc, etc, etc...
|
2015-06-25 19:03:25 -04:00 |
|
fooify
|
2679d19a81
|
Missed a spot.
|
2015-06-25 08:19:12 -07:00 |
|
fooify
|
ba9e4ba5d9
|
Fix staff server not hiding in friends list
|
2015-06-25 08:17:28 -07:00 |
|
Cheese
|
2179795677
|
Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
|
2015-06-25 20:48:34 +10:00 |
|
Cheese
|
2bf1faa70d
|
fixed a few skywars bugs
added ore generation (but theres some wierd bug, still working on it)
|
2015-06-25 20:24:31 +10:00 |
|
Jeremiah Bishop
|
ed667fedee
|
Added more achievements
|
2015-06-24 22:59:28 -04:00 |
|
Cheese
|
b77279a160
|
fixed notif msg
|
2015-06-25 11:22:23 +10:00 |
|
Jeremiah Bishop
|
cd10a2ad79
|
Fixed both kits
Added game achievements.
|
2015-06-24 20:08:31 -04:00 |
|
fooify
|
ea3c04b8c1
|
Add fooify to list of AFKers
|
2015-06-24 10:24:08 -07:00 |
|
Jeremiah Bishop
|
7583e4170b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
|
2015-06-22 21:40:43 -04:00 |
|
Cheese
|
3a06b54b7f
|
Changed notifications to 50% off sale
|
2015-06-22 17:10:03 +10:00 |
|
Jeremiah Bishop
|
a05c2d085d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
|
2015-06-21 16:17:51 -04:00 |
|
Jonathan Williams
|
90e13b4b9e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-20 03:37:33 -05:00 |
|