JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,530 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

108 Commits

Author SHA1 Message Date
Shaun Bennett b22c64ca6a Fix excludes 2015-12-08 05:51:21 -05:00
Shaun Bennett a84f580719 Update IntelliJ to Java 8 2015-12-08 05:45:26 -05:00
Shaun Bennett 7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
Shaun Bennett bcbc5244c6 Add Clans.core to hub build (IntelliJ) 2015-11-27 23:14:54 -05:00
Shaun Bennett 52c55335fa Add chunk to unclaim map 2015-11-17 18:33:21 -05:00
Shaun Bennett 2627aa9933 War/War Points Update 2015-11-16 14:37:32 -05:00
Shaun Bennett c4e188296a Fix compiler and misc 2015-11-12 17:55:00 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
Shaun Bennett 0bb3f8adb1 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/.idea/dataSources.xml
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-11-09 14:41:16 -05:00
Shaun Bennett 610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
NewGarbo 7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
libraryaddict 79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
Shaun Bennett ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Shaun Bennett 3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
Shaun Bennett 177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
Shaun Bennett 523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Shaun Bennett f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Shaun Bennett 88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Shaun Bennett 9c38e8039e Add clans to compiler 2015-10-01 22:59:42 -04:00
Shaun Bennett 5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Shaun Bennett 8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Ty Sayers b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
Shaun Bennett 8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Shaun Bennett cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
Shaun Bennett 820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Shaun Bennett 62cf58bd55 Fix a bug where claiming a new land would display that land as neutral 2015-08-29 13:56:26 -07:00
Shaun Bennett cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
Shaun Bennett adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Shaun Bennett b13c9fe227 Field updates, War updates, bug fixes 2015-08-26 12:26:27 -07:00
Ty Sayers 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
libraryaddict 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
Shaun Bennett 3eb7e91fbb Removing the magical 3 2015-08-11 04:38:37 -05:00
Shaun Bennett 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
Shaun Bennett c67f4fa7e6 Votifier fixes 2015-08-06 06:45:47 -05:00
Shaun Bennett 4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
William Burns 0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
William Burns bf292ecd39 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Plugins/.idea/encodings.xml
#	Plugins/.idea/modules.xml
 2015-08-03 11:51:46 +01:00
Shaun Bennett bd9d222cff Fix IntellIJ Files 2015-08-03 05:50:02 -05:00
William Burns a964f343c7 xml files are ew 2015-08-01 14:55:01 +01:00
Shaun Bennett 16bad71dcc 1.8 Updates 2015-07-27 20:26:37 -05:00
Shaun Bennett 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
William Burns 5deb699b02 Added rejected games and whitelist to MPS. 2015-07-23 18:24:41 +01:00
Shaun Bennett 6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Shaun Bennett 05b1e03598 Remove BungeeSigns Module? 2015-07-14 21:57:30 -05:00
William Burns d36dd26f42 Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames. 2015-07-14 11:56:13 +01:00
Shaun Bennett ae71de30db Fixes and changes 2015-07-14 01:57:53 -05:00