Merge branch 'master' into unstable

Fansana · Nov 3, 2024 · 912fc58 · 912fc58
2 parents 879d0e6 + f1bcbab
commit 912fc58
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -871,9 +871,7 @@ Entries:
     - type: Add
       message: a collection of Passive Xenos
     - type: Add
-      message: >-
-        several New friendly Xeno experimental subjects much like
-        Friend-shaped.
+      message: several New friendly Xeno experimental subjects much like Friend-shaped.
   id: 119
   time: '2024-09-09T02:04:05.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/145
@@ -1335,3 +1333,14 @@ Entries:
   id: 179
   time: '2024-10-31T18:48:59.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/309
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: >-
+        Cocooners can now freely uncocoon any cocoons without the need of a
+        sharp object.
+    - type: Fix
+      message: Cocoon making you stuck in muffle accent.
+  id: 180
+  time: '2024-11-01T20:32:06.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/313