From bdd58ea0c984d3e4345d5a9e1cc498c8164ecaf2 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Thu, 17 May 2018 22:39:39 +0300
Subject: [PATCH] Changelogs, 17MAY2018

---
 html/changelog.html                          | 10 ++++++
 html/changelogs/.all_changelog.yml           |  6 ++++
 html/changelogs/Changelog - Bahamalizard.yml | 37 --------------------
 html/changelogs/Sindorman-bugfixes.yml       |  6 ----
 4 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/Changelog - Bahamalizard.yml
 delete mode 100644 html/changelogs/Sindorman-bugfixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index fa46bf0d67c..24ad3271ea3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 May 2018</h2>
+			<h3 class="author">Kaedwuff updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The bahama lizard recipe has been fixed to now actually be craftable. It now requires only lemon juice, ice, cream, and xuizi juice.</li>
+			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Wizard disable technology spell no longer affects the caster.</li>
+			</ul>
+
 			<h2 class="date">14 May 2018</h2>
 			<h3 class="author">BurgerBB updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e07c49c3dcb..6adb2ab0bda 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5490,3 +5490,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       user-friendly.
   - maptweak: Tweaked the layout of Hydroponics and added an actual seed storage for
       excess seeds.
+2018-05-17:
+  Kaedwuff:
+  - bugfix: The bahama lizard recipe has been fixed to now actually be craftable.
+      It now requires only lemon juice, ice, cream, and xuizi juice.
+  PoZe:
+  - bugfix: Wizard disable technology spell no longer affects the caster.
diff --git a/html/changelogs/Changelog - Bahamalizard.yml b/html/changelogs/Changelog - Bahamalizard.yml
deleted file mode 100644
index 0f02b70a85a..00000000000
--- a/html/changelogs/Changelog - Bahamalizard.yml	
+++ /dev/null
@@ -1,37 +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
-#   balance
-#################################
-
-# Your name.  
-author: Kaedwuff
-
-# 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: 
-  - bugfix: "The bahama lizard recipe has been fixed to now actually be craftable. It now requires only lemon juice, ice, cream, and xuizi juice."
\ No newline at end of file
diff --git a/html/changelogs/Sindorman-bugfixes.yml b/html/changelogs/Sindorman-bugfixes.yml
deleted file mode 100644
index 1eff5a7f539..00000000000
--- a/html/changelogs/Sindorman-bugfixes.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: PoZe
-
-delete-after: True
-
-changes:
-  - bugfix: "Wizard disable technology spell no longer affects the caster."