Lixfel 022264b1f5 Merge branch 'master' into commonDB ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java		2022-10-29 12:26:54 +02:00
..
src/de/steamwar/fightsystem/utils	Merge branch 'master' into commonDB	2022-10-29 12:26:54 +02:00
build.gradle	Fix build.gradle	2022-07-03 11:55:31 +02:00