Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-05 00:23:22 +01:00
Code Issues Projects Releases Wiki Activity
1,098 Commits 11 Branches 5 Tags 81 MiB
104e7916f8
Commit Graph

1098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trent Hensler
32b13befce Add container f perm 2018-02-03 14:08:21 -08:00
Trent Hensler
1b088ccd54 Set warp and f warp f perms 2018-02-03 13:04:21 -08:00
Trent Hensler
ad10222c2d Withdraw f perm 2018-02-03 13:01:25 -08:00
Trent Hensler
925014bd60 f perm for kick 2018-02-03 12:59:05 -08:00
Trent Hensler
baea59a1cd F perm for invite and sethome 2018-02-03 12:56:16 -08:00
Trent Hensler
3eda8750cc Format 2018-02-03 12:50:12 -08:00
Trent Hensler
182022fe5f Check for f perm in building 2018-02-03 12:49:04 -08:00
Trent Hensler
9384b0faa6 Check for null 2018-02-03 12:38:36 -08:00
Trent Hensler
249770d2cd Add Permissable interface for f perm compatibility. 
Allows Roles and Relations to be permissable, so we can set f perms for both of those in the same map.
 2018-02-03 12:33:28 -08:00
Trent Hensler
9e8205b5e2 Work with PlayerVaultsX 2018-01-31 17:03:55 -08:00
Trent Hensler
8484f92030 Use Lang for roles 2018-01-31 16:49:19 -08:00
Trent Hensler
9f08e6580b Fix some other f perm checks 2018-01-20 16:53:09 -08:00
Trent Hensler
246b93bda9 Allow null instead of throwing exception. Fixes #1008 2018-01-20 16:50:38 -08:00
GrizzsChannel
2f9939ebd4
Add resource link in config.yml 2018-01-14 14:44:36 -05:00
Trent Hensler
c465d0c9d4 Add suppport for MVdW placeholder API 2018-01-06 16:56:43 -08:00
Trent Hensler
af9fc526d7 Allow the use of placeholders in scoreboards 2018-01-06 14:04:42 -08:00
Trent Hensler
fb0c77efc0 Add truce to tag util 2018-01-05 00:25:50 -08:00
Trent Hensler
79d4a885f8 Allow bulk setting of permissions 2018-01-04 23:16:24 -08:00
Trent Hensler
39f1bd7404 Fix permissions 2018-01-04 23:01:52 -08:00
Trent Hensler
4110fb2ef4 Fix up default role and promote commands 2018-01-04 18:10:49 -08:00
Trent Hensler
5c2abb34de Format. Haven't done this in awhile. Just sneak it in. 2018-01-04 17:40:27 -08:00
Trent Hensler
f019c4f833 Don't let them set default to admin 2018-01-04 17:38:29 -08:00
Trent Hensler
f6bd156f89 Add command to set default rank. Only used by admins. 
/f defaultrole <role>
 2018-01-04 17:37:23 -08:00
Trent Hensler
4db185e3ee Role updates. 
* Adds recruit role below the normal role.
* Adds /f promote and demote. Access to this command defaults to moderator if not set in /f perm
* Default role is still set to recruite. Will have to /f demote to set players to that rank.
 2018-01-04 17:17:30 -08:00
Trent Hensler
4852ac6be4 Add issue template 2018-01-04 15:48:38 -08:00
Trent Hensler
b84535f3ee Update log message 2018-01-04 15:45:33 -08:00
Trent Hensler
896bf489b7 Add method to deserialize the custom map 2018-01-04 15:44:39 -08:00
Trent Hensler
c367a9cb09 Make faction announcement borders configurable 2018-01-04 14:41:14 -08:00
Trent Hensler
7a4ddc6855 Actually allow setting of truce 2018-01-04 01:47:36 -08:00
Trent Hensler
687bac31db Initial f perm. 
TODO:
* Add GUI for viewing and changing permissions.
* Currently no way to view access for all perms.
* Test this because I didn't.
* Finish implementation of all permissions, add more.
 2018-01-04 01:36:51 -08:00
Trent Hensler
8fee985e99 Actually set factionless prefix in chat. Fixes #979 2018-01-04 00:32:25 -08:00
Trent Hensler
c3e1e6547a Consistent naming 2018-01-04 00:07:51 -08:00
Trent Hensler
e343ac69fa Add lots of placeholders 2018-01-04 00:06:30 -08:00
Trent Hensler
ff8ae7be3b Check for sender in f money ff. Fixes #993 2018-01-03 23:32:19 -08:00
Trent Hensler
769722ddb4 Add decimal format for showing money to TL file 2018-01-02 01:37:12 -08:00
Trent Hensler
fe7002f674 Initial placeholderAPI support. 
Give me ideas on what else to add and I'll add it.
 2017-12-30 18:44:42 -08:00
Trent Hensler
24c7107163 Updated fanciful version to match what's in the maven repo. IT COMPILES NOW WOOOO 2017-12-19 11:09:44 -08:00
Trent Hensler
3b644cd6c3 Java 7 and make intellij happy 2017-12-19 02:18:13 -08:00
Trent Hensler
ce132ed033 Add password protected warps 2017-12-19 02:10:52 -08:00
Trent Hensler
18749dcb06 Update dependencies to latest 1.12.2 versions 2017-12-19 01:14:57 -08:00
Trent Hensler
8d2a3227f2 update readme 2017-12-19 00:49:21 -08:00
Trent Hensler
dddb7b7026 Add discord to readme 2017-12-19 00:40:17 -08:00
Trent Hensler
9ed7603e38 Fix showing the faction's balance in f show instead of the player who executed it. 2017-12-19 00:37:17 -08:00
Trent Hensler
3bce7ae619
Merge pull request #761 from Techcable/fix/null-gson 
Make P.gson final
 2017-12-19 00:20:37 -08:00
Trent Hensler
c30137c34d
Merge pull request #904 from markhughes/1.6.x 
Allow using FLocation object in canClaimForFactionAtLocation
 2017-12-19 00:19:08 -08:00
Trent Hensler
190908b181
Merge pull request #921 from ExpDev07/1.6.x 
Removed duplicate/unnececary code in DiscUtil.
 2017-12-19 00:18:15 -08:00
Trent Hensler
f73825af92
Merge pull request #949 from emanh1/patch-1 
Fix typo
 2017-12-19 00:17:14 -08:00
Trent Hensler
0b9f2dd7dd
Merge pull request #963 from XXLuigiMario/allow-unclaimall-world 
Allow unclaiming all safezones and warzones in a specific world
 2017-12-19 00:16:57 -08:00
Trent Hensler
3a8828d4e6
Merge pull request #964 from XXLuigiMario/allow-wilderness 
Allow admins to claim for wilderness
 2017-12-19 00:14:19 -08:00
Joel Puig Rubio
08c0995741 Allow unclaiming all safezones and warzones in a specific world 2017-09-04 23:17:12 +02:00