Commit Graph

159 Commits

Author SHA1 Message Date
12b16d6801 Merge branch 'main' into dc-5 2024-08-22 11:10:41 +02:00
Lixfel
c5f40f0911 Merge pull request 'Add CRIUSleepEvent and CRIUWakeupEvent' (#34) from CRIUSupport/Events into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/34
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-22 10:55:33 +02:00
Lixfel
9b66df1e08 Merge pull request 'Fix WorldEditSelectionSaver finally' (#35) from BauSystem/SelectionSaverTheLast into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/35
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-22 10:40:37 +02:00
20acd7abbe Fix WorldEditSelectionSaver finally 2024-08-21 21:15:00 +02:00
49fa6c364f Hotfix WorldEditUtils.getVertices 2024-08-21 21:07:25 +02:00
56cbb41930 Merge pull request 'Add WorldEditSelectionSaver' (#32) from BauSystem/WorldEditSelectionSaver into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/32
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-21 20:55:58 +02:00
fde70029c5 Fix WorldEditUtils.setVertices 2024-08-21 20:55:03 +02:00
42fd35077b Fix PR stuff 2024-08-21 20:31:21 +02:00
76aa61934c Add CRIUSleepEvent and CRIUWakeupEvent
Fix AFKStopperListener
2024-08-21 20:27:36 +02:00
f375aa68b5 Fix things 2024-08-21 18:26:33 +02:00
b2ff042e4a Merge pull request 'Fix SpecialItem.getRandomItem' (#33) from MissileWars/FixItemGive into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/33
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-21 18:21:28 +02:00
6a2a3314c6 Fix SpecialItem.getRandomItem 2024-08-21 11:04:28 +02:00
007f0796ae Add WorldEditSelectionSaver 2024-08-21 10:59:09 +02:00
Lixfel
9203e84d46 Merge pull request 'Fix Badlion restrictions' (#27) from VelocityCore/BadlionRestrictions into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/27
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-20 08:14:31 +02:00
5e1338a9f3 Merge pull request 'fix(BauSystem): Fix trace serialisation (#7)' (#12) from wip/#7-fix-eof-in-trace-reader into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/12
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-18 21:00:57 +02:00
D4rkr34lm
50175b2518 Fixed access 2024-08-18 20:53:36 +02:00
Lixfel
09a8dc0786 Fix Badlion (tested), Fix Client channel registration and brand detection 2024-08-18 15:36:50 +02:00
Lixfel
5afdc04e1e Merge branch 'main' into VelocityCore/BadlionRestrictions 2024-08-18 14:40:22 +02:00
D4rkr34lm
67d4f3432a Changed trace record output to data output/input instead of object output/input 2024-08-18 12:23:05 +02:00
D4rkr34lm
3e6dd61428 Readd allArgs and history place holder 2024-08-18 12:08:57 +02:00
D4rkr34lm
fbb6d84dae Moved trace system init to plugin enable 2024-08-18 11:53:14 +02:00
D4rkr34lm
44faab9950 Added all args through lombok 2024-08-18 11:45:38 +02:00
D4rkr34lm
a780385599 Removed debug statement 2024-08-18 11:19:35 +02:00
D4rkr34lm
817c522d9a Added flushing of trace write to prevent eof on read 2024-08-18 11:14:42 +02:00
Lixfel
acbe6f2f5d Merge pull request 'Fix Tablist' (#9) from VelocityCore/Tablist into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/9
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
2024-08-18 11:13:19 +02:00
Lixfel
4f4e0bab69 Fix tablist (some tests done, potentielly fixed) 2024-08-17 19:03:32 +02:00
Lixfel
bad291f8ce Merge branch 'main' into VelocityCore/Tablist 2024-08-17 17:57:39 +02:00
Lixfel
b8e50dc139 Merge pull request 'Add Missing Commits' (#28) from VelocityCore/missing-commits into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/28
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-16 19:28:42 +02:00
765a0ef1f3 Add Missing Commits 2024-08-16 18:04:02 +02:00
Lixfel
4a2afee27d Fix Badlion restrictions (untested)
Fixes #dreamjxnas-bug-325.
2024-08-16 17:56:00 +02:00
Lixfel
8e1b2dea57 Merge pull request 'Fix Discord commands with zero arguments' (#25) from VelocityCore/FixArgumentlessCommands into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/25
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-16 17:38:03 +02:00
0fd397a390 Merge pull request 'Change AFK Stopper to work based on real time' (#26) from BauSystem/RealtimeAFKStopper into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/26
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-16 17:36:52 +02:00
D4rkr34lm
15654394b5 Fixed false record count being red 2024-08-16 17:36:43 +02:00
D4rkr34lm
25f6b3c223 Fixed trace record count in trace objects created through recording 2024-08-16 17:35:11 +02:00
Lixfel
07284eae6a Change AFK Stopper to work based on real time
Fixes #lag145-bug-203.
2024-08-16 17:32:51 +02:00
D4rkr34lm
642e9ffd50 Fixed deletion of old traces 2024-08-16 17:18:02 +02:00
Lixfel
7d7de2c2f3 Fix Discord commands with zero arguments 2024-08-16 17:06:23 +02:00
Lixfel
c65c23d5e2 Fix VersionAnnouncer ACTION_BAR with Prefix 2024-08-16 16:52:20 +02:00
43550ee8df Fixes 2024-08-16 12:04:16 +02:00
66f5b6491c Add TNTLeague Module 2024-08-16 11:38:54 +02:00
f8f184514b Add steamwar.kotlin.gradle 2024-08-16 11:26:52 +02:00
36a9877393 Fix KotlinCore 2024-08-16 10:48:17 +02:00
0162fadd15 Enable KotlinCore 2024-08-16 10:42:59 +02:00
805b571de6 Merge pull request 'Add reset of Region flags on Region reset' (#19) from BauSystem/RegionFlagReset into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/19
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-12 18:59:58 +02:00
5a92c4cf8e Merge pull request 'Send Server version to Client when version differs' (#23) from BauSystem/VersionAnnouncer into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/23
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-12 18:57:03 +02:00
Lixfel
80a1c908ce -> ActionBar 2024-08-12 18:23:45 +02:00
Lixfel
a60b579b0d Send Server version to Client when version differs 2024-08-12 18:21:41 +02:00
8b776ff33e Es baut... (Untested) 2024-08-12 17:15:38 +02:00
Lixfel
f7ea08e6d0 Merge pull request 'Fix lore color of Detonator' (#20) from LobbySystem/NpcChat into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/20
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-11 13:02:40 +02:00
5269586761 Fix lore color of Detonator 2024-08-11 10:20:04 +02:00