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

7659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
git
2062ca7efc Updated patch 2016-03-01 13:05:12 +13:00
Shaun Bennett
e8d5165634 Merge pull request #9 from Mineplex-LLC/develop 
Merge v1.2.0 into Master
 2016-02-27 20:06:55 -06:00
git
0284fed2a9 Update patch 2016-02-28 13:12:59 +13:00
Keir Nellyer
ffc678cc3d Small tidy-up of code. 2016-02-27 00:25:48 +00:00
Keir Nellyer
bafd34f9ac Add "Show All" link. 2016-02-27 00:08:48 +00:00
Keir Nellyer
c9b343a1fb Pro-tip: Always make sure you read Trello before adding a feature (un-doing pagination). 2016-02-26 22:55:33 +00:00
Shaun Bennett
775b6eeffa Merge pull request #7 from Mineplex-LLC/feature/dmt-update 
Draw My Thing Update
 2016-02-26 04:38:10 -06:00
Shaun Bennett
b0301bbf24 Merge pull request #4 from Mineplex-LLC/feature/parser-commands 
Add extra commands to the map parser
 2016-02-26 04:34:18 -06:00
Shaun Bennett
923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns
268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
Keir Nellyer
af8ad218be Separate previous, pages and next buttons. 2016-02-25 18:29:38 +00:00
Keir Nellyer
1c7d48575f Initial pagination draft. 2016-02-25 18:18:35 +00:00
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
9a8c410448 Fix lore being null. 2016-02-25 15:39:18 +00:00
William Burns
009d48659b Add commands for naming items. 2016-02-25 15:29:47 +00:00
William Burns
a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
William Burns
7f6517a823 Ignore barrier blocks when drawing. 2016-02-25 14:23:16 +00:00
git
e441801032 Update patches 2016-02-25 18:22:51 +13:00
git
fcc3e8e024 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:15:12 +13:00
git
2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
William Burns
19b6c3d95f Make sure the blocks are in the canvas. 2016-02-24 21:37:22 +00:00
William Burns
a5060e014b Replace old paint bucket recursive filling. 2016-02-24 21:34:41 +00:00
William Burns
35a853a198 Remove redo/undo system as per request of @mightysigils. 2016-02-24 08:17:13 +00:00
William Burns
33bf3e2e6e Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update 2016-02-24 08:03:42 +00:00
William Burns
700f5ec44a Add Redo/Undo system (WIP). 2016-02-24 07:58:50 +00:00
NewGarbo
d524645ddd placed the clan name hologram thingy correctly because it's inside the outpost!!! 2016-02-23 19:11:29 +00:00
NewGarbo
d65bf965c4 fix only some blocks of outpost being reset and explosion particles not showing up 2016-02-23 18:51:34 +00:00
NewGarbo
2956b18821 some hologram work 2016-02-23 18:45:04 +00:00
NewGarbo
879a211a41 change siege weapon damage indicator display length 2016-02-23 17:00:14 +00:00
NewGarbo
deb22fd4e7 add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors 2016-02-23 16:54:07 +00:00
NewGarbo
205e3885b8 disallow players on pvp timer to use bows 2016-02-23 16:14:56 +00:00
NewGarbo
41e140d5ca stop players from placing water in outposts 2016-02-23 16:07:12 +00:00
NewGarbo
bcd4480f23 stop recruits from opening trapped chests 2016-02-23 15:57:12 +00:00
NewGarbo
306e56980c remove weapon teleport fix 2016-02-23 14:44:07 +00:00
NewGarbo
de4568d448 accurate-ish weapon damage tracking 2016-02-23 13:03:50 +00:00
Keir Nellyer
70260754ff Reset these files to their previous state (IDE added tabs). 2016-02-23 00:26:10 +00:00
Keir Nellyer
c923745f5f Add required import. 2016-02-23 00:25:37 +00:00
NewGarbo
f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +00:00
Keir Nellyer
99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
NewGarbo
76cf65c267 siege system changes 2016-02-22 09:34:04 +00:00
NewGarbo
db7382d01e testing github? 2016-02-21 01:34:13 +00:00
xGamingDudex
33b3d121b3 Merge branch 'develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
 2016-02-20 15:30:26 +01:00
AlexTheCoder
65be5fcd99 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-02-20 03:30:57 -05:00
AlexTheCoder
3b7a7e457c Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-20 03:20:27 -05:00
AlexTheCoder
0a6cdfa779 - chiss' requested changes 2016-02-20 03:18:59 -05:00
Shaun Bennett
3a73b05895 Fix for ServerMonitor not loading database config 2016-02-20 00:48:30 -06:00