From aee00dc4b589b4ea3ab898d788cb1fc31bcbf7dc Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 27 May 2016 00:36:50 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                      |  6 ++++
 html/changelogs/.all_changelog.yml       |  7 +++++
 html/changelogs/Yoshax - disablefaux.txt | 36 ------------------------
 3 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/Yoshax - disablefaux.txt

diff --git a/html/changelog.html b/html/changelog.html
index 82e7175c06..5f348af142 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 May 2016</h2>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new preference that allows you to disable fake nanoui styling on relevant windows. However, if it is your first time loading with this new preference you will need to save your character slot, as there is a problem with satanisiation and it believes the preference is set to disable the nanoui styling.</li>
+			</ul>
+
 			<h2 class="date">25 May 2016</h2>
 			<h3 class="author">Serithi updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index af31065fbe..091249c104 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2318,3 +2318,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       slots. You can also whip people with them for a special message and sound! In
       addition, using them in-hand will produce an emote where your towel yourself
       off.
+2016-05-27:
+  Yoshax:
+  - rscadd: Added a new preference that allows you to disable fake nanoui styling
+      on relevant windows. However, if it is your first time loading with this new
+      preference you will need to save your character slot, as there is a problem
+      with satanisiation and it believes the preference is set to disable the nanoui
+      styling.
diff --git a/html/changelogs/Yoshax - disablefaux.txt b/html/changelogs/Yoshax - disablefaux.txt
deleted file mode 100644
index fd022eeeb6..0000000000
--- a/html/changelogs/Yoshax - disablefaux.txt	
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Yoshax
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added a new preference that allows you to disable fake nanoui styling on relevant windows. However, if it is your first time loading with this new preference you will need to save your character slot, as there is a problem with satanisiation and it believes the preference is set to disable the nanoui styling."