Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
487 workflow runs
487 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add honkertron to the immortal list (#979) Check for merge conflicts #713: Commit 5e97596 pushed by Kapu1178
June 9, 2024 22:52 47s master
master
June 9, 2024 22:52 47s
fix juke (#977) Check for merge conflicts #712: Commit 0d21740 pushed by Kapu1178
June 8, 2024 20:16 38s master
master
June 8, 2024 20:16 38s
fixes (#975) Check for merge conflicts #711: Commit 40ae0d7 pushed by Kapu1178
June 8, 2024 17:06 49s master
master
June 8, 2024 17:06 49s
Station Maps (#974) Check for merge conflicts #710: Commit f62e4e7 pushed by Kapu1178
June 7, 2024 18:36 51s master
master
June 7, 2024 18:36 51s
Grab debugging and bug fix (#944) Check for merge conflicts #709: Commit 1b654a7 pushed by Kapu1178
June 7, 2024 18:35 32s master
master
June 7, 2024 18:35 32s
tgui: bandaid for ntos window (#973) Check for merge conflicts #708: Commit 8815adc pushed by Kapu1178
June 7, 2024 18:35 50s master
master
June 7, 2024 18:35 50s
Fixes tgui kitchensink and singularity hammer (#972) Check for merge conflicts #707: Commit 674fd30 pushed by Kapu1178
June 5, 2024 06:46 42s master
master
June 5, 2024 06:46 42s
tgui: dependency updates (#971) Check for merge conflicts #706: Commit 2006fa2 pushed by Kapu1178
June 5, 2024 05:47 36s master
master
June 5, 2024 05:47 36s
tgui v5: react port (#964) Check for merge conflicts #705: Commit 159be1f pushed by Kapu1178
June 4, 2024 22:10 38s master
master
June 4, 2024 22:10 38s
Backport DMIcon and Image classes to Inferno (#937) Check for merge conflicts #704: Commit 4318100 pushed by Kapu1178
June 4, 2024 04:36 35s master
master
June 4, 2024 04:36 35s
Renames jsx files to jsx (#970) Check for merge conflicts #703: Commit 4a412d6 pushed by Kapu1178
June 4, 2024 01:15 38s master
master
June 4, 2024 01:15 38s
tgui: ie11 only + esbuild (#965) Check for merge conflicts #702: Commit 9dd14bc pushed by Kapu1178
June 3, 2024 01:05 37s master
master
June 3, 2024 01:05 37s
potatoopts (#960) Check for merge conflicts #701: Commit 3df280a pushed by francinum
June 2, 2024 22:19 26s master
master
June 2, 2024 22:19 26s
Cleanup PlaceOnBottom (#954) Check for merge conflicts #700: Commit eb33f0a pushed by francinum
June 2, 2024 22:19 44s master
master
June 2, 2024 22:19 44s
context cleanup (#968) Check for merge conflicts #699: Commit bfb1053 pushed by Kapu1178
June 2, 2024 21:44 51s master
master
June 2, 2024 21:44 51s
fix (#957) Check for merge conflicts #698: Commit 3249bc6 pushed by Kapu1178
June 1, 2024 04:25 47s master
master
June 1, 2024 04:25 47s
Fixes TGUI Dev & Minor juke issue (#959) Check for merge conflicts #697: Commit 3559fa2 pushed by Kapu1178
May 28, 2024 08:21 42s master
master
May 28, 2024 08:21 42s
Removes context from tgui (#947) Check for merge conflicts #696: Commit 6ee3b4e pushed by Kapu1178
May 28, 2024 07:52 36s master
master
May 28, 2024 07:52 36s
Adds prettier (#948) Check for merge conflicts #695: Commit 1ba98dd pushed by Kapu1178
May 27, 2024 21:24 35s master
master
May 27, 2024 21:24 35s
right click locks the air alarm (#961) Check for merge conflicts #694: Commit 79beb27 pushed by Kapu1178
May 25, 2024 21:05 37s master
master
May 25, 2024 21:05 37s
mutation bug (#958) Check for merge conflicts #693: Commit 412ec61 pushed by Kapu1178
May 24, 2024 05:46 52s master
master
May 24, 2024 05:46 52s
zebratgui (#956) Check for merge conflicts #692: Commit 76bc854 pushed by Kapu1178
May 24, 2024 05:10 36s master
master
May 24, 2024 05:10 36s
fix fire overlay bug (#955) Check for merge conflicts #691: Commit cc316ae pushed by Kapu1178
May 24, 2024 05:05 51s master
master
May 24, 2024 05:05 51s
cache paintings (#953) Check for merge conflicts #690: Commit b9d3504 pushed by Kapu1178
May 24, 2024 04:56 40s master
master
May 24, 2024 04:56 40s
emissive alpha (#951) Check for merge conflicts #689: Commit 2f8b605 pushed by Kapu1178
May 24, 2024 04:43 40s master
master
May 24, 2024 04:43 40s