Commit Graph
76 Commits
Author SHA1 Message Date
YoyoNow 3bcff4c5ce Merge pull request 'perf(FightSystem): increase chunk hiding performance by skipping irrelavant chunks' (#385) from FightSystem/Optimize-new-techhider into FightSystem/fix-tech-and-hull-hider
Reviewed-on: SteamWar/SteamWar#385
Reviewed-by: YoyoNow <4+yoyonow@noreply.localhost>
2026-05-22 20:52:11 +02:00
YoyoNow 6ef311ce68 Merge pull request 'Fix CouncilChannel' (#384) from VelocityCore/FixDiscordBot into main
Reviewed-on: SteamWar/SteamWar#384
2026-05-21 11:23:06 +02:00
YoyoNow e50bff3d38 Merge pull request 'Unwrap the wrappers' (#381) from UnwrapWrapper into main
Reviewed-on: SteamWar/SteamWar#381
2026-05-21 07:56:16 +02:00
YoyoNow 3b65b93e73 Merge pull request 'SW Prefix Implementation' (#383) from Jaki/SteamWar:main into main
Reviewed-on: SteamWar/SteamWar#383
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-20 22:47:46 +02:00
YoyoNow ae6f279dcf Merge pull request 'add setting to disable block generators' (#375) from Jaki/SteamWar:main into main
Reviewed-on: SteamWar/SteamWar#375
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-19 19:25:25 +02:00
YoyoNow 2b3c79fcab Merge pull request 'fix(FighSystem): Add chunk packet resend after join to enhance security' (#358) from FightSystem/tech-hider-hardening into main
Reviewed-on: SteamWar/SteamWar#358
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-05-16 12:58:00 +02:00
YoyoNow 7ff778b60a Merge pull request 'UpdateTinyProtocol' (#359) from UpdateTinyProtocol into main
Reviewed-on: SteamWar/SteamWar#359
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2026-05-16 12:57:15 +02:00
YoyoNow bc0dc1925e Merge pull request 'Add WindchargeStopper to handle wind charge entity removal based on fight boundaries' (#182) from windcharges into main
Reviewed-on: SteamWar/SteamWar#182
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2026-04-23 12:04:34 +02:00
YoyoNow c3af4dbc68 Merge pull request 'Add CreateKitCommand' (#271) from add-kit-command into main
Reviewed-on: SteamWar/SteamWar#271
2026-04-23 12:01:18 +02:00
YoyoNow 711a21b634 Merge pull request 'Remove SchemElo and UserElo' (#256) from RemoveElo into main
Reviewed-on: SteamWar/SteamWar#256
2025-12-21 12:04:27 +01:00
YoyoNow 9a85e8b442 Merge branch 'main' into RemoveElo 2025-12-21 12:03:33 +01:00
YoyoNow 19c6ad0965 Merge pull request 'Add WorldIdentifier' (#249) from SpigotCore/WorldIdentifier into main
Reviewed-on: SteamWar/SteamWar#249
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-12-17 21:28:41 +01:00
YoyoNow 2c5306bfd1 Merge pull request 'Add WaterDestroy feature with command and listener' (#248) from waterblocker into main
Reviewed-on: SteamWar/SteamWar#248
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-12-17 21:13:45 +01:00
YoyoNow 8640d43d4b Merge pull request 'BauSystem/ImproveRegionData' (#234) from BauSystem/ImproveRegionData into main
Reviewed-on: SteamWar/SteamWar#234
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-12-03 13:26:10 +01:00
YoyoNow fbdb0cfaf1 Merge pull request 'Fix replay in 1.21 -> RPlayer needs fixing before' (#199) from FightSystem/ReplayFix21 into main
Reviewed-on: SteamWar/SteamWar#199
2025-12-03 10:05:03 +01:00
YoyoNow 9305ab5f91 Merge pull request 'Refactor Authlib integration and adjust entity handling for 1.21 compatibility' (#106) from 1.21.1/rplayer-fix into main
Reviewed-on: SteamWar/SteamWar#106
2025-12-03 10:04:50 +01:00
YoyoNow 34ade1de19 Merge branch 'main' into 1.21.1/rplayer-fix 2025-12-03 09:59:33 +01:00
YoyoNow 87d0df8067 Merge pull request 'Remove Poll-System' (#245) from Refactor/remove-poll-system into main
Reviewed-on: SteamWar/SteamWar#245
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-12-03 09:56:28 +01:00
YoyoNow c107b741c0 Merge pull request 'Add UserPerm.PUNISHMENTS' (#233) from CommonCore/UserPerm-Punishments into main
Reviewed-on: SteamWar/SteamWar#233
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-11-28 10:10:13 +01:00
YoyoNow 1d65f2349e Merge pull request 'Add SWPlayer for per player storage and without Memory Leaks' (#188) from SpigotCore/SWPlayer into main
Reviewed-on: SteamWar/SteamWar#188
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-11-25 17:00:24 +01:00
YoyoNow c0a4413b7a Merge branch 'main' into SpigotCore/SWPlayer 2025-11-25 16:59:28 +01:00
YoyoNow 6b71ac28fe Merge pull request 'bausystem/TLS' (#184) from bausystem/TLS into main
Reviewed-on: SteamWar/SteamWar#184
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-11-25 16:58:21 +01:00
YoyoNow aaccd4b095 Merge branch 'main' into SpigotCore/SWPlayer 2025-11-07 15:41:56 +01:00
YoyoNow 6cb2c56e47 Merge pull request 'Remove some strain on the Database' (#185) from BauSystem/RemoveDatabaseStrain into main
Reviewed-on: SteamWar/SteamWar#185
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-11-05 17:20:35 +01:00
YoyoNow e5edf918cc Merge pull request 'VelocityCore/AddCheckerForEventSchematics' (#181) from VelocityCore/AddCheckerForEventSchematics into main
Reviewed-on: SteamWar/SteamWar#181
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-10-28 19:54:53 +01:00
YoyoNow 58e885ef8f Merge pull request 'Improve PunishmentCommand Permissions' (#180) from VelocityCore/ImprovePunishmentCommand into main
Reviewed-on: SteamWar/SteamWar#180
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-10-28 19:54:45 +01:00
YoyoNow d860e2b865 Merge pull request 'Add Unified GameModeConfig' (#176) from UnifiedGameModeConfig into main
Reviewed-on: SteamWar/SteamWar#176
Reviewed-by: D4rkr34lm <dark@steamwar.de>
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-10-26 17:47:57 +01:00
YoyoNow 4ff9efef33 Merge pull request 'bausystem/TLS' (#178) from bausystem/TLS into main
Reviewed-on: SteamWar/SteamWar#178
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-10-26 15:30:59 +01:00
YoyoNow a03dda9522 Merge pull request 'Update copyright notices' (#171) from UpdateCopyrightNoticeInFiles into main
Reviewed-on: SteamWar/SteamWar#171
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-10-23 17:59:29 +02:00
YoyoNow d02fe1b0c7 Merge pull request 'Add Linkage to CommonCore and implement SpigotLinker used in BauSystem' (#151) from ExtraceLinkageToCommonCore into main
Reviewed-on: SteamWar/SteamWar#151
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-10-23 17:51:03 +02:00
YoyoNow 9e029ea0f1 Merge pull request 'Update .gitignore and configure IntelliJ IDEA copyright settings' (#170) from add-copyright-to-repo into main
Reviewed-on: SteamWar/SteamWar#170
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-10-23 17:41:42 +02:00
YoyoNow c831d994be Merge pull request 'Add enable/disable/clear functionality for Piston Calculator' (#160) from BauSystem/piston-calculator-enable into main
Reviewed-on: SteamWar/SteamWar#160
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-10-18 07:50:42 +02:00
YoyoNow d2a6ccc46b Merge pull request 'Modular BauSystem Regions' (#26) from BauSystem/RegionSystem into main
Reviewed-on: SteamWar/SteamWar#26
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-09-29 09:25:20 +02:00
YoyoNow 361c86c99e Merge pull request 'Add update of all coming fights if a fight is stopped' (#145) from VelocityCore/AutoReloadEventFightsOnFinish into main
Reviewed-on: SteamWar/SteamWar#145
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-09-28 14:00:00 +02:00
YoyoNow 613cb76edb Merge pull request 'Add StreamingCommand for streaming mode' (#146) from VelocityCore/StreamingMode into main
Reviewed-on: SteamWar/SteamWar#146
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-09-28 13:57:43 +02:00
YoyoNow d4eabfe9b2 Make optional parameter on 'delete' not optional 2025-09-16 08:54:29 +02:00
YoyoNow f8bb69e829 Merge branch 'main' into 1.21.6/fightsystem 2025-08-05 21:13:24 +02:00
YoyoNow 79a6c93f8f Merge pull request 'Improve Subserver.run for checkpoint' (#116) from VelocityCore/ImproveCheckpointHandling into main
Reviewed-on: SteamWar/SteamWar#116
2025-07-29 11:56:39 +02:00
YoyoNow 65cb544b64 Merge pull request 'Implement anvil inventory handling through SWAnvilInv and related network packets' (#117) from VelocityCore/anvil-inv into main
Reviewed-on: SteamWar/SteamWar#117
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-07-29 11:06:18 +02:00
YoyoNow 291b6b1804 Merge pull request 'Add Winconditions.TIMED_DAMAGE_TECH_KO and Winconditions.RANDOM_ROTATE' (#111) from FightSystem/RandomRotationAndTimedDamageTechKO into main
Reviewed-on: SteamWar/SteamWar#111
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-07-13 18:40:52 +02:00
YoyoNow 97a4d47aa7 Merge pull request 'Add support for TPS and tick rate management in 1.21+' (#105) from 1.21.1/tpslimit into main
Reviewed-on: SteamWar/SteamWar#105
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-07-08 22:17:22 +02:00
YoyoNow 66511e514c Merge pull request 'Add a simple smaller Trace file' (#25) from BauSystem/SmallerTraces into main
Reviewed-on: SteamWar/SteamWar#25
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-07-03 11:29:52 +02:00
YoyoNow 14b756261e Merge pull request 'Add event grouping' (#57) from event-brackets into main
Reviewed-on: SteamWar/SteamWar#57
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-26 23:40:51 +02:00
YoyoNow d9aeb47a3a Merge pull request 'Update WorldEdit CUI to RBlockDisplay' (#34) from WorldEditCUI into main
Reviewed-on: SteamWar/SteamWar#34
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-06-26 23:28:16 +02:00
YoyoNow afe30fd348 Merge pull request 'Add BauLockState.SUPERVISOR' (#80) from VelocityCore/BauLockSupervisor into main
Reviewed-on: SteamWar/SteamWar#80
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-06-26 23:28:07 +02:00
YoyoNow 9f323c8b38 Merge pull request 'Fix RPlayer not showing when same player is present' (#71) from FixRPlayerHandling into main
Reviewed-on: SteamWar/SteamWar#71
Reviewed-by: D4rkr34lm <dark@steamwar.de>
2025-06-26 23:28:00 +02:00
YoyoNow 0f68f671f5 Merge pull request 'Remove Shields from Check Arena' (#67) from remove-shield-from-check-arena into main
Reviewed-on: SteamWar/SteamWar#67
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-26 14:20:15 +02:00
YoyoNow eb8562b3a9 Merge pull request 'Add BlueInsetRegion management and implement TechareaCommand' (#73) from show-tech-area into main
Reviewed-on: SteamWar/SteamWar#73
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-12 19:29:32 +02:00
YoyoNow 9e294afa8f Merge pull request 'Add CEntity, CLine, CWireframe and optimize REntityServer' (#72) from WireFrames into main
Reviewed-on: SteamWar/SteamWar#72
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-06-12 19:20:58 +02:00
YoyoNow e4df6f55fb Merge pull request 'GUIImprovements' (#64) from GUIImprovements into main
Reviewed-on: SteamWar/SteamWar#64
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-06-10 21:08:23 +02:00
YoyoNow ff5113e112 Merge pull request 'Refactor schematic checks to handle unseen notifications' (#33) from add-offline-notify into main
Reviewed-on: SteamWar/SteamWar#33
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-10 20:57:33 +02:00
YoyoNow c425ca1171 Merge pull request 'Add declined question handling in CheckCommand' (#66) from add-saved-declined-questions-history into main
Reviewed-on: SteamWar/SteamWar#66
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-10 20:43:53 +02:00
YoyoNow c1293ffda0 Merge pull request 'Add 'queuerestart' command' (#68) from VelocityCore/QueueRestartCommand into main
Reviewed-on: SteamWar/SteamWar#68
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-06-10 20:43:04 +02:00
YoyoNow 02428868c2 Merge pull request 'Add player count to ListCommand' (#69) from VelocityCore/CountInListCommand into main
Reviewed-on: SteamWar/SteamWar#69
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-06-10 20:42:37 +02:00
YoyoNow edec84c60a Merge pull request 'Use Transfer Packet for Event Velocity' (#40) from transfer-packet into main
Reviewed-on: SteamWar/SteamWar#40
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-06-10 17:18:58 +02:00
YoyoNow 4f885a7269 Merge branch 'main' into transfer-packet 2025-06-10 17:18:08 +02:00
YoyoNow b479b6667b Merge pull request 'Enable a Dirt Block (Schem owner -1 and Name like GameMode) to be selected for any ServerTeam member' (#51) from FightSystem/EnableDirtBlockForServerTeam into main
Reviewed-on: SteamWar/SteamWar#51
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-29 12:06:41 +02:00
YoyoNow a2a101c4e3 Merge pull request 'Add NoGravity' (#61) from FightSystem/EnableNoGravityFights into main
Reviewed-on: SteamWar/SteamWar#61
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-27 19:58:55 +02:00
YoyoNow d36753dec1 Merge pull request 'Fixed meterstock' (#54) from BauSystem/fix-meterstock into main
Reviewed-on: SteamWar/SteamWar#54
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-04-26 13:37:33 +02:00
YoyoNow 98321de46c Merge pull request 'Replace Jukeboxes with Lodestone in panzer sklave' (#50) from BauSystem/fix-panzersklave into main
Reviewed-on: SteamWar/SteamWar#50
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-04-23 19:14:53 +02:00
YoyoNow 1201b16ee4 Merge pull request 'Improve Server starter 'steamwar.devserver.gradle'' (#41) from ImprovedServerStarter into main
Reviewed-on: SteamWar/SteamWar#41
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-04-23 18:16:39 +02:00
YoyoNow 4ddd88f540 Merge pull request 'Enable clicking 'Ready' in inventory' (#42) from FightSystem/HotbarKitInInv into main
Reviewed-on: SteamWar/SteamWar#42
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-04-23 18:12:40 +02:00
YoyoNow 48ea88e1a7 Merge pull request 'BauSystem/SimulatorStabGenerator' (#47) from BauSystem/SimulatorStabGenerator into main
Reviewed-on: SteamWar/SteamWar#47
2025-04-19 23:21:45 +02:00
YoyoNow 76bbfd0381 Merge pull request 'Add TNTClickListener.TNT_CLICK_DETAILS as a toggle' (#46) from BauSystem/TNTClickDetails into main
Reviewed-on: SteamWar/SteamWar#46
2025-04-18 21:52:29 +02:00
YoyoNow 119fae4b51 Merge pull request 'Add ActiveMonths to ArenaMode for rotating modes' (#45) from VelocityCore/ActiveMonthsForRotatingGameModes into main
Reviewed-on: SteamWar/SteamWar#45
2025-04-18 18:38:41 +02:00
YoyoNow 61d84492dc Merge branch 'main' into TNTLeague/BiggerCoins 2025-04-17 21:18:40 +02:00
YoyoNow 62dac000d4 Merge pull request 'Add general Melting of Blocks' (#43) from TowerRun/GeneralMeltingOfBlocks into main
Reviewed-on: SteamWar/SteamWar#43
2025-04-17 16:32:28 +02:00
YoyoNow cbaacd4e85 Merge pull request 'Improve and fix the discord rate limit warnings' (#37) from VelocityCore/ImproveDiscordChannel into main
Reviewed-on: SteamWar/SteamWar#37
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-04-16 20:16:52 +02:00
YoyoNow 19e14f787a Merge pull request 'feat(BauSystem): add tracer lua-lib' (#24) from BauSystem/tracer-lua-lib into main
Reviewed-on: SteamWar/SteamWar#24
Reviewed-by: Chaoscaot <max@chaoscaot.de>
Reviewed-by: Lixfel <lixfel@noreply.localhost>
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-03-30 17:33:29 +02:00
YoyoNow 0f629a6387 Merge pull request 'Feature(BauSystem): Add example hotkey script' (#31) from BauSystem/add-example-scipt into main
Reviewed-on: SteamWar/SteamWar#31
Reviewed-by: Lixfel <lixfel@noreply.localhost>
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-03-30 17:32:42 +02:00
YoyoNow 0da3ebfbcc Merge pull request 'SpigotCore/RDisplay' (#23) from SpigotCore/RDisplay into main
Reviewed-on: SteamWar/SteamWar#23
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-03-23 18:30:29 +01:00
YoyoNow 923142d0cb Merge branch 'main' into SpigotCore/RDisplay 2025-03-23 18:29:09 +01:00
YoyoNow 593ca9f0cf Merge pull request 'VelocityCore/SendCommand2.0' (#18) from VelocityCore/SendCommand2.0 into main
Reviewed-on: SteamWar/SteamWar#18
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-02-19 21:22:11 +01:00
YoyoNow ccbac9f7fb Merge branch 'main' into VelocityCore/SendCommand2.0 2025-02-13 20:40:16 +01:00
YoyoNow 90666e2d20 Merge pull request 'Add teamsOnSameLine for Arena Monochrome' (#5) from TNTLeague/TeamsOnSameLine into main
Reviewed-on: SteamWar/SteamWar#5
Reviewed-by: Chaoscaot <max@chaoscaot.de>
Reviewed-by: YoyoNow <yoyonow@noreply.localhost>
2025-01-29 21:20:19 +01:00
YoyoNow 77c6f41f1a Merge branch 'main' into TNTLeague/TeamsOnSameLine 2025-01-29 21:19:35 +01:00