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

6403 Commits

Author SHA1 Message Date
Shaun Bennett
e39b3de237 Fix errors 2016-03-08 12:12:44 -06:00
Shaun Bennett
890a3f4bc9 Merge develop into clans/beta 2016-03-08 12:09:04 -06:00
Shaun Bennett
d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
NewGarbo
7b9ff288f3 nether progresssisiannsnsssss 2016-03-03 23:23:20 +00:00
NewGarbo
73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
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
0284fed2a9 Update patch 2016-02-28 13:12:59 +13: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
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
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
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
NewGarbo
f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +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
Shaun Bennett
3a73b05895 Fix for ServerMonitor not loading database config 2016-02-20 00:48:30 -06:00
Shaun Bennett
82d51a896f Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Shaun Bennett
8d7453b78e Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 19:33:52 -06:00
Shaun Bennett
7032568a92 Add PLAYER_STATS DBPool 2016-02-19 19:33:39 -06:00
md_5
a84f8dd2d0 Fix dbcp, tone down sentry 2016-02-19 20:28:22 +11:00
md_5
81f9ca0bc2 Fix mysql 2016-02-19 20:10:01 +11:00
Shaun Bennett
6e2eea50bb Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 02:46:25 -06:00
md_5
d575266522 Fix sentry 2016-02-19 19:44:36 +11:00
Shaun Bennett
3b10207503 Class.forName! 2016-02-19 02:40:14 -06:00
Shaun Bennett
d3d22bbec9 Merge pull request #168 in MIN/mineplex from clans/alpha to develop 
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
  remove more eclipse files
  remove eclipse files
  moar undead fixes
  Fixes to observer settings
  Clans Alpha 1.0 changes
  WP Evade
  More alphs bug fixes
  Fixes to flame and broadsword
  Clans alpha bug fixes
  Fixed /c stuck timer taking 7 seconds instead of 2 minutes
  Fixes to TntProtection
  Added safe zone protection for flame
  finalized alpha patches
  alpha fixes
  raised war points for invasion to 25
  Fixes to war point evasion
  Added fix to WarPoint evasion bug + 1 dmg bug
  that's not needed
  MAVEN TEST COMMIT
  Fixed issues with Broadsword Added max building height of 100
  ...
 2016-02-19 01:30:09 -06:00
NewGarbo
67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo
441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00