Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
151 workflow runs
151 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Mech additions(3 weapons, new chassis, fixes) (#8463) Check for merge conflicts #1558: Commit 8343bc5 pushed by TheShown911
April 12, 2024 18:44 43s master
master
April 12, 2024 18:44 43s
Jesse, it's time to cook (Fundamental Cooking Rework) (#8404) Check for merge conflicts #1557: Commit ba4ed77 pushed by TheShown911
April 12, 2024 18:03 46s master
master
April 12, 2024 18:03 46s
Removes: Mech Armor, Adds: Mech armor to Mech Components (#8405) Check for merge conflicts #1556: Commit 06011bf pushed by hyperioo
April 5, 2024 18:02 47s master
master
April 5, 2024 18:02 47s
Update recipes.dm (#8464) Check for merge conflicts #1555: Commit cc4d43f pushed by TheShown911
March 28, 2024 22:45 37s master
master
March 28, 2024 22:45 37s
Adds the other 3 40 milll rounds (#8455) Check for merge conflicts #1554: Commit c20970a pushed by TheShown911
March 28, 2024 22:42 38s master
master
March 28, 2024 22:42 38s
Slime fix (#8465) Check for merge conflicts #1553: Commit f7e124b pushed by TheShown911
March 28, 2024 22:32 38s master
master
March 28, 2024 22:32 38s
Updates: Material Icons (#8462) Check for merge conflicts #1552: Commit ebf7936 pushed by hyperioo
March 22, 2024 18:37 30s master
master
March 22, 2024 18:37 30s
Resprite thermals goggles (#8458) Check for merge conflicts #1551: Commit 01388e5 pushed by hyperioo
March 22, 2024 18:36 48s master
master
March 22, 2024 18:36 48s
Better shelter 2: Bluespace boogaloo (#8314) Check for merge conflicts #1550: Commit 680e95a pushed by TheShown911
March 15, 2024 20:01 41s master
master
March 15, 2024 20:01 41s
fixes two errors in ammo code (#8460) Check for merge conflicts #1549: Commit 2884e19 pushed by TheShown911
March 15, 2024 19:52 49s master
master
March 15, 2024 19:52 49s
updated Eswords (#8454) Check for merge conflicts #1548: Commit 863d881 pushed by hyperioo
March 8, 2024 19:04 36s master
master
March 8, 2024 19:04 36s
Update meson/science/thermal overlay (#8452) Check for merge conflicts #1547: Commit 3d2a0d1 pushed by hyperioo
March 8, 2024 19:01 37s master
master
March 8, 2024 19:01 37s
Bonsai size fix (#8451) Check for merge conflicts #1546: Commit 56ddfb3 pushed by hyperioo
March 8, 2024 18:57 37s master
master
March 8, 2024 18:57 37s
Maint decorated: graffitis (#8450) Check for merge conflicts #1545: Commit 9daa608 pushed by hyperioo
March 8, 2024 18:55 36s master
master
March 8, 2024 18:55 36s
Rename Scabbard, Hardcases (#8449) Check for merge conflicts #1544: Commit 30eb732 pushed by hyperioo
March 8, 2024 18:54 40s master
master
March 8, 2024 18:54 40s
Massively increases health of stairs (#8447) Check for merge conflicts #1543: Commit 5aaf11c pushed by hyperioo
March 8, 2024 18:49 44s master
master
March 8, 2024 18:49 44s
visible Z8 bulldog when wielded (#8446) Check for merge conflicts #1542: Commit 1000d51 pushed by hyperioo
March 8, 2024 18:46 39s master
master
March 8, 2024 18:46 39s
Maintenance Cigarettes (#8438) Check for merge conflicts #1541: Commit 62d5d3b pushed by hyperioo
March 8, 2024 18:39 38s master
master
March 8, 2024 18:39 38s
Module cleansing (#8431) Check for merge conflicts #1540: Commit a4b65f3 pushed by hyperioo
March 8, 2024 18:37 38s master
master
March 8, 2024 18:37 38s
Reduce Potency Explosive Effectiveness (#8445) Check for merge conflicts #1539: Commit f26fed0 pushed by hyperioo
March 1, 2024 19:19 39s master
master
March 1, 2024 19:19 39s
Kills GUILD's LATEST monetary scheme (#8443) Check for merge conflicts #1538: Commit 749077a pushed by hyperioo
March 1, 2024 19:14 27s master
master
March 1, 2024 19:14 27s
Batteryrack icon fix (#8442) Check for merge conflicts #1537: Commit 8b34cdc pushed by hyperioo
March 1, 2024 19:13 43s master
master
March 1, 2024 19:13 43s
Check for merge conflicts Check for merge conflicts #1536: by hyperioo
February 23, 2024 19:10 43s master
master
February 23, 2024 19:10 43s
Check for merge conflicts Check for merge conflicts #1535: by hyperioo
February 23, 2024 19:10 44s master
master
February 23, 2024 19:10 44s
Bonsai animation and gong (#8437) Check for merge conflicts #1534: Commit 4a8dedb pushed by hyperioo
February 22, 2024 21:17 39s master
master
February 22, 2024 21:17 39s