Lixfel a563c672e3 Merge branch 'personalKitCreatorRework' ... # Conflicts: # FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java		2020-08-22 08:36:12 +02:00
..
src	Merge branch 'personalKitCreatorRework'	2020-08-22 08:36:12 +02:00
pom.xml	Adding 1.15 support	2019-12-27 12:02:27 +01:00