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
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
Shaun Bennett
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
md_5
6d7dbf6c67
Fix Sentry when running from shaded jar.
2016-02-16 10:51:16 +11:00
Shaun Bennett
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
Shaun Bennett
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
Shaun Bennett
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
md_5
7b36892328
Store craftbukkit jar in repo for ease of use.
2016-02-15 10:06:47 +11:00
md_5
bc3002134f
Update + Rebuild Patches.
2016-02-15 10:01:14 +11:00
md_5
305973198c
Merge remote-tracking branch 'origin/md_5/sentry' into develop
2016-02-15 09:20:34 +11:00
phobia
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
phobia
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
Shaun Bennett
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
Shaun Bennett
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
Shaun Bennett
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
Shaun Bennett
eca400278c
Support server update
2016-02-12 05:00:09 -06:00
Shaun Bennett
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
Shaun Bennett
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
Shaun Bennett
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -06:00
Shaun Bennett
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
