diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 66fbd1d7196..3c86e1323d8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,13 +1,4 @@ Entries: -- author: luringens - changes: - - message: Prisoners are back! - type: Add - - message: Gladiators, prisoners and prison guards start the shift at their predesignated - locations. - type: Fix - id: 156 - time: '2023-12-06T15:54:37.0000000+00:00' - author: Tryded changes: - message: Added energy guns to dynamic protolathe emagable recipes. @@ -3714,3 +3705,10 @@ id: 655 time: '2024-11-07T20:07:57.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2126 +- author: deltanedas + changes: + - message: Merged this week's changes from upstream. + type: Add + id: 656 + time: '2024-11-07T20:09:26.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2090