Lixfel 4fc9a6cd8e Merge branch 'master' into multiling ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java		2021-10-10 14:40:50 +02:00
..
src	Merge branch 'master' into multiling	2021-10-10 14:40:50 +02:00
pom.xml	New VersionDependent system	2021-08-31 10:42:42 +02:00