IT0NA31/ForkWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity
1,928 Commits 38 Branches 0 Tags
main
Commit Graph
39 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lixfel 06010ae27c Merge pull request 'Fix Schem Upload' (#100) from Schematics/fix-upload into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/100
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2025-01-08 13:27:07 +01:00
Lixfel fdd25b11a2 Merge pull request 'Fix invisible players' (#98) from FightSystem/FixInvisiblePlayers into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/98
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2025-01-07 17:12:15 +01:00
Lixfel e26e590e18 Merge pull request 'Potential fix for true IP for floodgate players' (#97) from VelocityCore/floodgateIPs into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/97
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2025-01-07 16:59:31 +01:00
Lixfel d3fbbb9768 Merge pull request 'Mojang map reflections' (#89) from MojMapReflections into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/89
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2025-01-07 16:27:02 +01:00
Lixfel 856c79661b Merge pull request 'Move ViaVersion to Proxy' (#87) from ViaOnProxy into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/87
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2025-01-03 07:33:45 +01:00
Lixfel d7d6c2df7b Merge pull request 'VelocityCore/PrivateTicketLog' (#61) from VelocityCore/PrivateTicketLog into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/61
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2025-01-01 13:00:44 +01:00
Lixfel 55c3579e5c Merge pull request 'Add custom NPC Chats for specific players' (#93) from LobbySystem/NPCChats into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/93
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2025-01-01 12:58:12 +01:00
Lixfel abb8ab2204 Merge pull request 'Fix Schematics Readers' (#72) from Schematics/1.21 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/72
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2025-01-01 12:42:01 +01:00
Lixfel 30ac38ef53 Merge pull request 'Remove /leader command, allow for Leader promotion' (#86) from FightSystem/Leader into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/86
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-12-26 10:53:07 +01:00
Lixfel 4da2307d50 Merge pull request 'TechHider refactoring, simple Blocktagging' (#82) from blocktagger into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/82
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-12-22 07:18:41 +01:00
Lixfel 8fac9cd37e Merge pull request 'Partial diagonal HullHider uncovering, performance improvement' (#79) from FIghtSystem/partialSides into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/79
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-12-21 11:21:45 +01:00
Lixfel 3b2ee668b2 Merge pull request 'Additional Pluginmessage classifications, Lunar refactoring' (#80) from VelocityCore/PluginMessages into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/80
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-12-21 11:21:21 +01:00
Lixfel 454cfecc0e Merge pull request 'Better Hull Hider Algorithm' (#76) from FightSystem/HullHiderAlgo_v2 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/76
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-12-11 13:16:39 +01:00
Lixfel 9a6dec6679 Merge pull request 'SubserverSystem-Refactoring' (#71) from SubserverSystem-Refactoring into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/71
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-12-04 11:43:27 +01:00
Lixfel d57d73c488 Merge pull request 'Remove Now Unused Wrappers' (#66) from fixes into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/66
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-12-01 22:10:12 +01:00
Lixfel 4009f11871 Merge pull request 'Fixes for 1.21' (#65) from fixes into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/65
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-12-01 20:15:47 +01:00
Lixfel e24f108d90 Merge pull request 'Fix JsonParser.readString unavailable in 1.15-' (#62) from SpigotCore/JsonParser into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/62
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-12-01 19:09:31 +01:00
Lixfel f4ef396d4e Merge pull request 'Update our Software to 1.21.3' (#60) from 1.21.3 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/60
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-12-01 19:08:28 +01:00
Lixfel c34575df29 Merge pull request 'Replace WorldEditSUI' (#56) from SpigotCore/WorldEditSUI into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/56
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-11-28 09:58:03 +01:00
Lixfel 7f640ebd34 Merge pull request 'Add 1.21 Scoreboard Support' (#54) from SpigotCore/1.21 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/54
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-11-24 20:13:27 +01:00
Lixfel c2cf6125d1 Merge pull request 'Add Backend to Monorepo' (#29) from Backend/init into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/29
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-11-23 15:37:27 +01:00
Lixfel 85c8e2e56b Merge pull request 'Fix transitive dependencies for STRG+Click in Source code not jumping to Source code' (#50) from FixTransitiveDependencies into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/50
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-11-12 15:57:40 +01:00
Lixfel 8842d822d9 Merge pull request 'Changes to support AIs, Add DummyAI' (#31) from FightSystem/DummyAI into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/31
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-11-10 17:33:09 +01:00
Lixfel 5e27f5c333 Merge pull request 'Fix TinyProtocol spurious ConcurrentModificationExceptions' (#24) from SpigotCore/TInyProtocolConcurrentModEx into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/24
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-11-10 17:29:21 +01:00
Lixfel 46ee20ad1b Merge pull request 'Add DiscordTicketType.SCHEMATIC' (#40) from VelocityCore/SchematicReportDiscord into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/40
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-29 22:19:25 +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
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
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
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 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
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
Lixfel f7ea08e6d0 Merge pull request 'Fix lore color of Detonator' (#20) from LobbySystem/NpcChat into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/20
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-11 13:02:40 +02:00
Lixfel 222b26f782 Merge pull request 'Clear Subserver Baumembercache on delmember' (#11) from BauSystem/ClearCacheOnDelmember into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/11
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-08 23:40:52 +02:00
Lixfel a5dde09ae4 Merge pull request 'Update SteamwarUser.getServerTeam' (#8) from CommonCore/SteamwarUser into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/8
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-07 14:41:26 +02:00
Lixfel 21158899e1 Merge pull request 'Fix BauCommand.setBuilder' (#10) from VelocityCore/BauCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/10
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-07 14:38:48 +02:00
Lixfel 3d36a7b7a3 Merge pull request 'Add SendCommand' (#5) from VelocityCore/SendCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/5
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-06 18:07:18 +02:00
Lixfel a53fd19887 Merge pull request 'Add QOL to EventCommand and EventRescheduleCommand' (#4) from QOLEventCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/4
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-06 13:46:24 +02:00
Lixfel b4ff8726af Merge pull request 'Gradle Rewrite' (#3) from gradleRewrite into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/3
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-06 13:44:26 +02:00