Lixfel 4a9a678a63 Merge branch 'master' into schemType ... # Conflicts: # SpigotCore_Main/src/de/steamwar/sql/Schematic.java		2020-02-22 11:21:07 +01:00
..
src	Merge branch 'master' into schemType	2020-02-22 11:21:07 +01:00
pom.xml	Adding 1.9 and 1.10 support	2019-12-13 15:53:40 +01:00