Commit Graph

388 Commits

Author SHA1 Message Date
Lixfel
7f640ebd34 Merge pull request 'Add 1.21 Scoreboard Support' (#54) from SpigotCore/1.21 into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/54
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-11-24 20:13:27 +01:00
Lixfel
c15d523f3b Hotfix NodeDownload 2024-11-23 17:09:58 +01:00
97e4ccb076 Fixes 2024-11-23 15:43:05 +01:00
Lixfel
c2cf6125d1 Merge pull request 'Add Backend to Monorepo' (#29) from Backend/init into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/29
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-11-23 15:37:27 +01:00
7437f87d22 Fixes 2024-11-23 15:36:34 +01:00
5a3d801714 Merge branch 'main' into Backend/init 2024-11-23 13:28:00 +01:00
edbc43abf1 Hotfix: ModUtils Autoban 2024-11-18 18:07:53 +01:00
9415a3f217 Nits 2024-11-18 18:02:15 +01:00
4bb1bc0cbd Fixes, changes and Refactors 2024-11-17 12:04:07 +01:00
78853c70f8 Fixes and Update Copyright 2024-11-15 23:42:08 +01:00
5ac327409b Merge branch 'SpigotCore/1.21' into TNTLeague/finish 2024-11-15 23:13:44 +01:00
35ca8f3877 Add 1.21 Scoreboard Support 2024-11-15 22:06:10 +01:00
2e9dbfe8b8 Fixes... 2024-11-15 21:35:10 +01:00
27bd7be776 Fix Translations 2024-11-14 22:55:03 +01:00
9dff1f5884 Revert "Update Message"
This reverts commit ac9197c554.
2024-11-14 22:18:34 +01:00
26f15304a2 Merge branch 'KotlinCore/message-update' into TNTLeague/finish 2024-11-14 22:16:14 +01:00
d115975403 Add ComponentMessage, for TranslatableComponents in Paper >1.20 2024-11-14 22:08:06 +01:00
ac9197c554 Update Message 2024-11-14 19:31:17 +01:00
a78974b903 Merge pull request 'Add npc chat messages' (#41) from LobbySystem/NpcChatAdditions into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/41
2024-11-13 13:32:36 +01:00
8c0a888b3d Remove PR issues 2024-11-13 13:32:05 +01:00
597716569b Merge remote-tracking branch 'origin/main' 2024-11-12 16:10:50 +01:00
0485713e86 Update GameStates
Fix FightserverPortal.fightStateMapper
2024-11-12 16:10:46 +01:00
Lixfel
85c8e2e56b Merge pull request 'Fix transitive dependencies for STRG+Click in Source code not jumping to Source code' (#50) from FixTransitiveDependencies into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/50
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-11-12 15:57:40 +01:00
43618fc290 Fix transitive dependencies for STRG+Click in Source code not jumping to Source code 2024-11-12 15:41:48 +01:00
07049c4646 Merge pull request 'Add FightInfoPacketSender for TowerRun' (#47) from TowerRun/FightInfoPacket into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/47
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-11-12 14:56:15 +01:00
32afd1de8c Fix PR things 2024-11-11 15:05:08 +01:00
Lixfel
af4a3eb2ed Fix empty discord messages 2024-11-11 09:29:12 +01:00
Lixfel
fdd6d84b54 Fix mod name during kick/ban 2024-11-10 17:46:43 +01:00
Lixfel
8842d822d9 Merge pull request 'Changes to support AIs, Add DummyAI' (#31) from FightSystem/DummyAI into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/31
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-11-10 17:33:09 +01:00
Lixfel
1c7c57e10c Update JDA to 5.2.0 2024-11-10 17:30:38 +01:00
Lixfel
5e27f5c333 Merge pull request 'Fix TinyProtocol spurious ConcurrentModificationExceptions' (#24) from SpigotCore/TInyProtocolConcurrentModEx into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/24
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-11-10 17:29:21 +01:00
9d87ac6747 Merge branch 'main' into TNTLeague/finish 2024-11-10 16:47:14 +01:00
6fea09fb9d Fix nit picks 2024-11-03 20:26:24 +01:00
338f2e6ed1 Add FightInfoPacketSender for TowerRun 2024-11-03 11:57:37 +01:00
a9514996a9 Update Punishment requirements 2024-10-29 15:57:24 +01:00
31bcefce8a Fix ProcessingTracesState performance 2024-10-04 20:01:47 +02:00
11a933fede Improve PasteBuilder 2024-09-17 16:51:31 +02:00
dbe6d40e36 Merge pull request 'Fix Discord Ticket Log' (#43) from VelocityCore/jda-fix into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/43
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-09-17 07:55:54 +02:00
d4ba20ee37 Hotfix SimulatorStorage.openSimulatorSelector ordering 2024-09-16 20:40:11 +02:00
cb54591ad9 Merge pull request 'Add team changecolor command alias' (#42) from VelocityCore/TeamChangecolor into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/42
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2024-09-16 18:01:31 +02:00
9dcd0cce43 Merge branch 'main' into VelocityCore/TeamChangecolor 2024-09-16 18:00:40 +02:00
35d812b280 Fix Discord Ticket Log 2024-09-03 00:34:07 +02:00
a1e1396bdb Fix Discord Ticket Log 2024-08-31 20:17:02 +02:00
a64f6292e9 Add team changecolor command alias 2024-08-30 11:00:56 +02:00
2142ed2f97 Hotfix DiscordBot 2024-08-30 08:41:37 +02:00
6560562b05 Hotfix DiscordBot? 2024-08-30 08:39:57 +02:00
6222f76417 Hotfix DiscordBot 2024-08-30 08:33:05 +02:00
1f908134a1 Hotfix DiscordBot 2024-08-30 08:31:29 +02:00
04d9f38f7d Add team changecolor command alias 2024-08-29 22:53:22 +02:00
94502a1567 Add npc chat messages 2024-08-29 22:40:05 +02:00