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

1170 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
yoyosource
000c58f261 Merge remote-tracking branch 'origin/Ranked' into Ranked 2022-04-01 12:23:14 +02:00
yoyosource
a26e3994a3 Fix FightEndsHandler 2022-04-01 12:23:08 +02:00
YoyoNow
d9cd3467a4 Merge branch 'master' into Ranked 2022-04-01 12:21:16 +02:00
yoyosource
895ac9843b Update FightEndsHandler 2022-04-01 12:19:56 +02:00
yoyosource
bbd2b1950b Update FightEndsHandler 2022-04-01 12:05:41 +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
yoyosource
cbc1dd6505 Update some stuff 2022-04-01 10:55:29 +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
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
Lixfel
82bd4b752d Fix 1.18 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-30 14:43:54 +02:00
Lixfel
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
Lixfel
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
Lixfel
bc8db04edf 1.18 Bau 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-30 11:38:29 +02:00
Lixfel
9a17bb87f6 Remove unrequired commands 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-30 10:39:47 +02:00
Lixfel
d2d8e8af6d Hotfix name issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-27 21:08:52 +02:00
Lixfel
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
zOnlyKroks
626a876f0f Merge branch 'master' into fabric_mod_sender 2022-03-23 16:50:54 +01:00
Lixfel
72a5027de0 Fix precision 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-22 19:07:47 +01:00
Lixfel
8492bc447a 1.4. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-22 17:18:20 +01:00
Lixfel
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
Lixfel
c380bd82d3 Tutorial deletion option 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-22 11:46:34 +01:00
Lixfel
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
Lixfel
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
Lixfel
85017b1440 Merge branch 'master' into tutorial 2022-03-22 09:23:13 +01:00
Lixfel
364422af2f Tutorial release mechanism 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-22 09:21:15 +01:00
Lixfel
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
YoyoNow
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
Lixfel
e2fd1754ce Fix some bugs + minor improvements 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-20 19:08:55 +01:00
Lixfel
58dd7486f7 Merge branch 'master' into tutorial 2022-03-20 16:19:53 +01:00
Lixfel
908e54fedd Server start refactoring, tutorial system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-19 16:10:09 +01:00
Lixfel
5d7764fc15 Merge pull request 'Fix Ranked calculation' (#316) from RankedFix into master 
Reviewed-on: SteamWar/BungeeCore#316
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-03-17 12:57:12 +01:00
yoyosource
19de4fd1d8 Fix Ranked calculation 2022-03-16 20:02:16 +01:00
Lixfel
87dbca480e Tutorial first steps 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-16 18:38:45 +01:00
Lixfel
6489ae51cf Merge pull request 'Fix Message again for the final time!' (#313) from ResourceBundles2.0 into master 
Reviewed-on: SteamWar/BungeeCore#313
 2022-03-16 16:38:45 +01:00
Lixfel
c08bfe75b9 Fix ConcurrentModificationException 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-16 16:30:38 +01:00
Lixfel
f04ccc6ea7 Fix emblems 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-16 16:25:43 +01:00
Lixfel
c0301a8014 Code simplification 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-03-16 16:24:19 +01:00