Archiviert
1
0
Commit graph

1828 Commits

Autor SHA1 Nachricht Datum
yoyosource
cbc1dd6505 Update some stuff 2022-04-01 10:55:29 +02:00
54700ce85c Merge branch 'master' into improveLogging 2022-04-01 09:42:58 +02:00
eaa1e873d2 Merge branch 'master' into announceSpectate 2022-04-01 09:42:22 +02:00
10b14d2930 Merge branch 'master' into Punishment++ 2022-04-01 09:41:30 +02:00
e31a1b27e4 Merge branch 'master' into CheckList 2022-04-01 09:38:53 +02:00
yoyosource
b70f9898d1 Update CheckCommand 2022-04-01 09:38:44 +02:00
yoyosource
3ba59c8476 Update CheckCommand 2022-04-01 09:38:17 +02:00
21a9dd858a Merge pull request '1.4.' (#321) from april into master
Reviewed-on: SteamWar/BungeeCore#321
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-04-01 09:19:36 +02:00
5874cfc30f Merge branch 'master' into april 2022-04-01 09:08:57 +02:00
7293f741c7 „src/de/steamwar/bungeecore/sql/UserGroup.java“ ändern 2022-03-31 23:50:28 +02:00
Chaoscaot
143cc279d3 🐛 Use it now 2022-03-31 23:02:26 +02:00
Chaoscaot
ef8e5a3a0d Add Arena Merging 2.0 2022-03-31 23:01:20 +02:00
Chaoscaot
a09ee03937 🎨 Using code that is already Present 2022-03-31 22:49:24 +02:00
yoyosource
029285aaba Revert "Add SilentMute Punishment type"
This reverts commit ee4090941e.
2022-03-31 15:46:48 +02:00
yoyosource
b85cb000ac Update messages 2022-03-31 13:57:40 +02:00
yoyosource
ee4090941e Add SilentMute Punishment type 2022-03-31 12:49:55 +02:00
yoyosource
b59189ec48 Add NoFightServer Punishment type 2022-03-31 12:38:22 +02:00
3b358a8666 Fix GDPRQuery
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:34:21 +02:00
385f5a5a36 Fix concurrency
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:32:07 +02:00
8ce1d66817 Add Connection reset
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:27:51 +02:00
5838f6ed69 Improve error logging
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 16:49:40 +02:00
fa79a64d6b Announce event fights on spectate
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 16:49:21 +02:00
82bd4b752d Fix 1.18
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 14:43:54 +02:00
f4512f1db9 Merge pull request '1.18 Bau' (#324) from 1.18bau into master
Reviewed-on: SteamWar/BungeeCore#324
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-30 14:32:12 +02:00
cace45eade Merge pull request 'Remove unrequired commands' (#323) from cleanup into master
Reviewed-on: SteamWar/BungeeCore#323
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-30 14:31:50 +02:00
bc8db04edf 1.18 Bau
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 11:38:29 +02:00
9a17bb87f6 Remove unrequired commands
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 10:39:47 +02:00
d2d8e8af6d Hotfix name issue
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-27 21:08:52 +02:00
7934c37526 Merge pull request 'Fabric Mod Sender Integration. Mod itself is not final' (#307) from fabric_mod_sender into master
Reviewed-on: SteamWar/BungeeCore#307
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-26 10:01:51 +01:00
zOnlyKroks
756b4da84e Fix Errors 2022-03-24 13:59:14 +01:00
zOnlyKroks
98326fcaa0 Fix Errors 2022-03-23 19:24:44 +01:00
zOnlyKroks
a7525dd8a1 Fix Error 2022-03-23 17:04:38 +01:00
zOnlyKroks
1675b1dc9c Fix Error 2022-03-23 17:03:31 +01:00
zOnlyKroks
d500c376fa Messages 2022-03-23 17:02:42 +01:00
626a876f0f Merge branch 'master' into fabric_mod_sender 2022-03-23 16:50:54 +01:00
72a5027de0 Fix precision
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 19:07:47 +01:00
8492bc447a 1.4.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 17:18:20 +01:00
d7ec665dc2 Merge pull request 'Tutorial deletion option' (#320) from tutorialDeletion into master
Reviewed-on: SteamWar/BungeeCore#320
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-22 16:47:55 +01:00
c380bd82d3 Tutorial deletion option
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 11:46:34 +01:00
cca097b7ef Merge pull request 'Add tutorial rate command' (#319) from Tutorial into master
Reviewed-on: SteamWar/BungeeCore#319
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-22 10:56:56 +01:00
yoyosource
577503114d Maybe now? 2022-03-22 10:42:47 +01:00
yoyosource
91f7f5edfc Add tutorial rate command 2022-03-22 10:37:10 +01:00
95ed6925da Merge pull request 'Server start refactoring, Tutorial system' (#317) from tutorial into master
Reviewed-on: SteamWar/BungeeCore#317
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-22 09:28:15 +01:00
85017b1440 Merge branch 'master' into tutorial 2022-03-22 09:23:13 +01:00
364422af2f Tutorial release mechanism
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 09:21:15 +01:00
fe322ce93c Merge pull request 'Fix stuff' (#318) from RankedFix into master
Reviewed-on: SteamWar/BungeeCore#318
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-20 21:56:44 +01:00
a21acb6891 Merge branch 'master' into RankedFix 2022-03-20 21:55:19 +01:00
yoyosource
0881878aa5 Fix stuff 2022-03-20 21:54:33 +01:00
e2fd1754ce Fix some bugs + minor improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-20 19:08:55 +01:00
58dd7486f7 Merge branch 'master' into tutorial 2022-03-20 16:19:53 +01:00