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 |
|
|
|
f2df750894
|
Merge pull request 'Teamserver' (#344) from Teamserver into master
Reviewed-on: SteamWar/BungeeCore#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 |
|
|
|
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 |
|
|
|
9ac5a8ef8a
|
Fix sends
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 18:47:21 +02:00 |
|
|
|
015a3cfa52
|
Fix broeadcasts
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 17:26:28 +02:00 |
|
|
|
329d80f037
|
Fix Arenaserver
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 17:10:32 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6a7b0ff9c1
|
Merge pull request 'ChatRefactor' (#349) from chatRefactor into master
Reviewed-on: SteamWar/BungeeCore#349
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-04-22 15:19:15 +02:00 |
|
|
|
f8232fcb48
|
Fix chat no receiver
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 15:16:33 +02:00 |
|
|
|
fb900585d1
|
Merge pull request 'Initial CommonCore' (#350) from commoncore into master
Reviewed-on: SteamWar/BungeeCore#350
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-04-22 15:14:26 +02:00 |
|
|
|
5de2bbd876
|
Test build
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 12:40:12 +02:00 |
|
|
|
c324451871
|
Test build
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 12:38:07 +02:00 |
|
|
|
b1113eed6c
|
Test build
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 12:35:44 +02:00 |
|
|
|
62279b7baa
|
Test build
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 10:40:42 +02:00 |
|
|
|
02fd7eb965
|
Fix discord targets
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 10:36:28 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
24d2c8f0d0
|
Initial CommonCore
|
2022-04-20 11:32:30 +02:00 |
|
|
|
400574e932
|
Fix ci
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-19 20:35:55 +02:00 |
|
|
|
c1048cfdbd
|
Current state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-19 20:32:02 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
54932f6ebc
|
Current state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-14 22:24:36 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
336d4f6a3c
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-13 20:55:51 +02:00 |
|
