Commit Graph
14 Commits
Author SHA1 Message Date
Lixfel 42dd4160ea Merge pull request 'Update to Discord JDA 5.0' (#22) from dc-5 into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/22
2024-08-23 11:41:40 +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
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
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 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
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
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
Lixfel 222b26f782 Merge pull request 'Clear Subserver Baumembercache on delmember' (#11) from BauSystem/ClearCacheOnDelmember into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/11
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-08 23:40:52 +02:00
Lixfel a5dde09ae4 Merge pull request 'Update SteamwarUser.getServerTeam' (#8) from CommonCore/SteamwarUser into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/8
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-07 14:41:26 +02:00
Lixfel 21158899e1 Merge pull request 'Fix BauCommand.setBuilder' (#10) from VelocityCore/BauCommand into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/10
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-07 14:38:48 +02:00
Lixfel 3d36a7b7a3 Merge pull request 'Add SendCommand' (#5) from VelocityCore/SendCommand into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/5
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-06 18:07:18 +02:00
Lixfel a53fd19887 Merge pull request 'Add QOL to EventCommand and EventRescheduleCommand' (#4) from QOLEventCommand into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/4
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-06 13:46:24 +02:00
Lixfel b4ff8726af Merge pull request 'Gradle Rewrite' (#3) from gradleRewrite into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/3
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-08-06 13:44:26 +02:00