1577 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
yoyosource	1dedebb3aa	Fix BungeeCore.properties	2022-05-02 13:58:45 +02:00
Lixfel	0a5c89b8b7	Merge pull request 'Arena Merging 2.0' (#329) from arena_merging_2.0 into master ... Reviewed-on: #329 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:45:03 +02:00
Lixfel	cd15787ae1	Merge pull request 'Add some new punishments after talking with mods' (#352) from Punishment++ into master ... Reviewed-on: #352 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:20:01 +02:00
yoyosource	d1e90d8a6c	Speed BrandListener up	2022-04-27 10:08:54 +02:00
yoyosource	d4a50d3974	Speed BrandListener up	2022-04-27 10:06:44 +02:00
yoyosource	07da2c56a3	Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/de/steamwar/bungeecore/listeners/BrandListener.java	2022-04-27 09:59:21 +02:00
yoyosource	6e158b38b8	Speed BrandListener up	2022-04-27 09:58:15 +02:00
Lixfel	d6c82e923f	Speed BrandListener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-26 19:58:41 +02:00
yoyosource	93dcb0d202	Revert "Update stuff" ... This reverts commit f61fcde5c9.	2022-04-26 19:25:32 +02:00
yoyosource	aaf389ea4c	Merge remote-tracking branch 'origin/Punishment++' into Punishment++	2022-04-26 18:18:34 +02:00
yoyosource	f61fcde5c9	Update stuff	2022-04-26 18:18:27 +02:00
YoyoNow	d0bbdd903b	Merge branch 'master' into Punishment++	2022-04-26 15:26:00 +02:00
yoyosource	9a28173496	Update stuff	2022-04-26 15:21:44 +02:00
yoyosource	cc86aa16a0	Update stuff	2022-04-26 15:21:09 +02:00
Lixfel	34757566d3	Merge pull request 'Update to Https' (#351) from submodule_patch into master ... Reviewed-on: #351 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-25 21:38:38 +02:00
yoyosource	2ef6901f8e	Update WhoisCommand ... Add mutlie note punishments	2022-04-25 11:09:08 +02:00
Lixfel	50ac0ddc55	Speed Brandlistener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 17:54:06 +02:00
yoyosource	f52444f6e5	Add some new punishments after talking with mods	2022-04-24 15:02:03 +02:00
Lixfel	f30b779347	Fix BrandListener performance ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 08:29:21 +02:00
Chaoscaot	95b8fa1b29	🐛 Update to Https	2022-04-23 12:29:01 +02:00
Chaoscaot	7191531045	Merge remote-tracking branch 'origin/master' into arena_merging_2.0 ... # Conflicts: # src/de/steamwar/bungeecore/commands/FightCommand.java	2022-04-23 12:19:41 +02:00
Lixfel	f2df750894	Merge pull request 'Teamserver' (#344) from Teamserver into master ... Reviewed-on: #344 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-23 12:17:04 +02:00
yoyosource	cd5bc889a6	Fix pr stuff	2022-04-23 11:01:13 +02:00
yoyosource	39471cf468	Merge remote-tracking branch 'origin/Teamserver' into Teamserver	2022-04-23 10:54:45 +02:00
yoyosource	383cd6097c	Fix pr stuff	2022-04-23 10:54:38 +02:00
YoyoNow	c976e6f7ce	Merge branch 'master' into Teamserver	2022-04-22 21:37:02 +02:00
yoyosource	b744f5286f	Update some stuff	2022-04-22 21:36:55 +02:00
Lixfel	9ac5a8ef8a	Fix sends ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 18:47:21 +02:00
Lixfel	015a3cfa52	Fix broeadcasts ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:26:28 +02:00
Lixfel	329d80f037	Fix Arenaserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:10:32 +02:00
Lixfel	4d53e8ced9	Fix chatcolor, arenacommand ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 16:14:35 +02:00
yoyosource	b8a3512643	Add SubserverProtocolFixer	2022-04-22 15:55:34 +02:00
Lixfel	f1f334a750	Fix msg, tp etc. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:44:42 +02:00
yoyosource	75a6114447	Merge branch 'master' into Teamserver ... # Conflicts: # src/de/steamwar/bungeecore/listeners/ChatListener.java	2022-04-22 15:23:39 +02:00
Lixfel	6a7b0ff9c1	Merge pull request 'ChatRefactor' (#349) from chatRefactor into master ... Reviewed-on: #349 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-22 15:19:15 +02:00
Lixfel	f8232fcb48	Fix chat no receiver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:16:33 +02:00
Lixfel	fb900585d1	Merge pull request 'Initial CommonCore' (#350) from commoncore into master ... Reviewed-on: #350 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-22 15:14:26 +02:00
Lixfel	5de2bbd876	Test build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 12:40:12 +02:00
Lixfel	c324451871	Test build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 12:38:07 +02:00
Lixfel	b1113eed6c	Test build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 12:35:44 +02:00
Lixfel	62279b7baa	Test build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 10:40:42 +02:00
Lixfel	02fd7eb965	Fix discord targets ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 10:36:28 +02:00
Lixfel	4665d42fc7	Fix small issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-21 13:04:44 +02:00
yoyosource	29d0e056ab	Make git submodule buildable	2022-04-20 17:57:27 +02:00
yoyosource	8122b68540	Merge branch 'master' into commoncore	2022-04-20 17:56:52 +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