Commit Graph

2001 Commits

Author SHA1 Message Date
Driftay
65e7061135
Merge pull request #21 from DroppingAnvil/1.6.x
More permission kit fixes
2019-10-04 18:55:52 -04:00
DroppingAnvil
4b23117262 More permission kit fixes 2019-10-04 17:54:22 -05:00
Driftay
06395b5c4a
Merge pull request #20 from DroppingAnvil/1.6.x
Players unable to use /f perms due to lack of permissions
2019-10-04 18:48:50 -04:00
DroppingAnvil
7973d807e6
Merge from Driftay/1.6.x
Merge from Driftay 1.6.x
2019-10-04 17:38:56 -05:00
DroppingAnvil
666d6ab21d Players unable to use /f perms due to lack of permissions 2019-10-04 17:35:25 -05:00
Driftay
fac351d35a
Update README.md 2019-10-02 13:56:28 -04:00
Driftay
bd4f92e133
Update README.md 2019-10-02 13:49:41 -04:00
Driftay
4bf1676b2b
Update README.md 2019-10-02 13:47:34 -04:00
Driftay
6ba970ac13 2 typos 2019-10-01 12:34:02 -04:00
Driftay
a057a235b8 Fixed a Bunch of Misc stuff & Made config.yml CLEAN 2019-10-01 12:18:44 -04:00
Driftay
10f06baadc Version Change 2019-09-30 16:04:41 -04:00
Driftay
07fa138d58 Disabled Discord Features By Default 2019-09-30 16:03:44 -04:00
Driftay
abf5c45053 Version Change 2019-09-29 18:51:24 -04:00
Driftay
a1f527346a Fixed NPE on Guild loading 2019-09-29 18:45:48 -04:00
Driftay
8a4478764f
Merge pull request #19 from DroppingAnvil/1.6.x
You can now mention discord users in game!
2019-09-29 18:45:15 -04:00
DroppingAnvil
8b70947d03 Uncommented something that shouldnt have been 2019-09-29 13:36:37 -05:00
DroppingAnvil
58b25c726f First step to mentions! You can now mention discord users ingame if they have a one word name and there is not someone named the same thing! I plan to make this system much much better soon! 2019-09-29 13:29:23 -05:00
Driftay
22ed86b4d8 Added f points to stats discord command 2019-09-29 08:13:48 -04:00
Driftay
ed9b2419a6 Jar reduced by 200kbs 2019-09-29 07:24:37 -04:00
Driftay
2d0d3c96fc Little thing to avoid npe's being thrown in the console 2019-09-29 06:50:45 -04:00
Driftay
206914247d Version Change 2019-09-29 06:44:45 -04:00
DroppingAnvil
90d9486165
Merge pull request #7 from Driftay/1.6.x
Merge
2019-09-29 04:16:37 -05:00
Driftay
e5cfc1ebdc Changed f invitebot format 2019-09-29 05:16:13 -04:00
Driftay
f63121ed86 Removed token from conf, so owners didnt accidentally use that token 2019-09-29 04:46:21 -04:00
Driftay
3998a346b4 Discord Integration AKA Changing Factions Forever 2019-09-29 04:39:30 -04:00
Driftay
0b1add2a3e Fixed Some things with inventorysee 2019-09-28 03:22:23 -04:00
Driftay
4ab3f3a465 Stopped Referencing ItemStack by mistake 2019-09-28 03:05:03 -04:00
Driftay
6f20087ebe Version Change 2019-09-27 13:01:36 -04:00
Driftay
a493f1494e Code Cleanup 2019-09-24 17:54:12 -04:00
Driftay
2a08f167bb Fixed Citizens error with new upgrades 2019-09-24 17:42:10 -04:00
DroppingAnvil
c2ac4a6517
Merge from Driftay/1.6.x 2019-09-24 12:07:58 -05:00
Driftay
f358e6d75b Added Anti-FChest-Items
(Ability to deny storing items in factions chest)
2019-09-24 06:39:43 -04:00
Driftay
8338e21dd2 Added F Discord 2019-09-21 13:02:51 -04:00
Driftay
d47806b33a Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-21 10:35:23 -04:00
Driftay
99edc5b3b5 Missions Not Be Able to Be Done Multiple Times 2019-09-21 10:35:08 -04:00
Driftay
a19cfade75
Merge pull request #18 from DroppingAnvil/1.6.x
Allow F grace from console
2019-09-20 17:06:41 -04:00
Driftay
5b8d2ac4d5 Version Change 2019-09-20 16:59:57 -04:00
Driftay
d6ca2934de Fixed a Few Things 2019-09-20 16:59:31 -04:00
DroppingAnvil
31c3cc538a
Merge pull request #5 from Driftay/1.6.x
Merge
2019-09-19 19:25:36 -05:00
DroppingAnvil
917a5feca8 Allow F grace from console 2019-09-19 13:35:07 -05:00
Driftay
81636c6448 Version Change 2019-09-18 08:01:05 -04:00
Driftay
3ce77fe7e1 Fixed Shop Items Sowwy :) 2019-09-18 07:47:03 -04:00
Driftay
8ec16505c4 Fixed Shop Items Sowwy :) 2019-09-18 07:43:18 -04:00
Driftay
0ac6112437 Added Anti-Creeper Glitch To avoid issues with freecam cegging 2019-09-18 05:22:05 -04:00
Driftay
3d45684c6f Version Change 2019-09-17 19:29:40 -04:00
Driftay
4046ab62e2
Merge pull request #17 from DroppingAnvil/1.6.x
Fixed grace period issues!
2019-09-17 19:29:07 -04:00
Driftay
b70741b0d5 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-17 19:08:47 -04:00
Driftay
bd4e6cb6a8 Shop GUI Cleaned up :D 2019-09-17 19:08:23 -04:00
DroppingAnvil
a3b819cda3 Fixed grace period issues! 2019-09-17 17:28:32 -05:00
Driftay
0971f72a7a
Merge pull request #16 from DroppingAnvil/1.6.x
Fixed Faction Upgrades compatibility with 1.14
2019-09-16 16:23:36 -04:00