Commit Graph
18 Commits
Author SHA1 Message Date
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