Merge branch 'main' into develop

Browse Source

# Conflicts:
#	api/src/main/java/me/blackvein/quests/dependencies/IDependencies.java
#	core/src/main/java/me/blackvein/quests/Quests.java
#	core/src/main/java/me/pikamug/quests/dependencies/BukkitDependencies.java

...

This commit is contained in:

PikaMug 2023-09-25 00:54:43 -04:00

parent abcce96483 e0970db2a4

commit ad9ba0e762

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available