Lixfel fe915ba85d Merge branch 'master' into items ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java		2023-01-23 16:28:32 +01:00
..
src/de/steamwar/fightsystem/utils	Merge branch 'master' into items	2023-01-23 16:28:32 +01:00
build.gradle	Update dependencies	2022-07-01 22:08:05 +02:00