Merge branch 'master' into patch-1

assets/addon_browser/addons.conf

@@ -43,7 +43,7 @@
     name: "BlueMap-Quests"
     description: "This is a set-and-forget bridge plugin for displaying Quests objectives in a single layer of your BlueMap maps! The location of all Quests-linked Citizens 2 and ZNPCsPlus NPCs will be displayed with configurable markers. It supports both cuboid and polygonal Quests regions using either WorldGuard 6 or 7, in 3D."
     author: "Browsit"
-    apiVersion: "1"
+    apiVersion: "2"
     platforms: ["spigot", "paper"]
     links: {
       "spigotmc": "https://www.spigotmc.org/resources/bluemap-quests.96806/"
@@ -666,6 +666,16 @@
       "hangar": "https://hangar.papermc.io/WasabiThumbs/XClaim"
     }
   }
+  {
+    name: "BlueMap Filtered Entities"
+    description: "Allows you to track entities on your map, with lots of filtering options!"
+    author: "TechnicJelle"
+    apiVersion: "2"
+    platforms: ["paper"]
+    links: {
+      "github": "https://github.com/TechnicJelle/BlueMapFilteredEntities"
+    }
+  }
   {
     name: "Bluemap Folia Regions"
     description: "Show visualization for folia thread regions and info each region"

wiki/FAQ.md

@@ -50,7 +50,7 @@ First, press the `Update Map` button in BlueMap's menu. This updates all tiles f
 your browser has not cached anything weird.  
 You can also try to clear your browser-cache completely. *(`F12` -> Network -> [x] Disable cache -> `F5`)*
 
-If that doesn't help you might have changed some bluemap-settings that require a complete re-render of the map:
+If that doesn't help, you might have changed some bluemap-settings that require a complete re-render of the map:
 Just use `/bluemap purge <map-id>` to delete and re-render the entire map. Then clear your browser-cache again,
 and it should be fixed :)
 
@@ -72,26 +72,34 @@ and it should be fixed :)
   Then, chunks that have not been visited by a player **might** not have their light-data generated yet. 
   BlueMap needs the light data and ignores chunks that don't have it.
   So it will only render chunks that have been loaded by a player at least once.  
-  You can try to use a plugin like [LightCleaner](https://www.spigotmc.org/resources/light-cleaner.42469/) to fix chunks 
-  that don't have proper lightdata in your world. 
+  Here is a dedicated guide to fixing lighting issues in your world:
+  [https://bluemap.bluecolored.de/community/FixLighting.html](https://bluemap.bluecolored.de/community/FixLighting.html)
 
 If nothing else works, you can try to set `ignore-missing-light-data: true` in your 
 map-config. *(And then use `/bluemap purge <map>` to update your map)*  
 This will ignore potentially missing light data while rendering, with some drawbacks:
 - Cave-rendering will always be enabled in those chunks, because it is using the sun-light data to detect the "caves"
 - Everything in those chunks will be rendered fully lit (sun-light value of 15, looks similar to having night-vision)
 
-### Q: The map (web-app) is really slow (lagging)
+### Q: The map (web-app) has low FPS (lagging)
 Make sure you have **hardware-acceleration enabled** on your browser! 
 Use your favorite search engine to learn how to do this :)
 
 If you have a laptop with two GPU-units, make sure that the high-performance GPU is used for your browser. 
 E.g. Intel/Nvidia sometimes like to use the low-performance GPU for your browser by default, to save energy.
 You can change this in the Nvidia-Control-Panel.
 
+### Q. Chunks (tiles) are loading in really slowly
+This is almost entirely dependent on the network speed between your server and your own computer.
+
+You can debug this by using your browser's built-in developer tools (Network tab) to check how long each request is taking, and where the bottleneck is.
+
+If you're certain that speed is adequate, make sure you're on the latest version of BlueMap.
+
 ### Q: How can I add or remove maps?
 To add a map, copy a map-config from the `maps`-folder next to the other config-files, open it and tweak the settings 
-for your new map. To remove a map, just delete the config-file.
+for your new map. To remove a map, just delete the config-file.  
+Read [this guide](https://bluemap.bluecolored.de/wiki/getting-started/Configuration.html#configuring-your-maps-adding--removing-maps) for more info.
 
 ### Q: How can I add SSL (HTTPS) to my map?
 BlueMaps integrated webserver does not (and will not) support SSL on its own, 

wiki/getting-started/ServerNetworks.md

@@ -28,12 +28,43 @@ same folder from them all (e.g. mounting a shared drive/folder). Either of them
 - configure either the `storages/sql.conf` on all server to the same sql-server, or the `storages/file.conf` on 
   all server to the same (shared) folder
 - configure all maps on all servers to use that storage
-- choose one of those servers to be the server that will host the web-app. On this server: 
-  create an extra map-config like [here: "Hosting static maps"]({{site.baseurl}}/wiki/getting-started/Configuration#hosting-static-maps) for each 
-  map that is on the **other** servers
+- choose one of those servers to be the server that will host the web-app.  
+  **On this server:** create an extra map-config like [here: "Hosting static maps"]({{site.baseurl}}/wiki/getting-started/Configuration#hosting-static-maps) for each 
+  map that is on the **other** servers. *(example below)*
 
 Now the maps from the other servers should be visible on the web-app of this one server.
 
+> #### Example
+> Assuming your servers/maps look like this:
+> ```
+> server1/...
+>   s1_map1.conf
+>   s1_map2.conf
+> 
+> server2/...
+>   s2_map1.conf
+>   s2_map2.conf
+> ```
+> the maps are all stored on the same database ...
+> now if you want to see the maps from `server2` also on the webapp from `server1`, then you need to add these files:
+> ```
+> server1/...
+>   s1_map1.conf
+>   s1_map2.conf
+>   s2_map1.conf <<-
+>   s2_map2.conf <<-
+> 
+> server2/...
+>   s2_map1.conf
+>   s2_map2.conf
+> ``` 
+> to your `server1` and the content of those two extra files should look like this:
+> ```hocon
+> storage: "sql"
+> ```
+> nothing else.
+
+### Live updates
 If you want to have live updating markers and player-markers on all maps, turn on the `write-markers-interval` and the 
 `write-players-interval` in each `plugin.conf` on the other servers.  
 **Or** if you plan on hosting the entire map with an external-webserver you can reverse-proxy each maps live-interface to the correct