BONNe 7f58af7588 Merge branch 'develop' into master ... # Conflicts: # pom.xml # src/main/java/world/bentobox/challenges/commands/admin/ChallengesGlobalAdminCommand.java # src/main/java/world/bentobox/challenges/managers/ChallengesImportManager.java # src/main/java/world/bentobox/challenges/managers/ChallengesManager.java # src/main/java/world/bentobox/challenges/panel/CommonPanel.java # src/main/java/world/bentobox/challenges/panel/user/ChallengesPanel.java # src/main/java/world/bentobox/challenges/tasks/TryToComplete.java # src/main/resources/locales/en-US.yml # src/main/resources/locales/pl.yml # src/main/resources/locales/zh-CN.yml # src/main/resources/template.yml		2023-01-05 21:40:14 +02:00
..
java/world/bentobox/challenges	Merge branch 'develop' into master	2023-01-05 21:40:14 +02:00
resources	Adds potion names to the default locale.	2023-01-05 21:32:03 +02:00