Skip to content

Actions: Foundation-19/Hail-Mary

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
199 workflow runs
199 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Automatic TGS DMAPI Update (#290) Check for merge conflicts #199: Commit 94c46a8 pushed by Aurrain
January 1, 2025 01:02 37s master
master
January 1, 2025 01:02 37s
GET READY FOR A FISTING aka 2handed melee gloves. (#264) Check for merge conflicts #198: Commit 449337a pushed by Aurrain
December 10, 2024 21:37 43s master
master
December 10, 2024 21:37 43s
Custom Loadout Overhaul (#271) Check for merge conflicts #197: Commit 45998cf pushed by Aurrain
December 10, 2024 21:24 40s master
master
December 10, 2024 21:24 40s
Ports Big Iron's Thirst mecanics in Hailmary code (#246) Check for merge conflicts #196: Commit 472b3f3 pushed by Aurrain
December 10, 2024 21:22 42s master
master
December 10, 2024 21:22 42s
Opens more roles to Super Mutants (#279) Check for merge conflicts #195: Commit 75c44c7 pushed by Aurrain
December 10, 2024 21:20 37s master
master
December 10, 2024 21:20 37s
Mask Addition: Fallout Payday Masks (#283) Check for merge conflicts #194: Commit 82bb354 pushed by Aurrain
November 29, 2024 14:51 40s master
master
November 29, 2024 14:51 40s
Mirror Addition + Wasteland Spawner: Grand Daddy Mirror + Moves waste… Check for merge conflicts #193: Commit 0125389 pushed by Aurrain
November 29, 2024 14:50 38s master
master
November 29, 2024 14:50 38s
Sprite Addition: Antivenom (#284) Check for merge conflicts #192: Commit 5341b0d pushed by Aurrain
November 29, 2024 14:50 39s master
master
November 29, 2024 14:50 39s
10mm Drum Magazine (#258) Check for merge conflicts #191: Commit 206229d pushed by Aurrain
November 29, 2024 14:43 50s master
master
November 29, 2024 14:43 50s
CCRS Fix (Car Crarfting Rudimentary System Fix) (#282) Check for merge conflicts #190: Commit e7411b2 pushed by tichys
November 26, 2024 10:50 40s master
master
November 26, 2024 10:50 40s
minor syntax fixes Check for merge conflicts #189: Commit a7f11a9 pushed by Aurrain
November 20, 2024 21:34 41s master
master
November 20, 2024 21:34 41s
alert status changes + free quirk points reduced to 1 Check for merge conflicts #188: Commit 1b37040 pushed by Aurrain
November 19, 2024 21:51 39s master
master
November 19, 2024 21:51 39s
removes armor from chameleon mask Check for merge conflicts #187: Commit e5d05a9 pushed by Aurrain
November 19, 2024 01:09 38s master
master
November 19, 2024 01:09 38s
Loadout + Trait Changes + Sugar OD 'rework' (#276) Check for merge conflicts #186: Commit c12a2d2 pushed by Aurrain
November 19, 2024 00:10 39s master
master
November 19, 2024 00:10 39s
Map Fix: Upper Reallignment 2 (#280) Check for merge conflicts #185: Commit 0142dfe pushed by Aurrain
November 18, 2024 23:59 40s master
master
November 18, 2024 23:59 40s
NCR Trench Raider Returns (#269) Check for merge conflicts #184: Commit 827670d pushed by Aurrain
November 18, 2024 23:54 40s master
master
November 18, 2024 23:54 40s
Craftable cars rudimentary system + Makes all vechicles no longer pha… Check for merge conflicts #183: Commit ae055ad pushed by Aurrain
November 18, 2024 22:45 44s master
master
November 18, 2024 22:45 44s
Adds smithable Zweihander and Pike weapons (#238) Check for merge conflicts #182: Commit b7d52df pushed by Aurrain
November 15, 2024 08:56 41s master
master
November 15, 2024 08:56 41s
NCR and Legion event rewards (#259) Check for merge conflicts #181: Commit 8ca2966 pushed by Aurrain
November 15, 2024 08:47 43s master
master
November 15, 2024 08:47 43s
Overall base fixes and addition (#243) Check for merge conflicts #180: Commit c964b39 pushed by Aurrain
November 15, 2024 07:49 40s master
master
November 15, 2024 07:49 40s
Port of the Big Iron Paper Work + remove coyote folder round persista… Check for merge conflicts #179: Commit f8b1455 pushed by Aurrain
November 15, 2024 07:29 42s master
master
November 15, 2024 07:29 42s
Adds ID Card terminals in Towns (Eastwood and Locust point) (#257) Check for merge conflicts #178: Commit 00072e4 pushed by Aurrain
November 15, 2024 06:57 36s master
master
November 15, 2024 06:57 36s
Reverts: Voting (#273) Check for merge conflicts #177: Commit d233e70 pushed by Aurrain
November 15, 2024 06:28 38s master
master
November 15, 2024 06:28 38s
Language Organization + Addition (#270) Check for merge conflicts #176: Commit 45aad93 pushed by Aurrain
November 15, 2024 06:27 43s master
master
November 15, 2024 06:27 43s
turn jerry cans into very big molotovs (#261) Check for merge conflicts #175: Commit f30260f pushed by Aurrain
November 15, 2024 05:41 37s master
master
November 15, 2024 05:41 37s