Merge branch 'master' of github.com:Rsl1122/Plan-PlayerAnalytics

Plan/src/main/resources/config.yml

@@ -80,11 +80,6 @@ Customization:
         Banned: '951800'
         Inactive: 'A9A9A9'
         JoinedOnce: '808080'
-  DemographicsTriggers:
-    Trigger: "i'm, am, im, bin"
-    Female: 'female, girl, gurl, woman, gal, mrs, she, miss, feminin, weiblich, mädchen, frau'
-    Male: 'male, boy, man, boe, sir, mr, guy, he, männlich, maskulin, junge, mann'
-    IgnoreWhen: 'sure, think, with, are, you, din'
   Plugins:
     Factions:
       HideFactions:

documentation/CommandsAndPermissions.md

@@ -4,7 +4,8 @@
 - [Plugin.yml](/Plan/src/main/resources/plugin.yml)
 - [Permissions Enum](/Plan/src/main/java/com/djrapitops/plan/Permissions.java)
 
-This page is an in depth documentation of all permissions & commands.
+This page is an in depth documentation of all permissions & commands.  
+Page version: **3.5.2**
 
 # Commands
 
@@ -21,6 +22,8 @@ Command | Permission | Default | Description
 /plan reload | plan.reload | OP | Reloads the plugin. (All active play-sessions will be ended & started.)
 /plan info | plan.info | OP | View version, update availability & active database
 /plan manage | plan.manage | OP | Manage the database of the plugin.
+/plan register | none / plan.webmanage | true | Register the sender / another user (requires the perm)  
+/plan webuser | plan.webmanage | OP | Manage web users.
 none | plan.ignore.commanduse | false | Commands issued by players with this permission will be ignored.
   
 ## Permission Groups:
@@ -42,6 +45,7 @@ none | plan.ignore.commanduse | false | Commands issued by players with this per
 - plan.inspect.other
 - plan.qinspect.other
 - plan.reload
+- plan.webmanage
 
 ### plan.*
 - plan.staff

documentation/Configuration.md

@@ -4,7 +4,8 @@
 - [Default Config](https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/config.yml)
 - [Settings Enum](https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/java/com/djrapitops/plan/Settings.java)
 
-This page is an in depth documentation on what each Setting does in the config.
+This page is an in depth documentation on what each Setting does in the config.  
+Page Version: 3.5.2
 
 # Settings
 
@@ -15,7 +16,6 @@ Config.Point | Version introduced | Type | Default | Description
 Debug | 3.0.0 | boolean | false | Enables debug messages on console.
 Locale | 2.5.0 | String | default | Two letter Locale combination. Can be set to one of the Available locales. If a faulty combination is used, default locale will be used. [Available locales](https://github.com/Rsl1122/Plan-PlayerAnalytics/tree/master/Plan/localization)
 UseTextUI | 3.0.0 | boolean | false | Redirects */plan inspect* and */plan analyze* commands to display same messages as */plan qinspect* & */plan qanalyze*
-Data.GatherLocations | 2.2.0 | boolean | true | Enables [PlanPlayerMoveEventListener](https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerMoveListener.java)
 Data.ChatListener | 3.4.2 | boolean | true | Enables Chat listener
 Data.GatherKillData | 3.4.2 | boolean | true | Enables Death listener
 Data.GamemodeChangeListener | 3.4.2 | boolean | true | Enables Gamemode Change listener
@@ -55,7 +55,6 @@ ShowAlternativeServerIP | 2.0.0 | boolean | false | Enables the use of the link
 AlternativeIP | 2.0.0 | String | `your.ip.here:%port%` | Address to use as link in inspect and analyze commands if setting above is enabled. %port% will be replaced with the Port automatically. If you have port-forwarded an alternate address to the webserver port, %port% is not required.
 LinkProtocol | 3.4.3 | String | http | Changes the protocol in links given by the commands. SHOULD NOT BE CHANGED IF NOT USING EXTERNAL WEBSERVER.
 Security.DisplayIPsAndUUIDs | 2.5.0 | boolean | true | Toggles visibility of UUIDs and IPs on player Inspect page.
-Security.AddressSecurityCode | 2.5.0 | String | bAkEd | This string is added to the url so that outsiders can not access the `/server` and `/player/<playername>` pages just by knowing your IP and that your server uses Plan. Example: bAkEd -> `localhost:8804/bAkEd/server`
 
 ## Customization settings
 
@@ -67,8 +66,6 @@ Formats.TimeAmount | 3.3.0 | String | '%days%d ' | Changes the format used when
 Formats.DecimalPoints | 3.3.0 | String | #.## | Changes how many decimals are displayed after doubles. (For 3 use #.### etc.)
 Colors.Commands | 2.1.0 | String |  | Color codes used with the */plan* commands. 
 Colors.HTML | 2.1.0 | String |  | These HTML Color codes are used when generating the Html pages. Use without the # (hashtag)
-DemographicsTriggers.Trigger | 2.1.0 | String |  | An attempt to gather info is only made if message contains one of these words.
-DemographicsTriggers.IgnoreWhen | 2.1.0 | String |  | If an attempt is made and message contains one of these words, the info is disregarded.
 Plugins.Enabled | 3.3.0 | boolean | true | Settings for enabling hooks to plugins (For Plugins tab)
 Plugins.Factions.HideFactions | 3.1.0 | String list | - ExampleFaction | Add a list of Faction names you don't want to show up on the Analysis page.
 Plugins.Towny.HideTowns | 3.1.0 | String list | - ExampleTown | Add a list of Town names you don't want to show up on the Analysis page.