Lixfel dfa0e846e9 Merge branch '1_14-support' ... # Conflicts: # FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java		2019-12-09 20:52:18 +01:00
..
src/de/steamwar/fightsystem	Merge branch '1_14-support'	2019-12-09 20:52:18 +01:00
pom.xml	Refactoring for Multiversion-API	2019-11-16 08:37:33 +01:00