GeorgH93 7474f006e8 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java # Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Backend/SQL.java # pom.xml		2021-05-17 22:02:17 +02:00
..
dictionaries	Fix formatting	2021-02-23 21:53:14 +01:00
icon_dark.png	Add IntelliJ project icon	2021-04-15 21:12:52 +02:00
icon.png	Add IntelliJ project icon	2021-04-15 21:12:52 +02:00
sqldialects.xml	Add dictionaries for IntelliJ	2020-10-03 13:50:18 +02:00