GeorgH93 fc9151b99f Merge branch 'master' into dev ... # Conflicts: # pom.xml # src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java # src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java # src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Files.java		2020-02-05 03:11:32 +01:00
..
lang	Remove unused messages from german language file	2020-01-14 01:47:14 +01:00
config.yml	Merge branch 'master' into dev	2020-02-05 03:11:32 +01:00
plugin.yml	Do not allow more than 6 rows on MC 1.14 and up	2020-01-25 23:33:52 +01:00