Virizion
b1c8158e2f
Added @a argument to /shard, /gem and /giveitem PC-13
2016-03-08 19:52:31 -05: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
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
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
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
Shaun Bennett
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
Shaun Bennett
41bb8442cd
Merge pull request #2 from Mineplex-LLC/develop
...
Merge Release v1.1.0 into Master
2016-02-20 00:23:29 -06:00
Shaun Bennett
b46e1bc37d
Create README file
2016-02-19 22:17:23 -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
md_5
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
NewGarbo
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
Shaun Bennett
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
Shaun Bennett
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
md_5
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
md_5
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
md_5
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
md_5
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
md_5
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
md_5
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
Shaun Bennett
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
Shaun Bennett
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
Shaun Bennett
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
md_5
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
Shaun Bennett
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
