1774 Commits

Author SHA1 Message Date
Chaoscaot 9dff1f5884 Revert "Update Message"
This reverts commit ac9197c554.
2024-11-14 22:18:34 +01:00
Chaoscaot 26f15304a2 Merge branch 'KotlinCore/message-update' into TNTLeague/finish 2024-11-14 22:16:14 +01:00
Chaoscaot d115975403 Add ComponentMessage, for TranslatableComponents in Paper >1.20 2024-11-14 22:08:06 +01:00
Chaoscaot ac9197c554 Update Message 2024-11-14 19:31:17 +01:00
YoyoNow 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
YoyoNow 8c0a888b3d Remove PR issues 2024-11-13 13:32:05 +01:00
YoyoNow 597716569b Merge remote-tracking branch 'origin/main' 2024-11-12 16:10:50 +01:00
YoyoNow 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
YoyoNow 43618fc290 Fix transitive dependencies for STRG+Click in Source code not jumping to Source code 2024-11-12 15:41:48 +01:00
YoyoNow 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
YoyoNow 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
Chaoscaot 9d87ac6747 Merge branch 'main' into TNTLeague/finish 2024-11-10 16:47:14 +01:00
YoyoNow 6fea09fb9d Fix nit picks 2024-11-03 20:26:24 +01:00
YoyoNow 338f2e6ed1 Add FightInfoPacketSender for TowerRun 2024-11-03 11:57:37 +01:00
YoyoNow a9514996a9 Update Punishment requirements 2024-10-29 15:57:24 +01:00
YoyoNow 31bcefce8a Fix ProcessingTracesState performance 2024-10-04 20:01:47 +02:00
YoyoNow 11a933fede Improve PasteBuilder 2024-09-17 16:51:31 +02:00
YoyoNow 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
YoyoNow d4ba20ee37 Hotfix SimulatorStorage.openSimulatorSelector ordering 2024-09-16 20:40:11 +02:00
YoyoNow 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
YoyoNow 9dcd0cce43 Merge branch 'main' into VelocityCore/TeamChangecolor 2024-09-16 18:00:40 +02:00
Chaoscaot 35d812b280 Fix Discord Ticket Log 2024-09-03 00:34:07 +02:00
Chaoscaot a1e1396bdb Fix Discord Ticket Log 2024-08-31 20:17:02 +02:00
TheBreadBeard a64f6292e9 Add team changecolor command alias 2024-08-30 11:00:56 +02:00
YoyoNow 2142ed2f97 Hotfix DiscordBot 2024-08-30 08:41:37 +02:00
YoyoNow 6560562b05 Hotfix DiscordBot? 2024-08-30 08:39:57 +02:00
YoyoNow 6222f76417 Hotfix DiscordBot 2024-08-30 08:33:05 +02:00
YoyoNow 1f908134a1 Hotfix DiscordBot 2024-08-30 08:31:29 +02:00
TheBreadBeard 04d9f38f7d Add team changecolor command alias 2024-08-29 22:53:22 +02:00
TheBreadBeard 94502a1567 Add npc chat messages 2024-08-29 22:40:05 +02:00
Chaoscaot 4edc59ba66 Add translations 2024-08-29 22:33:54 +02:00
Lixfel 46ee20ad1b Merge pull request 'Add DiscordTicketType.SCHEMATIC' (#40) from VelocityCore/SchematicReportDiscord into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/40
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-29 22:19:25 +02:00
TheBreadBeard 52302dd284 Add DiscordTicketType.SCHEMATIC 2024-08-29 22:09:43 +02:00
Lixfel e1769a42f4 DummyAI only Test arenas 2024-08-29 13:58:27 +02:00
YoyoNow 1b10063e30 Merge pull request 'Add SimulatorCommand.rename' (#38) from BauSystem/SimulatorRename into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/38
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-29 12:55:43 +02:00
YoyoNow bd389a7a7e Merge remote-tracking branch 'origin/BauSystem/SimulatorRename' into BauSystem/SimulatorRename 2024-08-29 11:32:40 +02:00
YoyoNow ac25dea08a Fix PR stuff 2024-08-29 11:32:34 +02:00
YoyoNow e0d964bdd7 Merge pull request 'Fix Loader wait time to be 2 gameticks when 1 is selected' (#39) from BauSystem/LoaderWaitTime into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/39
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-29 10:12:22 +02:00
Chaoscaot c11eaaee45 Fixes... 2024-08-27 21:34:18 +02:00
YoyoNow baf837946e Merge pull request 'Fix output on to small/large speed value' (#37) from BauSystem/SpeedCommand into main
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/37
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-27 20:16:44 +02:00
YoyoNow 5f92d4c68c Fix Loader wait time to be 2 gameticks when 1 is selected 2024-08-27 20:16:30 +02:00
YoyoNow 6496f33a9e Fix argument name of rename command 2024-08-26 07:44:54 +02:00
YoyoNow 9e2f2748b6 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java aktualisiert 2024-08-26 07:42:47 +02:00
YoyoNow a25e55ffdf Fix Loader wait time to be 2 gameticks when 1 is selected 2024-08-25 15:49:21 +02:00