Skip to content

Actions: Artea-Station/Artea-Station-Server

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
192 workflow runs
192 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

RBMK Power Buff + Bug Fixes and Heat Sink (#564) Check for merge conflicts #482: Commit 554ec77 pushed by RimiNosha
December 23, 2024 01:54 42s master
master
December 23, 2024 01:54 42s
Automatic TGS DMAPI Update (#620) Check for merge conflicts #481: Commit c165d48 pushed by RimiNosha
December 23, 2024 01:53 26s master
master
December 23, 2024 01:53 26s
External Lib Fix-Ups (#622) Check for merge conflicts #480: Commit b9bc840 pushed by RimiNosha
December 23, 2024 01:31 28s master
master
December 23, 2024 01:31 28s
Health Analyzer Rework (#618) Check for merge conflicts #479: Commit b9bb694 pushed by RimiNosha
December 23, 2024 01:23 1m 44s master
master
December 23, 2024 01:23 1m 44s
Fix Runtime Related to Balloon Alerts (#619) Check for merge conflicts #478: Commit f6eed4c pushed by RimiNosha
December 14, 2024 15:29 30s master
master
December 14, 2024 15:29 30s
Change Internals Breathing Sound (#617) Check for merge conflicts #477: Commit ff5ce5a pushed by RimiNosha
October 30, 2024 13:55 38s master
master
October 30, 2024 13:55 38s
Fix A Really Bad Line Of Code (#615) Check for merge conflicts #476: Commit c104a0d pushed by RimiNosha
October 29, 2024 22:21 30s master
master
October 29, 2024 22:21 30s
Make All Tails Waggable (#616) Check for merge conflicts #475: Commit ae7ea5e pushed by RimiNosha
October 29, 2024 22:20 49s master
master
October 29, 2024 22:20 49s
Fix Railings Having The Wrong Layer (#614) Check for merge conflicts #474: Commit 1c7c864 pushed by RimiNosha
October 29, 2024 16:56 41s master
master
October 29, 2024 16:56 41s
[1984] No fun allowed PR (Holiday removal) (#607) Check for merge conflicts #473: Commit c764dd4 pushed by RimiNosha
October 7, 2024 21:28 37s master
master
October 7, 2024 21:28 37s
Job renames + Department security removal + Belryth jobslots (#610) Check for merge conflicts #472: Commit 50f372e pushed by QuacksQ
October 6, 2024 17:02 35s master
master
October 6, 2024 17:02 35s
[PORT] Bloom, Glare and exposure from TauCeti (#605) Check for merge conflicts #471: Commit 06187e9 pushed by QuacksQ
October 5, 2024 17:20 35s master
master
October 5, 2024 17:20 35s
Automatic TGS DMAPI Update (#609) Check for merge conflicts #470: Commit 0c1f3a2 pushed by RimiNosha
October 5, 2024 15:17 2m 33s master
master
October 5, 2024 15:17 2m 33s
[PORT] Droning Subsystem (#596) Check for merge conflicts #469: Commit 7d9a36b pushed by QuacksQ
October 5, 2024 15:16 1m 46s master
master
October 5, 2024 15:16 1m 46s
[PORT] The recoilening (#589) Check for merge conflicts #468: Commit 2c8e94d pushed by QuacksQ
October 5, 2024 15:14 1m 56s master
master
October 5, 2024 15:14 1m 56s
[PORT] Cooler bullets (#595) Check for merge conflicts #467: Commit 3d22414 pushed by QuacksQ
October 5, 2024 15:14 1m 14s master
master
October 5, 2024 15:14 1m 14s
Removes exploration drones (#603) Check for merge conflicts #466: Commit cdef932 pushed by QuacksQ
October 5, 2024 15:12 57s master
master
October 5, 2024 15:12 57s
[Port] EFN Noise filter (#604) Check for merge conflicts #465: Commit ee79470 pushed by QuacksQ
October 5, 2024 15:10 36s master
master
October 5, 2024 15:10 36s
Overmap resprite (#606) Check for merge conflicts #464: Commit e4e46c8 pushed by QuacksQ
October 5, 2024 15:08 43s master
master
October 5, 2024 15:08 43s
Belryth Tweaks and other changes (#601) Check for merge conflicts #463: Commit 907023c pushed by RimiNosha
August 25, 2024 17:52 26s master
master
August 25, 2024 17:52 26s
Automatic TGS DMAPI Update (#608) Check for merge conflicts #462: Commit 1f90b7f pushed by RimiNosha
August 17, 2024 07:47 39s master
master
August 17, 2024 07:47 39s
Disable stalebot, school holiday workload and other projects are eati… Check for merge conflicts #461: Commit 22d3c09 pushed by RimiNosha
August 3, 2024 17:54 40s master
master
August 3, 2024 17:54 40s
Wall Integrity buff (#602) Check for merge conflicts #460: Commit 496787e pushed by RimiNosha
July 1, 2024 00:39 2m 13s master
master
July 1, 2024 00:39 2m 13s
Removes the Intern announcer station trait (#600) Check for merge conflicts #459: Commit 5504002 pushed by RimiNosha
July 1, 2024 00:39 2m 24s master
master
July 1, 2024 00:39 2m 24s
Removes the rotting remains of Icebox (#599) Check for merge conflicts #458: Commit a29a80d pushed by RimiNosha
July 1, 2024 00:38 38s master
master
July 1, 2024 00:38 38s