Skip to content

Actions: WolfLox/Lamp-Lover

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
50 workflow runs
50 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bugfix: Resolves test errors for idlenpcpool (#6234) Merge Conflict Detection #83: Commit f865651 pushed by WolfLox
December 7, 2024 17:42 15s master220
master220
December 7, 2024 17:42 15s
tweak: Ninja can apply patches (#6015) Merge Conflict Detection #82: Commit b295619 pushed by WolfLox
November 16, 2024 18:30 13s master220
master220
November 16, 2024 18:30 13s
add: Titlescreen optimization for dreamseeker debug mode (#6148) Merge Conflict Detection #81: Commit 052bd39 pushed by WolfLox
November 9, 2024 15:30 10s master220
master220
November 9, 2024 15:30 10s
add: vampire sucking effects (#6029) Merge Conflict Detection #80: Commit 6ae3935 pushed by WolfLox
November 7, 2024 17:52 2m 12s master220
master220
November 7, 2024 17:52 2m 12s
add/bugfix: earrings (#6066) Merge Conflict Detection #79: Commit afd2d93 pushed by WolfLox
October 28, 2024 20:08 2m 15s master220
master220
October 28, 2024 20:08 2m 15s
tweak: Traitor job ban not affect ert (#5966) Merge Conflict Detection #78: Commit b8cc7e3 pushed by WolfLox
October 1, 2024 17:49 11s master220
master220
October 1, 2024 17:49 11s
add: 1643 compatibility patch (#5866) Merge Conflict Detection #77: Commit 0d07c48 pushed by WolfLox
September 9, 2024 17:33 12s master220
master220
September 9, 2024 17:33 12s
Automatic changelog generation Merge Conflict Detection #76: Commit 972f461 pushed by WolfLox
September 8, 2024 11:29 11s master220
master220
September 8, 2024 11:29 11s
Add: Anti-epidemic equipment crate (#5842) Merge Conflict Detection #75: Commit d5523e9 pushed by WolfLox
September 3, 2024 21:13 14s master220
master220
September 3, 2024 21:13 14s
bugfix: stop lobby music played by tgui panel (#5803) Merge Conflict Detection #74: Commit 59b2a65 pushed by WolfLox
August 25, 2024 10:29 13s master220
master220
August 25, 2024 10:29 13s
bugfix: Storage Afterattack Fix (#5791) Merge Conflict Detection #73: Commit 7e77649 pushed by WolfLox
August 23, 2024 17:36 14s master220
master220
August 23, 2024 17:36 14s
Automatic changelog generation Merge Conflict Detection #72: Commit f10796f pushed by WolfLox
August 4, 2024 12:34 2m 10s master220
master220
August 4, 2024 12:34 2m 10s
port: chem master (#5469) Merge Conflict Detection #71: Commit e3143f7 pushed by WolfLox
July 28, 2024 10:43 2m 12s master220
master220
July 28, 2024 10:43 2m 12s
imageadd: New lavaland eee-rock (#5250) Merge Conflict Detection #70: Commit f781972 pushed by WolfLox
June 23, 2024 21:28 10s master220
master220
June 23, 2024 21:28 10s
bugfix: Minor Fixes Collection (#5153) Merge Conflict Detection #69: Commit 16a6646 pushed by WolfLox
June 11, 2024 19:53 12s master220
master220
June 11, 2024 19:53 12s
refactor: (porting) new rust-g mapgen from TG (#4780) Merge Conflict Detection #68: Commit a195390 pushed by WolfLox
May 18, 2024 09:56 2m 10s master220
master220
May 18, 2024 09:56 2m 10s
refactor: No Transform Trait (#4961) Merge Conflict Detection #67: Commit cb1a832 pushed by WolfLox
May 10, 2024 18:05 12s master220
master220
May 10, 2024 18:05 12s
balance: Cargo quests, garbage disposal and price balance 2 (#5023) Merge Conflict Detection #66: Commit 66beb31 pushed by WolfLox
May 10, 2024 14:45 12s master220
master220
May 10, 2024 14:45 12s
add: Light system rework (#5001) Merge Conflict Detection #65: Commit c849eca pushed by WolfLox
May 10, 2024 14:12 12s master220
master220
May 10, 2024 14:12 12s
bugfix: Atmos themes are now rendered correctly (#5008) Merge Conflict Detection #64: Commit 32e1a41 pushed by WolfLox
May 4, 2024 14:00 9s master220
master220
May 4, 2024 14:00 9s
add: Borer sneak mode (#4982) Merge Conflict Detection #63: Commit 206d7f9 pushed by WolfLox
April 29, 2024 09:34 10s master220
master220
April 29, 2024 09:34 10s
tweak: poncho loadout update (#4910) Merge Conflict Detection #62: Commit 86a055b pushed by WolfLox
April 20, 2024 22:30 2m 11s master220
master220
April 20, 2024 22:30 2m 11s
bugix: Delta tube fix and remove chemical spray (#4876) Merge Conflict Detection #61: Commit 622399c pushed by WolfLox
April 14, 2024 08:32 2m 10s master220
master220
April 14, 2024 08:32 2m 10s
refactor: surgery's code polishing, few fixes and tweaks (#4436) Merge Conflict Detection #60: Commit 23de041 pushed by WolfLox
April 12, 2024 20:38 9s master220
master220
April 12, 2024 20:38 9s
balance: update for ballictic armor in security armory (#4810) Merge Conflict Detection #59: Commit eae78c9 pushed by WolfLox
April 9, 2024 18:53 14s master220
master220
April 9, 2024 18:53 14s