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

1633 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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: SteamWar/BungeeCore#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
24d2c8f0d0 Initial CommonCore 2022-04-20 11:32:30 +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: SteamWar/BungeeCore#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
Chaoscaot
0d6d342740 🐛 Fixes 2022-04-16 16:24:38 +02:00
Chaoscaot
c0f8f9274a Merge branch 'master' into arena_merging_2.0 2022-04-16 16:13:18 +02:00
Chaoscaot
d854621752 🐛 Fixes 2022-04-16 16:13:10 +02:00
yoyosource
4a9ba9554a Fix Teamserver integration 2022-04-16 09:54:40 +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
yoyosource
3e315ece3b Merge remote-tracking branch 'origin/Teamserver' into Teamserver 2022-04-13 22:31:13 +02:00
yoyosource
2d3466aecb Fix TeamCommand tablist 2022-04-13 22:30:53 +02:00
yoyosource
ea194d0f31 Fix TeamCommand 2022-04-13 22:21:08 +02:00
YoyoNow
6abf85718c Merge branch 'master' into Teamserver 2022-04-13 22:02:48 +02:00
yoyosource
8191c134c7 Update local chat 2022-04-13 22:00:31 +02:00
yoyosource
acb7aa1efb Update TeamCommand 2022-04-13 21:51:40 +02:00
yoyosource
10b6d2b38e Update Team SQL api 2022-04-13 21:22:56 +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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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
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
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