From da15b44e32edd906c925fd24fa6245033c514963 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 25 Aug 2014 20:52:32 +0100 Subject: [PATCH] Build 105 --- build.properties | 4 ++-- version/1.7.10.txt | 2 +- version/1.7.2.txt | 2 +- web/changelog.txt | 6 ++++++ web/versions.ini | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index d3d030535..65ffd2dcb 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ -#Sun, 24 Aug 2014 18:35:22 +0100 +#Mon, 25 Aug 2014 20:48:57 +0100 version=r1.2 -build_number=105 +build_number=106 mc_version=1.7.2 mod_name=Botania dir.repo=./ diff --git a/version/1.7.10.txt b/version/1.7.10.txt index 2c0bbc5cb..e7b92abab 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.2-104 \ No newline at end of file +r1.2-105 \ No newline at end of file diff --git a/version/1.7.2.txt b/version/1.7.2.txt index 2c0bbc5cb..e7b92abab 100644 --- a/version/1.7.2.txt +++ b/version/1.7.2.txt @@ -1 +1 @@ -r1.2-104 \ No newline at end of file +r1.2-105 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index b636f3048..e5210dccc 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,9 @@ +r1.2 105 +*Added the Rod of Divining. +*Fixed an exploit with Sparks where a dominant one can pull from others if the upgrade is added a posteriori. (mattcr11) +*Fixed another Spark related crash. (mattcr11) +*If you're a goldfish, you get a new thing. +*Since Warp was such a success, if you have Thaumcraft loaded, you'll now have Wrap too. r1.2 104 *Added the Horn of the Canopy. It breaks leaves. Look for it in the Horn of the Wild entry. *Fixed server crash. And this, ladies and gentleman, is why you don't trust pull requested code. diff --git a/web/versions.ini b/web/versions.ini index 2b834f36e..25eff0a6a 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -101,4 +101,5 @@ r1.1-100=1.7.2 r1.2-101=1.7.2 r1.2-102=1.7.2 r1.2-103=1.7.2 -r1.2-104=1.7.2 \ No newline at end of file +r1.2-104=1.7.2 +r1.2-105=1.7.2 \ No newline at end of file