From f7ea017bc2e0c58f8691cdce451ffddd651fd7a3 Mon Sep 17 00:00:00 2001
From: MagmaRam <drpepper42yes@gmail.com>
Date: Thu, 30 Mar 2017 19:41:14 -0500
Subject: [PATCH] Changelog update

---
 html/changelog.html                           | 10 ++++++
 html/changelogs/.all_changelog.yml            |  5 +++
 .../MagmaRam - Borgs and Grinders.yml         | 36 -------------------
 html/changelogs/example - Copy.yml            | 36 -------------------
 4 files changed, 15 insertions(+), 72 deletions(-)
 delete mode 100644 html/changelogs/MagmaRam - Borgs and Grinders.yml
 delete mode 100644 html/changelogs/example - Copy.yml

diff --git a/html/changelog.html b/html/changelog.html
index 068437c9d5b..83e24ec6bf8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">30 March 2017</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Italics in chat are now trigged with | , rather than / .</li>
+			</ul>
+			<h3 class="author">MagmaRam updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Borgs and assorted robits can now use grinders in chemistry and the kitchen.</li>
+			</ul>
+
 			<h2 class="date">28 March 2017</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 274ba4b576d..7e2a3c8da6e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3344,3 +3344,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Tajaran are more vulnerable to flashes.
   - tweak: Unathi have less brute resist, but some burn resist.
   - tweak: Unathi gender is now unclear to non-Unathi.
+2017-03-30:
+  Anewbe:
+  - tweak: Italics in chat are now trigged with | , rather than / .
+  MagmaRam:
+  - bugfix: Borgs and assorted robits can now use grinders in chemistry and the kitchen.
diff --git a/html/changelogs/MagmaRam - Borgs and Grinders.yml b/html/changelogs/MagmaRam - Borgs and Grinders.yml
deleted file mode 100644
index bb9294654ac..00000000000
--- a/html/changelogs/MagmaRam - Borgs and Grinders.yml	
+++ /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: MagmaRam
-
-# 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: "Borgs and assorted robits can now use grinders in chemistry and the kitchen."
diff --git a/html/changelogs/example - Copy.yml b/html/changelogs/example - Copy.yml
deleted file mode 100644
index 2649ca65e37..00000000000
--- a/html/changelogs/example - Copy.yml	
+++ /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: Anewbe
-
-# 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: 
-  - tweak: "Italics in chat are now trigged with | , rather than / ."
\ No newline at end of file