Lixfel cb4cb1d6fe Merge branch 'master' into items ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java		2023-04-11 11:27:21 +02:00
..
src/de/steamwar/fightsystem/utils	Merge branch 'master' into items	2023-04-11 11:27:21 +02:00
build.gradle	Update dependencies	2022-07-01 22:08:05 +02:00