Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity
1,402 Commits 1 Branch 0 Tags
9d32a331ca7a307c19da7b4394acfa62e563d1c8
Commit Graph

1402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 5cc417c43c Add declined question handling in CheckCommand 
- Implemented tracking of declined questions during checks.
- Updated messaging logic to display declined questions to users.
- Added new translations for decline-related messages.
 2025-06-05 23:41:01 +02:00
Chaoscaot 1014df5f31 PR Stuff 2025-06-03 23:39:16 +02:00
Chaoscaot c920664920 Merge branch 'main' into add-offline-notify 2025-06-03 23:35:35 +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
YoyoNow c30f24ab8f Hotfix Protocol Version for real now 2025-05-31 21:32:19 +02:00
Chaoscaot bcb0ad4bef Merge branch 'main' into update/1.21.5 
# Conflicts:
#	VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
 2025-05-31 20:20:07 +02:00
Chaoscaot f2a46e54ea Revert "Add WeatherCommand" 
This reverts commit 30fa3fd66e.
 2025-05-31 19:40:08 +02:00
YoyoNow daede98a0f Hotfix TeamCommand 2025-05-31 17:45:24 +02:00
YoyoNow d37a14f280 Move some constants around 2025-05-31 10:04:21 +02:00
YoyoNow 083c5c07c2 Update CMDs for all current CustomModelData usages 2025-05-31 09:39:03 +02:00
YoyoNow 7b059cde0e Add customModelData to Velocity SWItem 2025-05-31 08:51:56 +02:00
YoyoNow 30fa3fd66e Add WeatherCommand 2025-05-30 21:37:07 +02:00
YoyoNow 37f6723542 Add CommonCore.DATA and CMDs 2025-05-29 17:12:32 +02:00
Chaoscaot 7a9740c4c4 Fix EventFight activeFights query and add null check for spectatePort in CookieEvents 2025-05-29 15:05:01 +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 2f93f336c9 Add image upload functionality and enhance page metadata creation. 2025-05-29 14:30:06 +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
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 9bc01a4e3b Revert FightTeam 2025-05-29 12:00:12 +02:00
YoyoNow b14cf445df Fix PR stuff 2025-05-29 11:32:50 +02:00
YoyoNow 527bc39d38 Add some more CustomModelData ids to items 2025-05-29 08:44:58 +02:00
Chaoscaot 8defbaa18b Add tech hider bug handling for arena subservers in BugCommand 2025-05-29 00:03:25 +02:00
Chaoscaot a5bb62590c Refactor page routing and point calculation logic 
Streamlined the `page` routing structure by optimizing branch and file handling, introducing a reusable `filesInDirectory` method, and cleaning up redundancies. Enhanced `EventGroup` point calculation with incremental updates, new helper methods (`getTeams`, `getTeamsId`), and better handling of unfinished fights.
 2025-05-28 23:57:29 +02:00
YoyoNow c35d4741a0 Add TexturePackSystem 2025-05-28 14:19:21 +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 277e1f9f9b Add NoGravity 2025-05-27 18:15:03 +02:00
YoyoNow 380506542f Remove some more duplicates 2025-05-23 09:13:23 +02:00
YoyoNow d410484e4c Update JDA to newest version 2025-05-22 19:47:14 +02:00
Chaoscaot 8768fd7d81 Refactor event handling and group assignment logic 
Replaced `fight.event` with `event.eventID` for consistency and improved event handling. Adjusted `setGroup` to accept `Integer` instead of `EventGroup` to simplify group assignment logic. Removed unused `event` field in `CreateEventFight` and streamlined related processing.
 2025-05-22 19:42:49 +02:00
Chaoscaot 374e314faa Add new WATUT Channel 2025-05-22 18:19:31 +02:00
Chaoscaot 45a8aab321 Revert "Add "/event vote" command for SteamWarArcade Event" 
This reverts commit 7f215b921e.
 2025-05-18 19:44:29 +02:00
Chaoscaot 0d15bbc266 Revert "Add "/event vote" command for SteamWarArcade Event" 
This reverts commit a5b61fb0d6.
 2025-05-18 19:44:28 +02:00
Chaoscaot 7fa97ce36c Revert "Fix TowerRun event" 
This reverts commit 8cd088050d.
 2025-05-18 19:44:28 +02:00
Chaoscaot 8cd088050d Fix TowerRun event 2025-05-18 16:32:01 +02:00
Chaoscaot b0bbc09113 Fix TowerRun event 2025-05-18 16:28:26 +02:00
Chaoscaot a5b61fb0d6 Add "/event vote" command for SteamWarArcade Event 
To be removed after event
 2025-05-18 16:22:50 +02:00
YoyoNow 297e6c9b59 Fix OOM? 2025-05-18 15:58:31 +02:00
YoyoNow 400c78447a Fix IngameListener 2025-05-18 15:41:43 +02:00
YoyoNow 778d0282d3 Fix IngameListener 2025-05-18 15:37:43 +02:00
YoyoNow 2a314e7035 Add sout 2025-05-18 15:31:48 +02:00
YoyoNow 6ed639fbb3 Add sout 2025-05-18 13:46:39 +02:00
YoyoNow 3a79f19f37 Merge remote-tracking branch 'origin/main' 2025-05-18 13:34:45 +02:00
YoyoNow f7e81f8204 Hotfix OOM in IngameListener 2025-05-18 13:34:42 +02:00
Chaoscaot 7f215b921e Add "/event vote" command for SteamWarArcade Event 
To be removed after event
 2025-05-18 13:32:09 +02:00
Chaoscaot b0be06136d Add 'ergebnis' field to EventFights data model and update logic 
Introduced a new 'ergebnis' field to the EventFights data model to handle fight results. Updated the logic to support processing and updating this field when provided. This ensures better tracking and management of event fight outcomes.
 2025-05-18 13:31:14 +02:00
YoyoNow 8132e4fca0 Remove code duplication 2025-05-18 10:34:41 +02:00
YoyoNow bf5eef2ebd Fix copyright nit 
Remove SchematicCommand19
 2025-05-18 10:28:32 +02:00