Skip to content

Actions: aeternaclose/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
56 workflow runs
56 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add: Anti-epidemic equipment crate (#5842) Merge Conflict Detection #74: Commit d5523e9 pushed by aeternaclose
September 5, 2024 21:30 2m 14s master220
master220
September 5, 2024 21:30 2m 14s
Automatic changelog generation Merge Conflict Detection #73: Commit 4dff0f8 pushed by aeternaclose
August 5, 2024 19:31 2m 26s master220
master220
August 5, 2024 19:31 2m 26s
Automatic changelog generation Merge Conflict Detection #72: Commit f10796f pushed by aeternaclose
August 4, 2024 12:18 2m 15s master220
master220
August 4, 2024 12:18 2m 15s
Automatic changelog generation Merge Conflict Detection #71: Commit 9fe7170 pushed by aeternaclose
July 25, 2024 17:17 2m 16s master220
master220
July 25, 2024 17:17 2m 16s
add: Gib for pulse weaponry (#5426) Merge Conflict Detection #70: Commit 64a4bf5 pushed by aeternaclose
July 14, 2024 15:31 2m 12s master220
master220
July 14, 2024 15:31 2m 12s
tweak: lower slowed in shove. (#5334) Merge Conflict Detection #69: Commit 999111f pushed by aeternaclose
July 9, 2024 12:33 2m 12s master220
master220
July 9, 2024 12:33 2m 12s
[imageadd] fix mouse-ass anim (#5229) Merge Conflict Detection #68: Commit 34f3895 pushed by aeternaclose
June 16, 2024 19:42 2m 11s master220
master220
June 16, 2024 19:42 2m 11s
Automatic changelog generation Merge Conflict Detection #67: Commit 5b3df07 pushed by aeternaclose
June 3, 2024 14:15 2m 15s master220
master220
June 3, 2024 14:15 2m 15s
bugfix: No More Screams On Species Change (#5146) Merge Conflict Detection #66: Commit 70b145a pushed by aeternaclose
June 3, 2024 11:20 2m 15s master220
master220
June 3, 2024 11:20 2m 15s
Automatic changelog generation Merge Conflict Detection #65: Commit fd56867 pushed by aeternaclose
May 12, 2024 02:26 2m 12s master220
master220
May 12, 2024 02:26 2m 12s
bugfix: Icons for bola and shadowlings (#4963) Merge Conflict Detection #64: Commit be14c32 pushed by aeternaclose
April 25, 2024 12:33 2m 12s master220
master220
April 25, 2024 12:33 2m 12s
add: added cursed katana from TG (restored version) (#4660) Merge Conflict Detection #63: Commit 7393fb4 pushed by aeternaclose
April 23, 2024 22:28 2m 17s master220
master220
April 23, 2024 22:28 2m 17s
Add: gold Desert Eagle to badassery (#4917) Merge Conflict Detection #62: Commit 6c89a0a pushed by aeternaclose
April 22, 2024 15:15 2m 14s master220
master220
April 22, 2024 15:15 2m 14s
refactor: surgery's code polishing, few fixes and tweaks (#4436) Merge Conflict Detection #61: Commit 23de041 pushed by aeternaclose
April 12, 2024 18:36 2m 17s master220
master220
April 12, 2024 18:36 2m 17s
add: t3 donor backpacks (#4703) Merge Conflict Detection #60: Commit a8badb9 pushed by aeternaclose
April 7, 2024 13:46 2m 12s master220
master220
April 7, 2024 13:46 2m 12s
add: t3 donor night dresses (#4713) Merge Conflict Detection #59: Commit 1cc6675 pushed by aeternaclose
April 4, 2024 02:22 2m 13s master220
master220
April 4, 2024 02:22 2m 13s
refractor: Species defines in masses (#4771) Merge Conflict Detection #58: Commit 601a302 pushed by aeternaclose
April 2, 2024 23:51 2m 12s master220
master220
April 2, 2024 23:51 2m 12s
bugfix: Allowed robots interactions with chem dispensers. (#4764) Merge Conflict Detection #57: Commit 89137d3 pushed by aeternaclose
April 1, 2024 11:15 2m 12s master220
master220
April 1, 2024 11:15 2m 12s
bugfix: Borg Gripper hotfix (#4730) Merge Conflict Detection #56: Commit dd5b38b pushed by aeternaclose
March 30, 2024 17:46 2m 11s master220
master220
March 30, 2024 17:46 2m 11s
add: Gorillas to Cyberiad & Cerestation (#4664) Merge Conflict Detection #55: Commit de8a785 pushed by aeternaclose
March 29, 2024 05:24 2m 11s master220
master220
March 29, 2024 05:24 2m 11s
Automatic changelog generation Merge Conflict Detection #54: Commit e9da428 pushed by aeternaclose
March 22, 2024 22:08 2m 11s master220
master220
March 22, 2024 22:08 2m 11s
Automatic changelog generation Merge Conflict Detection #53: Commit 61f0de2 pushed by aeternaclose
March 20, 2024 13:48 2m 11s master220
master220
March 20, 2024 13:48 2m 11s
tweak: Gorilla Tweaks (#4571) Merge Conflict Detection #52: Commit 5b8943b pushed by aeternaclose
March 13, 2024 13:40 2m 13s master220
master220
March 13, 2024 13:40 2m 13s
bugfix: Mousedropping into inventory screen elements now considered t… Merge Conflict Detection #51: Commit b683f2a pushed by aeternaclose
March 9, 2024 09:44 2m 11s master220
master220
March 9, 2024 09:44 2m 11s
Automatic changelog generation Merge Conflict Detection #50: Commit 3ce6c7f pushed by aeternaclose
March 7, 2024 20:04 2m 10s master220
master220
March 7, 2024 20:04 2m 10s