tastybento 22c62c91b4 Merge branch 'master' into develop ... Conflicts: src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java		2021-11-11 10:40:17 -08:00
..
main	Merge branch 'master' into develop	2021-11-11 10:40:17 -08:00
test/java/world/bentobox/bentobox	Release 1.18.0 (#1876)	2021-11-08 21:28:12 -08:00