Commit Graph
74 Commits
Author SHA1 Message Date
Chaoscaot 6fb018b86b Merge pull request 'Remove MinVersion and MaxVersion' (#362) from CleanupCommonCore into main
Reviewed-on: SteamWar/SteamWar#362
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2026-05-16 14:43:01 +02:00
Chaoscaot ce88e88859 Merge pull request 'Upgrade all projects to Java 21 and migrate dependencies to Paper and FastAsyncWorldEdit.' (#360) from Refactor/remove-old-dependencies into main
Reviewed-on: SteamWar/SteamWar#360
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-16 14:36:59 +02:00
Chaoscaot 35dead9c74 Merge pull request 'Reflection Reduction' (#357) from ReflectionReduction into main
Reviewed-on: SteamWar/SteamWar#357
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2026-05-16 14:29:39 +02:00
Chaoscaot 228ab5b2f2 Merge pull request 'Cleanup Version Code' (#339) from RemoveVersionCode into main
Reviewed-on: SteamWar/SteamWar#339
2026-05-15 16:07:25 +02:00
Chaoscaot b97fe7e5b1 Merge branch 'main' into RemoveVersionCode 2026-05-15 16:05:42 +02:00
Chaoscaot 138b94e562 Merge pull request 'Test Backporting' (#354) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#354
2026-05-15 15:09:46 +02:00
Chaoscaot 7be40d9bf9 Merge pull request 'Test Backporting' (#352) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#352
2026-05-15 15:03:40 +02:00
Chaoscaot f4ace64173 Merge pull request 'Test Backporting' (#351) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#351
2026-05-15 14:55:44 +02:00
Chaoscaot bd471330e1 Merge pull request 'Test Backporting' (#350) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#350
2026-05-15 14:48:42 +02:00
Chaoscaot 59a2d1454e Merge pull request 'Test Backporting' (#349) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#349
2026-05-15 14:41:44 +02:00
Chaoscaot afca7d5135 Merge pull request 'Test Backporting' (#348) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#348
2026-05-15 14:37:22 +02:00
Chaoscaot 38603fbe45 Merge pull request 'Test Backporting' (#347) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#347
2026-05-15 14:14:15 +02:00
Chaoscaot 0ea3c25b7b Merge pull request 'Test Backporting' (#346) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#346
2026-05-15 14:02:39 +02:00
Chaoscaot af805f6ba4 Merge pull request 'Test Backporting' (#345) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#345
2026-05-15 14:01:41 +02:00
Chaoscaot 83eb621b0f Merge pull request 'Test Backporting' (#344) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#344
2026-05-15 13:58:00 +02:00
Chaoscaot 7d52447b00 Merge pull request 'Test Backporting' (#343) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#343
2026-05-15 13:54:00 +02:00
Chaoscaot 046ab8d1a8 Merge branch 'main' into test/backporting 2026-05-15 13:53:53 +02:00
Chaoscaot b8eeb93a8f Merge pull request 'Test Backporting' (#342) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#342
2026-05-15 13:44:41 +02:00
Chaoscaot 9ca7446dba .gitea/workflows/backport-commoncore.yml aktualisiert 2026-05-15 13:42:26 +02:00
Chaoscaot 773a1adf64 Merge pull request 'Test Backporting' (#341) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#341
2026-05-15 13:38:23 +02:00
Chaoscaot a5856cf240 Merge pull request 'Test Autobackporting' (#340) from test/backporting into main
Reviewed-on: SteamWar/SteamWar#340
2026-05-15 12:31:37 +02:00
Chaoscaot 97a3c3ef35 .gitea/workflows/build.yml aktualisiert 2026-05-15 11:09:37 +02:00
Chaoscaot a40e904ab3 .gitea/workflows/build.yml aktualisiert 2026-05-15 11:06:54 +02:00
Chaoscaot a8a89b0809 .gitea/workflows/build.yml aktualisiert 2026-05-15 10:30:13 +02:00
Chaoscaot 916f9b2557 Merge pull request 'SteamWar CLI merge' (#330) from feature/steamwar-cli into main
Reviewed-on: SteamWar/SteamWar#330
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-13 22:42:59 +02:00
Chaoscaot 15aa0572f3 Merge pull request 'Implement old bau behavior for WGS' (#332) from old-bau-behavior into main
Reviewed-on: SteamWar/SteamWar#332
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2026-05-10 18:55:25 +02:00
Chaoscaot 43263035d9 Merge pull request 'Add DB Indexes for future local Development deployments' (#262) from add-db-indexes into main
Reviewed-on: SteamWar/SteamWar#262
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-09 20:23:56 +02:00
Chaoscaot d0535d0c47 Merge pull request '[fightsystem]: Fix broken kit system' (#322) from bugfix/fightsystem-broken-kits into main
Reviewed-on: SteamWar/SteamWar#322
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2026-05-04 18:31:25 +02:00
Chaoscaot bd53e016c5 Merge pull request 'feat: Add highligh flag for tracer' (#320) from BauSystem/add-highlight-trace-flag into main
Reviewed-on: SteamWar/SteamWar#320
Reviewed-by: zOnlyKroks <zonlyknox@gmail.com>
2026-05-03 13:04:37 +02:00
Chaoscaot 8e392b56c3 Merge pull request 'fix: windcharge check' (#318) from fix/mssing-string-get into main
Reviewed-on: SteamWar/SteamWar#318
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2026-05-01 12:30:42 +02:00
Chaoscaot 15f0344416 Merge pull request 'feat: Add temporary hardcoded windcharge check to autockecker for WGS' (#316) from fix/enable-windcharges-for-wgs into main
Reviewed-on: SteamWar/SteamWar#316
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2026-05-01 11:03:38 +02:00
Chaoscaot 73f903fc23 Merge branch 'main' into add-db-indexes 2026-01-23 23:04:11 +01:00
Chaoscaot b6445ce2e9 Merge pull request 'Change Bug Button to Link' (#263) from update-bug-button into main
Reviewed-on: SteamWar/SteamWar#263
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-12-25 21:09:37 +01:00
Chaoscaot 3ad4081add Merge pull request 'Add AuditLog to Backend' (#244) from Backend/auditlog into main
Reviewed-on: SteamWar/SteamWar#244
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-12-17 21:03:04 +01:00
Chaoscaot 4d40e52ea6 Merge pull request 'Refactor leaderboard management' (#166) from Lobby/refactor-leaderboard into main
Reviewed-on: SteamWar/SteamWar#166
2025-11-30 20:56:10 +01:00
Chaoscaot f9cb712b07 Merge pull request 'Simplify Tokens and add Discord OAuth' (#220) from authv3 into main
Reviewed-on: SteamWar/SteamWar#220
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-11-14 22:43:04 +01:00
Chaoscaot 84e1f605bd Merge pull request 'Exposed!' (#179) from exposed into main
Reviewed-on: SteamWar/SteamWar#179
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-11-10 08:42:59 +01:00
Chaoscaot 0ea5a62dbe Merge branch 'main' into exposed 2025-11-10 08:40:42 +01:00
Chaoscaot 98ca9e852c Merge pull request 'Add version dependant impl of tps warp to fight system' (#187) from FightSystem/Add-version-dependent-impl-of-tps-warp into main
Reviewed-on: SteamWar/SteamWar#187
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-11-06 09:50:24 +01:00
Chaoscaot 26a45fabb1 Merge pull request '1.21.6 Fightsystem' (#134) from 1.21.6/fightsystem into main
Reviewed-on: SteamWar/SteamWar#134
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-08-08 23:48:37 +02:00
Chaoscaot b74b73b871 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java aktualisiert 2025-08-05 21:12:35 +02:00
Chaoscaot 03005adcd8 Merge pull request 'Add enhance ReplayCommand' (#115) from add-fight-id into main
Reviewed-on: SteamWar/SteamWar#115
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-07-19 22:06:36 +02:00
Chaoscaot e06742d6d2 SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java aktualisiert 2025-07-16 09:34:38 +02:00
Chaoscaot 62e674ed42 SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java aktualisiert 2025-07-14 19:40:33 +02:00
Chaoscaot 0464442b83 VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java aktualisiert 2025-07-14 19:38:46 +02:00
Chaoscaot 6260e65b33 Merge pull request 'Add Schematic Revisions' (#93) from schematic-revisions into main
Reviewed-on: SteamWar/SteamWar#93
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-07-14 09:13:16 +02:00
Chaoscaot 6db404c1e6 Merge pull request 'Add AuditLog' (#89) from AuditLog into main
Reviewed-on: SteamWar/SteamWar#89
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-07-14 09:13:02 +02:00
Chaoscaot 3410dd5a4b Merge pull request 'Improve perceived server start time' (#108) from VelocityCore/ImprovePerceivedServerStartTimeWithCRIU into main
Reviewed-on: SteamWar/SteamWar#108
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-07-10 13:46:03 +02:00
Chaoscaot b8b38cf777 Merge pull request 'Handle KickedFromServerEvent with redirect and empty component' (#103) from remove-kicked-message into main
Reviewed-on: SteamWar/SteamWar#103
2025-07-06 17:58:46 +02:00
Chaoscaot 5c7c982175 Merge branch 'main' into schematic-revisions 2025-07-03 00:45:03 +02:00
Chaoscaot fbfdcf8fff Merge pull request 'VelocityCore/JDADependencyPlugin' (#91) from VelocityCore/JDADependencyPlugin into main
Reviewed-on: SteamWar/SteamWar#91
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-07-02 11:46:07 +02:00
Chaoscaot 6fa54aba2f Merge pull request 'Update UserPerm' (#92) from UserPermColorUpdate into main
Reviewed-on: SteamWar/SteamWar#92
2025-07-02 09:16:04 +02:00
Chaoscaot 280202c43f Merge pull request 'Update to support Minecraft 1.21.6 version' (#52) from update/1.21.5 into main
Reviewed-on: SteamWar/SteamWar#52
2025-06-30 15:53:44 +02:00
Chaoscaot 23df187eb1 settings.gradle.kts aktualisiert 2025-06-30 15:52:51 +02:00
Chaoscaot 1a570dca17 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java aktualisiert 2025-06-08 18:18:44 +02:00
Chaoscaot 761977c90a BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java aktualisiert 2025-06-08 16:42:45 +02:00
Chaoscaot 3069ffc991 Merge branch 'main' into update/1.21.5 2025-06-03 23:09:05 +02:00
Chaoscaot c3db2b7f86 VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java aktualisiert 2025-06-01 14:36:49 +02:00
Chaoscaot 54eec6d57c Merge pull request 'SchematicSystem: Add music disks to auto checker' (#59) from SchematicSystem/Allow-music-disks into main
Reviewed-on: SteamWar/SteamWar#59
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-05-29 14:37:49 +02:00
Chaoscaot 62f9d37230 Merge pull request 'Add tech hider bug handling for arena subservers in BugCommand' (#62) from bug-auto-techhider-bug into main
Reviewed-on: SteamWar/SteamWar#62
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-29 14:27:56 +02:00
Chaoscaot 6bbe94150d Merge pull request 'Prevent usage of Flashback channels for restricted players' (#58) from flashback into main
Reviewed-on: SteamWar/SteamWar#58
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-17 11:57:40 +02:00
Chaoscaot 2c644eef26 Merge pull request 'Maybe™️ fix Techhider' (#56) from techhider-fixes into main
Reviewed-on: SteamWar/SteamWar#56
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-02 14:26:18 +02:00
Chaoscaot f93362a023 LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java aktualisiert 2025-04-26 23:48:33 +02:00
Chaoscaot e72ae3cf94 LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java aktualisiert 2025-04-26 22:13:31 +02:00
Chaoscaot b4c7576433 Merge pull request 'TNTLeague/BiggerCoins' (#12) from TNTLeague/BiggerCoins into main
Reviewed-on: SteamWar/SteamWar#12
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-04-18 12:36:29 +02:00
Chaoscaot 76fc468d89 Merge pull request 'Refactors SchematicNode queries for efficiency' (#39) from improve-search-querry into main
Reviewed-on: SteamWar/SteamWar#39
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-04-12 14:40:34 +02:00
Chaoscaot d9b58d7170 Merge pull request 'Authentication v2' (#17) from Backend/new-auth into main
Reviewed-on: SteamWar/SteamWar#17
2025-02-25 22:40:09 +01:00
Chaoscaot 3db327eb84 Merge branch 'main' into Backend/new-auth 2025-02-25 22:39:59 +01:00
Chaoscaot fbea45fb0f Merge pull request 'Add server shutdown if less than 2 players after 5 minutes' (#15) from TNTLeague/auto-shutdown into main
Reviewed-on: SteamWar/SteamWar#15
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-02-02 16:15:52 +01:00
Chaoscaot abbbf7d3cb Merge branch 'main' into TNTLeague/auto-shutdown 2025-02-02 16:14:25 +01:00
Chaoscaot 1dc0c0d8a8 Merge pull request 'Add ReadyCommand' (#16) from TNTLeague/add-ready-command into main
Reviewed-on: SteamWar/SteamWar#16
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-02-02 16:14:20 +01:00
Chaoscaot c6a7107ec2 Merge pull request 'Make TNTLeague Event System Capable' (#13) from TNTLeague/add-event into main
Reviewed-on: SteamWar/SteamWar#13
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-02-02 13:03:02 +01:00
Chaoscaot 8ac5fe44ef Merge pull request 'Make TowerRun Event System Capable' (#14) from TowerRun/event into main
Reviewed-on: SteamWar/SteamWar#14
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-02-02 12:55:26 +01:00
Chaoscaot 315674ebd8 Merge branch 'main' into TNTLeague/TeamsOnSameLine 2025-01-24 22:44:47 +01:00