EpicKnarvik97 6e2832d616 Merge branch 'custom-formatting' into quests-5
# Conflicts:
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/NPCQuestInfo.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestAreaHandler.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRequirementsInfoGenerator.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestRewardsInfoGenerator.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestStagesInfoGenerator.java
#	src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestsHandler.java
#	src/main/java/net/knarcraft/dynmapcitizens/util/QuestsHelper.java
2024-01-02 22:04:43 +01:00
..