Merge branch '1_14-support' of steamwar.de:SteamWar/FightSystem into 1_14-support
# Conflicts: # FightSystem_14/pom.xml # FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
Dieser Commit ist enthalten in:
Commit
5b9070fc4d