1263 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	4665d42fc7	Fix small issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-21 13:04:44 +02:00
Lixfel	dea6595eb8	Merge branch 'master' into chatRefactor ... # Conflicts: # src/de/steamwar/bungeecore/commands/ArenaCommand.java	2022-04-20 17:38:51 +02:00
yoyosource	d5768be91a	Fix my own stupidity	2022-04-20 15:09:55 +02:00
YoyoNow	4636fb249e	Merge pull request 'Check not Checking' (#348) from is_checking into master ... Reviewed-on: #348 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-20 15:00:22 +02:00
Chaoscaot	fe108bcbc6	🐛 Check not Checking	2022-04-20 14:59:18 +02:00
Chaoscaot	0936acacb7	🐛 Check not Checking	2022-04-20 14:57:11 +02:00
Lixfel	400574e932	Fix ci ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-19 20:35:55 +02:00
Lixfel	c1048cfdbd	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-19 20:32:02 +02:00
Lixfel	7c98e43857	Merge pull request 'Add gradle to BungeeCore' (#347) from Gradle into master ... Reviewed-on: #347	2022-04-19 20:28:56 +02:00
YoyoNow	714f6a831e	„steamwarci.yml“ ändern	2022-04-18 21:40:27 +02:00
yoyosource	55b82947db	Add gradle to BungeeCore	2022-04-16 20:28:55 +02:00
Lixfel	54932f6ebc	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 22:24:36 +02:00
Lixfel	0bf5a65850	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 20:44:09 +02:00
Lixfel	336d4f6a3c	Fix NPE ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:55:51 +02:00
Lixfel	9dcb35a91e	Fix pipeline null errors ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:35:47 +02:00
Lixfel	1647713647	Merge pull request 'Update /bc to allow commands' (#343) from BCCommands into master ... Reviewed-on: #343 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 11:25:01 +02:00
YoyoNow	35bac7bbf7	Merge branch 'master' into BCCommands	2022-04-11 10:28:07 +02:00
yoyosource	b5bf48ce2a	Update /bc to allow commands	2022-04-11 10:27:49 +02:00
Lixfel	e3b9329de0	Merge pull request 'Ranked' (#333) from Ranked into master ... Reviewed-on: #333 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:23:12 +02:00
Lixfel	4a0c50a08d	Merge pull request 'Add Replay WIPISCH' (#334) from Replay into master ... Reviewed-on: #334 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:08:03 +02:00
Lixfel	c977ba86b4	Merge pull request 'Fix Fabric stuff -> Storage' (#342) from FixFabricStuff into master ... Reviewed-on: #342 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:04:06 +02:00
yoyosource	e723224282	Fix Fabric stuff	2022-04-10 20:14:33 +02:00
Lixfel	f7892d21d1	Merge pull request 'Fixing Punishment Errors' (#341) from again! into master ... Reviewed-on: #341 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-10 19:25:11 +02:00
Chaoscaot	190828692c	🐛 Fixing Punishment Errors	2022-04-10 19:20:16 +02:00
yoyosource	fa5d4ad983	Update some stuff	2022-04-09 22:08:17 +02:00
yoyosource	7a48584cbb	Update some stuff	2022-04-09 21:36:18 +02:00
yoyosource	4bdead92b5	Update some stuff	2022-04-09 21:30:52 +02:00
Lixfel	d67c9bac66	Merge pull request 'Show eventfights as finished immediatly' (#340) from instantEventend into master ... Reviewed-on: #340 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-09 21:06:56 +02:00
Lixfel	89f525adb4	Merge pull request 'Update some stuff' (#339) from FabricModStuff into master ... Reviewed-on: #339 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:58:27 +02:00
Lixfel	dbe2349f4f	Merge pull request 'Button Spliting' (#336) from buttons into master ... Reviewed-on: #336 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:57:46 +02:00
Lixfel	eb8a8a2e07	Show eventfights as finished immediatly ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-09 16:58:51 +02:00
Lixfel	1bc5011d4f	Prevent ProcessingSpam ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:21:45 +02:00
Lixfel	4f6bf71f82	Fix tp ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:12:00 +02:00
yoyosource	c367f11120	Update some stuff	2022-04-06 20:19:38 +02:00
yoyosource	d585a6fa09	Merge remote-tracking branch 'origin/Ranked' into Ranked	2022-04-06 17:01:37 +02:00
yoyosource	169d26852c	Update some stuff	2022-04-06 17:01:33 +02:00
YoyoNow	519e732310	Merge branch 'master' into Ranked	2022-04-06 16:59:21 +02:00
yoyosource	9a0b3a41b9	Update some stuff	2022-04-06 16:59:11 +02:00
YoyoNow	d0e4690b8d	Merge branch 'master' into FabricModStuff	2022-04-05 19:57:10 +02:00
yoyosource	4c9ac4a984	Revert some stuff	2022-04-05 19:50:41 +02:00
yoyosource	6b8d46d75a	Revert some stuff	2022-04-05 19:47:48 +02:00
yoyosource	7b5ce77e93	Revert some stuff	2022-04-05 19:47:08 +02:00
yoyosource	3af6f43ccd	Revert some stuff	2022-04-05 19:40:50 +02:00
yoyosource	ac8bcdd987	Update stuff	2022-04-05 19:40:08 +02:00
YoyoNow	f097d97554	Merge pull request 'Add new punishments' (#327) from Punishment++ into master ... Reviewed-on: #327 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-05 19:30:17 +02:00
yoyosource	c8c4ee0039	Update some stuff	2022-04-05 19:25:42 +02:00
YoyoNow	ed17adf832	Merge branch 'master' into FabricModStuff	2022-04-05 19:24:24 +02:00
yoyosource	c05a2e4ae6	Update some stuff	2022-04-05 19:24:04 +02:00
Lixfel	c4be9f98fa	Merge pull request 'Update some stuff' (#338) from FabricModStuff into master ... Reviewed-on: #338 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-05 19:05:40 +02:00
yoyosource	a8507a1920	Update some stuff	2022-04-05 19:02:25 +02:00