92436c8f9d
Merge pull request #60 in MIN/mineplex from alex-bugfixes to master
...
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
Made rank unlock lore colored based on rank required for item (QA Requested)
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
Marked the Bunny Morph to reflect its no longer available status
Fixed previous ownership not being transferred
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-09-27 22:39:50 -05:00
eae894c879
Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '436f63860ecef028d23dae28ceb52e466e90270b':
NBT overflow patch
2015-09-26 17:32:30 -05:00
ee5934c7aa
Fix for punishments to match names exactly
...
Fix for expiring ranks.
Fix for EU Lobby count.
2015-09-26 18:31:37 -04:00
436f63860e
NBT overflow patch
...
Patch for the NBT overflow exploit which allowed any player to overflow
and drain the server for memory making it freeze and eventually crash.
2015-09-26 01:48:38 +02:00
7c04e5608d
- Added new achievement 'Clutch'
...
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
5b42d25bff
- Added achievement and stat stuff
...
- Fixed banner bugs
2015-09-24 23:16:44 -04:00
e94eb056dc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-25 14:09:18 +12:00
34d535f153
Fix custom tags, improve Packet handling
2015-09-25 14:07:51 +12:00
fa30ba1e16
Fix a small issue with Future Disguises
2015-09-25 14:07:12 +12:00
cd33bf8dd8
- Fixed updaterank and testrank scoreboard conflict
2015-09-24 11:47:50 -04:00
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
2b902c5193
Add created by, enabled by, and disabled by to botspam module
2015-09-23 00:25:39 -04:00
3a8fd18d2e
Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8.
2015-09-22 15:28:06 -05:00
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
452e8a9694
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-19 12:11:21 +12:00
8015f5428d
Flags stuff
2015-09-19 08:36:23 +12:00
901dad2f8a
Add vote3 to bonusmanager
2015-09-17 22:31:18 -04:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
1417d31b73
Added 60s delay to timings enable check.
2015-09-11 23:57:26 -07:00
a7d4a7534f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-11 22:51:04 -07:00
2380b9041d
Added automatic timings report in the event of lag.
...
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
9be0ecc598
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java
Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.
2015-09-11 17:01:04 -05:00
6474f5a9e9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-06 16:23:18 +12:00
4bb100b6be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-09-05 01:53:45 -07:00
2536d8a437
Fixed out of range stats causing no stats to load.
...
Issue fix to db for out of range stat on login.
2015-09-05 01:40:56 -07:00
0ac808ba43
stacker pref is now only for pvp stacking.
2015-09-05 10:30:11 +10:00
fc5ccd4a5e
fixed 'self scoring' in Soccer
...
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
f05cdd4915
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-09-04 02:57:47 -04:00
890c9d59e1
Fixed loading window bug.
...
Added default rank for CoreClient in case of bugged login.
2015-09-03 09:38:02 -07:00
9dc90b0e13
Added CTF to Champions stat group
2015-09-01 01:26:35 -04:00
8a94602aef
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
2015-08-31 16:03:27 -04:00
fe4586852c
Made rank unlock lore colored based on rank required for item (QA Requested)
2015-08-31 15:59:53 -04:00
cbb0d4521c
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
2015-08-31 15:49:31 -04:00
5322e9d018
Marked the Bunny Morph to reflect its no longer available status
2015-08-31 15:48:25 -04:00
24fed013ae
Fixed previous ownership not being transferred
2015-08-31 15:39:04 -04:00
b63843930f
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-08-31 15:08:42 -04:00
e93db405d0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-08-31 04:48:43 -04:00
788ec97d38
Added CTF wins to achievements for champions
2015-08-31 04:39:07 -04:00
c61f9ce3c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-31 00:53:23 -07:00
740899c09e
Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
...
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
6bb4e69236
Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.
2015-08-30 17:05:45 -07:00
d79794c6d3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-30 15:47:57 -07:00
bb66d47e8e
meow
2015-08-30 15:47:49 -07:00
b0efe35531
Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.
2015-08-30 13:14:01 -07:00
908d11ead5
Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query
2015-08-30 12:00:58 -07:00
eca69a8ae2
Made new branch up to date and including previous branch's code
2015-08-30 03:58:58 -04:00
c27fdf023c
Fix login manager and stats manager
2015-08-29 17:18:14 -07:00
4e32bad8dd
Fixed bug with stats pulling as int.
...
Fixed bug with Poll recording selections wrong.
2015-08-29 14:54:57 -07:00
aad5942242
Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.
2015-08-29 14:46:18 -07:00
f8729cbd66
Fixed Gadget.
2015-08-28 23:47:27 -07:00
d35b5940fc
fixed achievements
2015-08-28 23:30:21 -07:00
5ae01f95a8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 23:27:35 -07:00
181afaa2d6
Merge branch 'Myst_EVO'
2015-08-28 23:25:51 -07:00
b71bcfab4b
Fixed achievements. Merge ASAP
2015-08-29 00:19:39 -06:00
d4d0c4bed6
Updated Motd.
2015-08-28 23:17:14 -07:00
c98a85c2ba
Added local storage of login time.
...
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
ad4ba010b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-28 20:59:08 -07:00
6f0309622c
Removed AccountCache.
...
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
6f39c072a4
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-28 12:57:13 -07:00
7761ca7e6f
Remove debug messages
2015-08-28 12:56:43 -07:00
b98cde8b80
Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.
2015-08-28 12:52:02 -07:00
cd145324d8
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
2015-08-28 12:00:23 -07:00
783f526b76
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-27 14:42:41 -07:00
4dcd54a9b0
Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.
2015-08-27 14:42:07 -07:00
379ee9271a
Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta
...
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
Iron Wizard, fixed iron golem custom name
Push golem block shot as per request
2015-08-27 16:34:46 -05:00
9d3f125c9e
Iron Wizard, fixed iron golem custom name
2015-08-27 14:18:10 -07:00
b0ee2bb669
Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items
2015-08-27 13:57:57 -07:00
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
c20d2c9516
Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.
2015-08-26 17:37:31 -07:00
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
062328313e
Fix errors
2015-08-24 22:24:26 -05:00
bf1f62057c
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-08-24 22:15:08 -05:00
6841cbac69
Clans bug fixes + shop updates
2015-08-24 22:03:26 -05:00
69afefd66f
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
2015-08-24 20:55:29 -04:00
6d3c965f14
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-23 16:26:02 -07:00
1e7f2f01a7
Fixed problem where UUID api was preventing client loading from db.
2015-08-23 15:38:43 -07:00
a9f5197c64
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
6c9a99fa1b
Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.
2015-08-22 15:06:05 -04:00
cdc92f8b2f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-22 00:38:55 +12:00
7841b17d03
Add PacketPlayOutCamera for locking view to entity
2015-08-22 00:38:37 +12:00
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12:00
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
15c873392a
updated give to allow naming of items.
2015-08-20 20:38:07 +02:00
bbe5b79c7e
Disabled AntiHack create table.
...
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
14bf8faf3a
disabled big sale
2015-08-18 09:49:53 +02:00
d489b31738
merge
2015-08-17 16:27:28 -07:00
b7854e6cab
added big larry to chests
2015-08-17 13:05:41 +02:00
9eed03237b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-17 12:39:06 +02:00
58e517a4d7
fixed null args more
2015-08-17 12:38:41 +02:00
8ab8388344
Merge remote-tracking branch 'origin/master'
2015-08-17 05:05:36 -05:00
5c71522b2d
Return the first UUID instead of last (AccountRepository)
2015-08-17 05:05:25 -05:00
0a23f91592
fixed two little bogs
2015-08-17 11:53:50 +02:00
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
555908a3c1
Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo
2015-08-15 02:03:46 -05:00
fda052ea90
Add treasure chest stats
2015-08-14 21:34:37 -05:00
e89961380b
Merge remote-tracking branch 'origin/master'
2015-08-14 21:14:41 -05:00
1eaa6446af
Fix double hologram and hopefully NPE
2015-08-14 21:14:34 -05:00
c520bd7921
Add recharge to carl spins so that they don't get triggered twice
2015-08-14 20:43:58 -05:00
a1ea03f74b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-08-14 19:44:56 +12:00
a2d7aa77fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-14 00:37:55 -05:00
f5d934fe53
Fixed sync db calls for pets.
...
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
0b4dbab871
Change ticket command access to admin
2015-08-13 11:23:29 -05:00
bd7317cf7b
Fix ticket command rollback >:D
2015-08-13 11:03:12 -05:00
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
d41ab3432f
remove paintbrush when moved away
2015-08-11 21:13:45 +02:00
72adf21bff
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
2015-08-12 06:23:13 +12:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
83a010c215
enabled summer sale msg
2015-08-11 17:05:41 +02:00
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
f7d9476191
Hidden egg fix
2015-08-11 13:53:36 +02:00
5c7d140521
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 13:49:53 +02:00
e25558fc91
Animation improvements.
2015-08-11 13:49:06 +02:00
49d54d4dd3
doesnt count rank thingy as reward if no rank. yknow
2015-08-11 13:22:58 +02:00
2d7d7f6dde
Improving messages, animations and some Items.
2015-08-11 13:01:20 +02:00
f3558b144c
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 12:05:23 +02:00
c821523240
removed vote broadcast.
2015-08-11 12:04:54 +02:00
1c484367a1
Add hasPoll
2015-08-11 04:57:45 -05:00
3eb7e91fbb
Removing the magical 3
2015-08-11 04:38:37 -05:00
8abefaf856
The magical +3.
2015-08-11 11:31:51 +02:00
4c32f32ced
removed game reward type
2015-08-11 11:17:20 +02:00
74b83d6851
fixed!
2015-08-11 10:56:07 +02:00
184feec875
cleany and logic
2015-08-11 10:54:24 +02:00
f66a0439e8
no need to gen so many
2015-08-11 10:34:33 +02:00
a1c10a7ec5
clean up
2015-08-11 10:33:44 +02:00
1c40478e6e
SPIN DOGGY SPIN
2015-08-11 10:32:49 +02:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
184c592786
Merge remote-tracking branch 'origin/Bonus' into Bonus
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
2015-08-11 03:12:55 -05:00
13e7e58986
Creeper visual!
2015-08-11 03:09:21 -05:00
c177307f70
Votifier fixes
2015-08-11 02:53:54 -05:00
b99c526169
Implementing Carl message.
2015-08-11 09:09:16 +02:00
5d3503b733
Carl rewards
2015-08-11 01:55:27 -05:00
d2983b831e
Merge remote-tracking branch 'origin/Bonus' into Bonus
2015-08-11 00:35:44 -06:00
d833385df4
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
2015-08-11 00:35:02 -06:00
66f2a5df5e
renamed GAME
2015-08-11 08:32:12 +02:00
3bedc4ce84
Improving animation timing.
2015-08-11 05:37:58 +02:00
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
186e3028c2
removing temp fix "there was an error processing your request" for the Spinner.
2015-08-10 17:15:56 +02:00
3be811e480
Fixing Spinner announcements.
2015-08-10 17:08:03 +02:00
ed7b8949bb
Adding SpinnerFiller and SpinnerRewards.
2015-08-10 17:04:47 +02:00
2253a63e96
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 16:43:05 +02:00
c6beb122e3
Adding firework animations for spinner.
2015-08-10 16:42:43 +02:00
ad8781fd84
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 16:14:24 +02:00
18d11f7d68
new enums
2015-08-10 16:13:17 +02:00
65fc81a2aa
improving animations again.
2015-08-10 15:33:00 +02:00
5781009f4e
Improving animations and some text.
2015-08-10 14:00:40 +02:00
aa13bcf5c6
Bug fix!
2015-08-10 04:54:01 -05:00
adb76b0681
Fix giving out gold
2015-08-10 04:51:46 -05:00
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
511cc76bef
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
2015-08-10 00:47:36 -05:00
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04:00
328c31de88
hub Update
...
fixed bad gameid
2015-08-08 13:47:09 +02:00
4f6dfdb856
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
2015-08-08 06:35:25 -05:00
eab7aa59f2
hub update!
2015-08-08 09:27:49 +02:00
47cb98066d
Hub fixes
2015-08-08 08:19:07 +02:00
33c96f51ae
fixed some stuff
2015-08-07 22:59:50 +02:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
e8c60e6e84
Added storage of pets in mysql. Going to have live while backend process is copying data over.
...
Updated ServerTypePage to resolve clicking issues with solo/team pages.
2015-08-07 02:22:13 -05:00
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
f37e25e9d7
Finish push for today <3
2015-08-07 07:03:15 +02:00
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02:00
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
6311ceaa0f
Reward work for new Game reward rarity and setup for carl, work on carl spinner
2015-08-06 21:15:17 -05:00
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
44e30a0903
SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui
2015-08-06 15:34:56 -05:00
c67f4fa7e6
Votifier fixes
2015-08-06 06:45:47 -05:00
35d999d747
Remove some debug messages
2015-08-06 05:56:31 -05:00
9e9f9862d0
Bonus bonus bonus!
2015-08-06 05:47:32 -05:00
6a3d888f5b
fix git
2015-08-06 08:44:16 +02:00
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05:00
a15e8e1b95
Fixing more /disguise bugs.
2015-08-05 15:23:16 +02:00
83da6b7a9a
Improving the /disguise command even more. ;D
2015-08-05 13:32:05 +02:00
cba1c3bcca
disallowed negative stats completely
2015-08-05 09:03:22 +02:00
e55557e1fd
Improving the /disguise command.
2015-08-05 07:57:52 +02:00
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
a623cc16ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 09:37:12 -05:00
e10d26dae1
reduced respawn time in OITQ
...
removed respawn msg for short respawn times
2015-08-03 16:18:59 +02:00
ccdb859f11
lowered mythical change a little :)
2015-08-03 16:11:11 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
ab20d35917
Wipe personal server groups on restart of monitor.
...
Cleanup of unused code.
2015-08-03 08:08:51 -05:00
7c028ae936
fixed skywars teams icon in MPS
2015-08-03 11:44:13 +02:00
bb2e15c4fd
made it so games can set another game as its 'kit source' so games can share kit unlocks
2015-08-03 11:38:16 +02:00
a87b3a9284
fixed kits not sharing for team vers
2015-08-03 10:10:29 +02:00
38cc318387
Update JOOQ, downcast BigInteger to Long in stats for now
2015-08-02 19:36:24 -05:00
a2250ea343
Fix for blocking logins if redis can't add account cache.
2015-08-02 18:59:13 -05:00
41189b9838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:23:17 -05:00
70c1b883db
Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.
2015-08-02 18:20:52 -04:00
d3ba621e86
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-02 17:00:49 -05:00
4fdd42c599
Mysticate's request: Add PacketPlayOutCamera
2015-08-03 01:51:15 +12:00
06be7b2cdd
Fix stats
2015-08-02 05:24:25 -05:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
7910170327
fixed achievemnt amount
2015-08-01 18:39:18 +02:00
992c0fc36f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-01 01:12:24 -05:00
d3c5d0cbe6
Only store account cache stuff for 6 hours.
...
Update MOtd.
2015-08-01 01:12:01 -05:00
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -05:00
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
8d7c42134b
fixed mounts having nametags
2015-07-30 14:54:23 +02:00
0cf333ec00
lowered win req
2015-07-30 14:12:17 +02:00
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
5da23fa322
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
2015-07-29 14:13:07 -07:00
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
389bf7a74c
please work...
2015-07-29 10:55:03 -07:00
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
c3e07522b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-29 12:22:11 +02:00
5af68e5628
Fulfill Shaun's request
2015-07-28 23:55:27 -07:00
10549601f8
Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
Fixed bug with direct hit
Final tweaks. this is as good as it's goign to get! ;d
Tweaks
Fixed waller achievement thing
Fixed waller kit bc I was stupid before ;c
Added an exception for a map to make it night.
Various improvements.
Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
b5e8c0886e
Stuff and things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:38:26 -04:00
e4da4aa0ed
Remove NPC commands
2015-07-28 10:14:25 -07:00
c2cb86087a
Merge pull request #22 in MIN/mineplex from horus-bug-fixes to master
...
* commit '02f1211ddb7688737dc66605c174167cce708d0e':
Misc
Fix numerous trello bugs
Update IntelliJ builds
2015-07-28 02:24:15 -05:00
16bad71dcc
1.8 Updates
2015-07-27 20:26:37 -05:00
da3500cc32
Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
# Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
# Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
# Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
# Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
# Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
# Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
# Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -05:00
0557e10257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-27 15:53:57 +02:00
0c4a7a847f
fixed annoying color bug!
2015-07-27 15:53:39 +02:00
7d9fd61c8e
Display changes
2015-07-26 22:31:40 -07:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
47d410370d
Merge branch 'horus-bug-fixes'
2015-07-26 18:20:39 -07:00
02f1211ddb
Misc
2015-07-26 18:12:56 -07:00
8fd3a3a838
Merge branch 'Myst_LOBBERS'
2015-07-26 18:31:55 +02:00
e0b1567e54
Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS
2015-07-26 18:31:11 +02:00
727427165f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-26 08:49:49 -07:00
26ed7ebb94
Fixes to redis
...
Fixes for stat handler.
2015-07-26 08:49:35 -07:00
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
2b240f3dfa
removed visdata debug
2015-07-25 17:16:20 +02:00
9fa8c6ac45
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
a1ce1ed45d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:31:01 -07:00
84be48f264
Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
...
Added conversion of stats to new stat table via StatHandler.
Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
335eb5eacd
Fixed report link
2015-07-23 13:35:06 -04:00
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
91db076053
Fixed lobbers icon in stats
2015-07-23 09:28:35 -04:00
fe80ed373a
Fix numerous trello bugs
...
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
2015-07-22 22:28:44 -07:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
e55ca81d48
Reverted Trainee to Helper due to popular demand.
2015-07-20 15:45:16 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
0772f2e91e
Fixes for GoldManager
2015-07-19 21:04:59 -07:00
3b47b01aea
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-07-19 20:18:08 -07:00
73aea85876
GoldManager now uses stored procedure.
...
Deductions automatically process gold queue and return if transaction succeeded.
2015-07-19 19:32:46 -07:00
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
6edc923002
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-19 15:43:13 -04:00
d94f4f96a7
Observer mode changes
2015-07-18 16:40:50 -05:00
1ef6fe3ed6
Observer changes
2015-07-17 15:37:33 -05:00
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
9cf4ff005a
Added some debug checks.
2015-07-16 01:26:38 -05:00
6a598690b0
Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix
2015-07-15 21:43:35 -05:00
5d820edd41
remove custom level to fix merge conflicts
2015-07-15 14:34:42 -07:00
7f98157890
More work/fixes
2015-07-14 20:38:30 -05:00
1e1cf6403d
Added achievements
2015-07-14 13:31:41 -04:00
ae71de30db
Fixes and changes
2015-07-14 01:57:53 -05:00
a224e5937d
Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-14 07:11:48 +02:00
e72d612379
Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams.
2015-07-14 05:25:08 +02:00
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
231d4bd494
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
2015-07-13 20:23:51 -05:00
f2cc2a2c86
youtubers wont get kicked by mac
2015-07-14 10:16:42 +10:00
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
cb05049c4a
youtubes can turn off vel in hubs
2015-07-14 10:08:41 +10:00
66bef4ac00
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
2015-07-13 21:21:17 +12:00
0a09ae29f3
Merge remote-tracking branch 'origin/master' into BombLobbers
2015-07-12 18:14:25 -04:00
1b3d7f1c20
Fixed and added things
2015-07-08 23:57:48 -04:00
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
a9e68ff777
Completed Energy
2015-07-08 21:39:31 -05:00
5d34716521
squirrel!
2015-07-08 06:20:40 -07:00
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
8149d61343
Merge remote-tracking branch 'origin/master' into foo
2015-07-07 07:59:46 -07:00
cca26165cd
swapped sale back to 50%
2015-07-06 11:42:54 +10:00
2c249e37b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-06 07:07:56 +12:00
e16cb4cef7
Disguise: Initite armorstand vector
2015-07-06 07:07:41 +12:00
abaa0ddee8
Level for Bobby
2015-07-05 13:30:16 -05:00
7182205fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-05 15:13:33 +10:00
8d2b1650af
world component for MCPE
2015-07-05 15:13:18 +10:00
e002e4af18
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
2015-07-05 13:37:07 +12:00
384d1814d7
Scoreboard teams display clan relationships
2015-07-03 15:12:46 -05:00
556e524e18
changed notifications back to 75% sale
2015-07-02 16:14:47 +10:00
e7b51ac1c1
add jnr_dev to updaterank
2015-07-01 16:40:15 -07:00
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
b9b9c5f801
ishh also wanted this :P (let me know if I should remove it)
2015-06-30 13:37:46 -07:00
c824a39058
ishh wanted it...k
2015-06-30 13:33:41 -07:00
2069524f15
Merge remote-tracking branch 'remotes/origin/foo'
2015-06-29 18:14:07 -04:00
bbb661d686
Fixed up BenefitManager.
2015-06-29 18:07:06 -04:00
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
d426c24970
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:14:30 -04:00
da3c5eeaaf
40k b enefit
2015-06-29 20:14:15 +10:00
9f384b0d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-29 06:02:57 -04:00
48f5fa118a
fixed a few sky bugs
2015-06-29 14:26:00 +10:00
0ea388379a
reduced win req for skywars ach
...
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
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
9a4bcd29a1
Fixed Sparks problems...
2015-06-27 02:26:29 -05:00
333c54cff9
Merge branch 'master' into foo
2015-06-26 10:07:13 -07:00
8ef52ea103
Mineplex Gold Rush 2.0
2015-06-26 10:50:37 -05:00
c0bc522614
split achievement text over 2 lines
2015-06-26 19:32:18 +10:00
Shaun Bennett
Jonathan Williams
xGamingDudex
AlexTheCoder
libraryaddict
Mysticate
Shaun Bennett
Ty Sayers
Cheese
fooify
Mini-Chiss
libraryaddict
Sarah
Ben Sihota
Aaron Brock