Skip to content

Actions: Fordoxia/CRUNCHParadise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
88 workflow runs
88 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'ParadiseSS13:master' into master Merge Conflict Detection #38: Commit 698345a pushed by Fordoxia
June 3, 2024 03:01 31s master
master
June 3, 2024 03:01 31s
And reverting yet again Merge Conflict Detection #37: Commit 3b72ab8 pushed by Fordoxia
June 3, 2024 01:51 29s master
master
June 3, 2024 01:51 29s
Fixes a runtime with atmos nanofrost tanks and smoke_spread (#25741) Merge Conflict Detection #36: Commit c709050 pushed by Fordoxia
June 3, 2024 01:46 31s master
master
June 3, 2024 01:46 31s
prevents funny things from happening (#25705) Merge Conflict Detection #35: Commit 3c94c68 pushed by Fordoxia
May 31, 2024 00:02 32s master
master
May 31, 2024 00:02 32s
Update food.dmi (#25693) Merge Conflict Detection #34: Commit 62f1abb pushed by Fordoxia
May 30, 2024 00:26 31s master
master
May 30, 2024 00:26 31s
Adjusted arguments for use_tool (#25662) Merge Conflict Detection #33: Commit b7aa472 pushed by Fordoxia
May 29, 2024 00:38 27s master
master
May 29, 2024 00:38 27s
Fix undestrictible armor from attachable armor (#25608) Merge Conflict Detection #32: Commit 094d7bd pushed by Fordoxia
May 28, 2024 01:17 30s master
master
May 28, 2024 01:17 30s
Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise Merge Conflict Detection #31: Commit b819961 pushed by Fordoxia
May 25, 2024 13:55 31s master
master
May 25, 2024 13:55 31s
Fix admin PMs not working from discord (#25604) Merge Conflict Detection #30: Commit 67a8a34 pushed by Fordoxia
May 25, 2024 13:55 29s master
master
May 25, 2024 13:55 29s
i swear to god (#25506) Merge Conflict Detection #29: Commit 2ac2dbc pushed by Fordoxia
May 17, 2024 23:03 30s master
master
May 17, 2024 23:03 30s
Made turf contents listing more performant. (#25188) Merge Conflict Detection #28: Commit 9fa5fbb pushed by Fordoxia
May 12, 2024 13:37 30s master
master
May 12, 2024 13:37 30s
fixing detaining mode (#25334) Merge Conflict Detection #27: Commit 9f7d4a1 pushed by Fordoxia
May 5, 2024 19:44 30s master
master
May 5, 2024 19:44 30s
Makes mentor PMs show up as mentor PMs again (#25351) Merge Conflict Detection #26: Commit 5040dc2 pushed by Fordoxia
May 3, 2024 00:24 31s master
master
May 3, 2024 00:24 31s
Moves a custom item to the right file (#25325) Merge Conflict Detection #25: Commit a2e7d95 pushed by Fordoxia
May 1, 2024 03:00 32s master
master
May 1, 2024 03:00 32s
Add ventcrawl unit-test (#24830) Merge Conflict Detection #24: Commit ec2c563 pushed by Fordoxia
April 30, 2024 02:44 30s master
master
April 30, 2024 02:44 30s
fixes tarot card capitalization in uplink (#25278) Merge Conflict Detection #23: Commit 7ab24d6 pushed by Fordoxia
April 26, 2024 21:41 30s master
master
April 26, 2024 21:41 30s
whoops (#25268) Merge Conflict Detection #22: Commit 5b8ae44 pushed by Fordoxia
April 26, 2024 15:23 28s master
master
April 26, 2024 15:23 28s
Fixes Cerestation Medical Storage disposals bin, also simplifies disp… Merge Conflict Detection #21: Commit 67cba07 pushed by Fordoxia
April 23, 2024 02:21 29s master
master
April 23, 2024 02:21 29s
Update CONTRIBUTING.md (#25235) Merge Conflict Detection #20: Commit f12f75c pushed by Fordoxia
April 22, 2024 00:52 28s master
master
April 22, 2024 00:52 28s
oops (#25210) Merge Conflict Detection #19: Commit 4f8d91a pushed by Fordoxia
April 21, 2024 20:51 34s master
master
April 21, 2024 20:51 34s
NanoMap Auto-Update (Fri Apr 19 01:10:35 UTC 2024) (#25187) Merge Conflict Detection #18: Commit 79e957b pushed by Fordoxia
April 20, 2024 00:54 35s master
master
April 20, 2024 00:54 35s
ORM points are now claimed by swiping IDs rather than inserting it (#… Merge Conflict Detection #17: Commit 950ce9f pushed by Fordoxia
April 18, 2024 13:40 40s master
master
April 18, 2024 13:40 40s
fix for the worlds shittiest exploit (#25130) Merge Conflict Detection #16: Commit 95efc8f pushed by Fordoxia
April 14, 2024 23:03 35s master
master
April 14, 2024 23:03 35s
Evil Cyborgs - Non-Engineer Emag/Malf Modules (#24638) Merge Conflict Detection #15: Commit 41469cf pushed by Fordoxia
April 13, 2024 15:54 32s master
master
April 13, 2024 15:54 32s
Made storage nesting better, improved consistency between storage typ… Merge Conflict Detection #14: Commit fe74786 pushed by Fordoxia
April 11, 2024 01:40 33s master
master
April 11, 2024 01:40 33s