Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität
1.209 Commits 11 Branches 0 Tags 7,5 MiB
f5eaadba4f
Commit graph

1209 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Chaoscaot
f5eaadba4f 🎨 Now? 2022-04-06 18:33:44 +02:00
Chaoscaot
081a1d42ff Merge branch 'master' into arena_merging_2.0 2022-04-06 18:32:05 +02:00
YoyoNow
f097d97554 Merge pull request 'Add new punishments' (#327) from Punishment++ into master 
Reviewed-on: SteamWar/BungeeCore#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
Lixfel
c4be9f98fa Merge pull request 'Update some stuff' (#338) from FabricModStuff into master 
Reviewed-on: SteamWar/BungeeCore#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
Lixfel
1119856693 Merge pull request 'Remove Redundant Message when switching Servers' (#337) from FabricModSender into master 
Reviewed-on: SteamWar/BungeeCore#337
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-04-05 18:39:03 +02:00
zOnlyKroks
e4268efd8b Remove Redundant Message when switching Servers 2022-04-05 18:25:17 +02:00
zOnlyKroks
5a9b79e980 Remove Redundant Message when switching Servers 2022-04-05 18:24:41 +02:00
zOnlyKroks
9ef4062d4a Remove Redundant Message when switching Servers 2022-04-05 18:24:23 +02:00
zOnlyKroks
cb52e0bc38 Remove Redundant Message when switching Servers 2022-04-05 18:12:51 +02:00
yoyosource
d48c81c610 Hotfix stuff 2022-04-03 23:25:08 +02:00
Chaoscaot
cae6427c6a Merge remote-tracking branch 'origin/arena_merging_2.0' into arena_merging_2.0 2022-04-03 20:58:28 +02:00
Chaoscaot
fa8c1c9004 ✅ PR Stuff 2022-04-03 20:58:21 +02:00
YoyoNow
ba117806fb Merge branch 'master' into Punishment++ 2022-04-03 20:57:49 +02:00
yoyosource
d736c07f00 Hotfix stuff 2022-04-03 20:57:30 +02:00
Lixfel
271ce76897 Merge pull request 'Allow sql connection parallelity' (#335) from multiSQLConnections into master 
Reviewed-on: SteamWar/BungeeCore#335
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2022-04-03 08:50:31 +02:00
Lixfel
bc96ab6d96 Reduce message spam through asynchronity 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-02 17:51:14 +02:00
Lixfel
f8c13b627b Merge branch 'master' into multiSQLConnections 2022-04-02 16:51:56 +02:00
yoyosource
186e60e100 Hotfix CheckCommand 2022-04-02 11:15:54 +02:00
Lixfel
ba0c2623f8 Fix checkcommand 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-02 08:47:28 +02:00
Lixfel
c56f221ffc Fix checkcommand 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-02 08:46:16 +02:00
Lixfel
2a5ebe51aa Revert april 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-02 08:12:56 +02:00
Chaoscaot
7a04359ecb Merge branch 'master' into arena_merging_2.0 2022-04-01 18:00:50 +02:00
Lixfel
3755463c7e Fix error message 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-01 17:09:40 +02:00
Lixfel
1da5c45b22 Allow sql connection parallelity 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-01 17:08:08 +02:00
Lixfel
65cdc5b69c Merge pull request 'Update CheckCommand' (#330) from CheckList into master 
Reviewed-on: SteamWar/BungeeCore#330
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-04-01 16:08:27 +02:00
Lixfel
97a3ffb3fa Merge pull request 'Improve error logging' (#326) from improveLogging into master 
Reviewed-on: SteamWar/BungeeCore#326
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2022-04-01 16:01:54 +02:00
Lixfel
02e13f5d9e Merge pull request 'Announce event fights on spectate' (#325) from announceSpectate into master 
Reviewed-on: SteamWar/BungeeCore#325
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2022-04-01 16:01:46 +02:00
Lixfel
af61b59c8b Merge pull request 'Fix ChatListener for discord messages' (#331) from FixDiscord into master 
Reviewed-on: SteamWar/BungeeCore#331
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-04-01 10:58:58 +02:00
Lixfel
03befa42c0 Fix Season 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-04-01 10:58:21 +02:00
yoyosource
a8f9199c0f Fix ChatListener for discord messages 2022-04-01 10:56:50 +02:00
YoyoNow
54700ce85c Merge branch 'master' into improveLogging 2022-04-01 09:42:58 +02:00
YoyoNow
eaa1e873d2 Merge branch 'master' into announceSpectate 2022-04-01 09:42:22 +02:00
YoyoNow
10b14d2930 Merge branch 'master' into Punishment++ 2022-04-01 09:41:30 +02:00
YoyoNow
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
Lixfel
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
YoyoNow
5874cfc30f Merge branch 'master' into april 2022-04-01 09:08:57 +02:00
Lixfel
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
Lixfel
3b358a8666 Fix GDPRQuery 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-30 18:34:21 +02:00
Lixfel
385f5a5a36 Fix concurrency 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-30 18:32:07 +02:00