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
..
commands	Merge branch 'develop' into master	2023-01-05 21:40:14 +02:00
config	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
database/object	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
events	Add proper Bukkit API event usage.	2020-12-27 21:12:38 +02:00
handlers	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
listeners	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
managers	Fixes an issue when error message about file loading was not logged.	2022-07-26 01:02:09 +03:00
panel	Rewrite action display logic. (#308)	2022-11-21 08:01:13 +02:00
tasks	Add extra parameters for completion commands.	2022-11-21 08:15:38 +02:00
utils	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
web	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
ChallengesAddon.java	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00
ChallengesPladdon.java	Prepare 1.0 Release (#287)	2022-05-06 19:51:54 +03:00