From f5d923095fab365b14d2c8a9da3dbbc51203d84b Mon Sep 17 00:00:00 2001
From: Lizbeth Rika <vazkii@hotmail.com>
Date: Tue, 16 Dec 2014 15:37:57 +0000
Subject: [PATCH] Build 142.

---
 build.properties   |  8 ++++----
 version/1.7.10.txt |  2 +-
 web/changelog.txt  | 10 ++++++++++
 web/versions.ini   |  3 ++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index b39fc964d..26f35b88f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,10 +1,10 @@
 #
-#Sun Dec 07 17:16:11 GMT 2014
+#Tue Dec 16 15:28:48 GMT 2014
 version=r1.3
 dir_forgecraft=D\:/Seafile/incoming/ForgeCraft1/mods
 dir_output=../Build Output/Botania/
-dir_repo=./
-forge_version=10.13.1.1217
 mc_version=1.7.10
-build_number=142
+forge_version=10.13.1.1217
+dir_repo=./
+build_number=143
 mod_name=Botania
diff --git a/version/1.7.10.txt b/version/1.7.10.txt
index 681487daa..3c7d7aed2 100644
--- a/version/1.7.10.txt
+++ b/version/1.7.10.txt
@@ -1 +1 @@
-r1.3-141
\ No newline at end of file
+r1.3-142
\ No newline at end of file
diff --git a/web/changelog.txt b/web/changelog.txt
index 17ed8cae1..a5dc01d4b 100644
--- a/web/changelog.txt
+++ b/web/changelog.txt
@@ -1,3 +1,13 @@
+r1.3 142
+*Added the Assembly Halo, a portable crafting solution.
+*Adding lava to the petal apothecary turns it into a brazier/incinerator.
+*Changed Hydroangeas' recipe to use Cyan petals rather than Light Blue ones.
+*Fixed the Signal Flare item crashing if an invalid color is loaded somehow.
+*Hydroangeas are now more dilligent at picking up water blocks.
+*INTENSIFIED GOLDFISH
+*Renamed a bunch of rods so they all are in the same name scheme and theme.
+*[API] Added aditional SubTileEntity interaction methods. onBlockPlacedBy(), onBlockActivated(), onBlockAdded(), onBlockHarvested() and getDrops() (LiamEarle)
+*[API] Increased version number to 25.
 r1.3 141
 *Added Alchemy recipes to break down Clay and Brick blocks.
 *Moved Terrasteel Armor hp boost values around so the amount is relative to the amount of materials used for crafting. Total is still 20.
diff --git a/web/versions.ini b/web/versions.ini
index ddb5aa63c..5515bcaa8 100644
--- a/web/versions.ini
+++ b/web/versions.ini
@@ -138,4 +138,5 @@ r1.3-137=1.7.10
 r1.3-138=1.7.10
 r1.3-139=1.7.10
 r1.3-140=1.7.10
-r1.3-141=1.7.10
\ No newline at end of file
+r1.3-141=1.7.10
+r1.3-142=1.7.10
\ No newline at end of file