Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity
176 Commits 1 Branch 0 Tags
04d9f38f7df3e7dc3c14fa4c8b1869fb75a6b3af
Commit Graph

176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBreadBeard 04d9f38f7d Add team changecolor command alias 2024-08-29 22:53:22 +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
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
YoyoNow c8381413a3 Add SimulatorCommand.rename 2024-08-25 15:46:03 +02:00
YoyoNow c61c2d8087 Fix output on to small/large speed value 2024-08-25 15:34:07 +02:00
YoyoNow 18cb7157d7 Merge remote-tracking branch 'origin/main' 2024-08-25 08:04:28 +02:00
YoyoNow ea929e0615 Hotfix Laufbau BoundingBoxLoader 2024-08-25 08:04:22 +02:00
Lixfel 42dd4160ea Merge pull request 'Update to Discord JDA 5.0' (#22) from dc-5 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/22
 2024-08-23 11:41:40 +02:00
YoyoNow a75a1e8e10 Hotfix WorldEditSelectionSaver 2024-08-22 17:01:53 +02:00
Chaoscaot d5398cbde2 Remove redundant checks 2024-08-22 11:17:17 +02:00
Chaoscaot 12b16d6801 Merge branch 'main' into dc-5 2024-08-22 11:10:41 +02:00
Lixfel c5f40f0911 Merge pull request 'Add CRIUSleepEvent and CRIUWakeupEvent' (#34) from CRIUSupport/Events into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/34
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-22 10:55:33 +02:00
Lixfel 9b66df1e08 Merge pull request 'Fix WorldEditSelectionSaver finally' (#35) from BauSystem/SelectionSaverTheLast into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/35
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-22 10:40:37 +02:00
YoyoNow 20acd7abbe Fix WorldEditSelectionSaver finally 2024-08-21 21:15:00 +02:00
YoyoNow 49fa6c364f Hotfix WorldEditUtils.getVertices 2024-08-21 21:07:25 +02:00
YoyoNow 56cbb41930 Merge pull request 'Add WorldEditSelectionSaver' (#32) from BauSystem/WorldEditSelectionSaver into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/32
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-21 20:55:58 +02:00
YoyoNow fde70029c5 Fix WorldEditUtils.setVertices 2024-08-21 20:55:03 +02:00
YoyoNow 42fd35077b Fix PR stuff 2024-08-21 20:31:21 +02:00
YoyoNow 76aa61934c Add CRIUSleepEvent and CRIUWakeupEvent 
Fix AFKStopperListener
 2024-08-21 20:27:36 +02:00
YoyoNow f375aa68b5 Fix things 2024-08-21 18:26:33 +02:00
YoyoNow b2ff042e4a Merge pull request 'Fix SpecialItem.getRandomItem' (#33) from MissileWars/FixItemGive into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/33
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-21 18:21:28 +02:00
YoyoNow 6a2a3314c6 Fix SpecialItem.getRandomItem 2024-08-21 11:04:28 +02:00
YoyoNow 007f0796ae Add WorldEditSelectionSaver 2024-08-21 10:59:09 +02:00
Lixfel 9203e84d46 Merge pull request 'Fix Badlion restrictions' (#27) from VelocityCore/BadlionRestrictions into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/27
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-20 08:14:31 +02:00
YoyoNow 5e1338a9f3 Merge pull request 'fix(BauSystem): Fix trace serialisation (#7)' (#12) from wip/#7-fix-eof-in-trace-reader into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/12
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-18 21:00:57 +02:00
D4rkr34lm 50175b2518 Fixed access 2024-08-18 20:53:36 +02:00
Lixfel 09a8dc0786 Fix Badlion (tested), Fix Client channel registration and brand detection 2024-08-18 15:36:50 +02:00
Lixfel 5afdc04e1e Merge branch 'main' into VelocityCore/BadlionRestrictions 2024-08-18 14:40:22 +02:00
D4rkr34lm 67d4f3432a Changed trace record output to data output/input instead of object output/input 2024-08-18 12:23:05 +02:00
D4rkr34lm 3e6dd61428 Readd allArgs and history place holder 2024-08-18 12:08:57 +02:00
D4rkr34lm fbb6d84dae Moved trace system init to plugin enable 2024-08-18 11:53:14 +02:00
D4rkr34lm 44faab9950 Added all args through lombok 2024-08-18 11:45:38 +02:00
D4rkr34lm a780385599 Removed debug statement 2024-08-18 11:19:35 +02:00
D4rkr34lm 817c522d9a Added flushing of trace write to prevent eof on read 2024-08-18 11:14:42 +02:00
Lixfel acbe6f2f5d Merge pull request 'Fix Tablist' (#9) from VelocityCore/Tablist into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/9
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-08-18 11:13:19 +02:00
Lixfel 4f4e0bab69 Fix tablist (some tests done, potentielly fixed) 2024-08-17 19:03:32 +02:00
Lixfel bad291f8ce Merge branch 'main' into VelocityCore/Tablist 2024-08-17 17:57:39 +02:00
Lixfel b8e50dc139 Merge pull request 'Add Missing Commits' (#28) from VelocityCore/missing-commits into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/28
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-16 19:28:42 +02:00
Chaoscaot 765a0ef1f3 Add Missing Commits 2024-08-16 18:04:02 +02:00
Lixfel 4a2afee27d Fix Badlion restrictions (untested) 
Fixes #dreamjxnas-bug-325.
 2024-08-16 17:56:00 +02:00
Lixfel 8e1b2dea57 Merge pull request 'Fix Discord commands with zero arguments' (#25) from VelocityCore/FixArgumentlessCommands into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/25
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-16 17:38:03 +02:00
YoyoNow 0fd397a390 Merge pull request 'Change AFK Stopper to work based on real time' (#26) from BauSystem/RealtimeAFKStopper into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/26
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-16 17:36:52 +02:00
D4rkr34lm 15654394b5 Fixed false record count being red 2024-08-16 17:36:43 +02:00