From 438a3a2978635abe98cbdc156d389a7a8c86cfac Mon Sep 17 00:00:00 2001
From: Dylan <dyl@tfwno.gf>
Date: Fri, 18 Mar 2016 11:17:56 +1100
Subject: [PATCH 1/2] Changelog

---
 1.6.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/1.6.md b/1.6.md
index a24f5bc3..0639de8e 100644
--- a/1.6.md
+++ b/1.6.md
@@ -1 +1,13 @@
 # Neofetch 1.6
+
+### Contributers
+
+Thanks to the following people for contributing this release.
+
+- **[@dawidd6](https://github.com/dawidd6)**
+- **[@onodera-punpun](https://github.com/onodera-punpun)**
+
+### Info
+
+**OS**<br \>
+- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)**

From 913e14a8ae224a72401134310e82e5f46ec2f8dd Mon Sep 17 00:00:00 2001
From: Andrew Titmuss <andrew@coffeetocode.me>
Date: Mon, 21 Mar 2016 12:19:52 +1100
Subject: [PATCH 2/2] added OS X support, fixed capitalisation

---
 neofetch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/neofetch b/neofetch
index e4542966..43a0aad8 100755
--- a/neofetch
+++ b/neofetch
@@ -1580,7 +1580,7 @@ getbattery () {
                         return
                     fi
 						if [ $power_status = "Charging" ]; then
-		                battery="${batteries[0]}% ${power_status}"
+		                battery="${batteries[0]}% Charging"
 		                else
 		                battery="${batteries[0]}%"
 		                fi
@@ -1596,7 +1596,7 @@ getbattery () {
             		power_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')
             		
             		if [ $power_status = "charging" ]; then
-                    battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') $power_status"
+                    battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging"
                     else
                     battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
                     fi
@@ -1621,6 +1621,10 @@ getbattery () {
 
         "Mac OS X")
             battery="$(pmset -g batt | grep -o '[0-9]*%')"
+            power_status="$(pmset -g batt | awk 'NR==2 {print $3}')"
+            if [ "$power_status" == "charging;" ]; then
+                battery="${battery} Charging"
+            fi
         ;;
 
         "Windows")