diff --git a/build.gradle b/build.gradle index deac2fb72..bb3bf0b85 100644 --- a/build.gradle +++ b/build.gradle @@ -180,14 +180,6 @@ task sort(type: Delete) { // This is the upload task from the build.xml task upload() << { - scp('/files') { - fileset(file: jar.archivePath) - } - - scp('/files/deobf') { - fileset(file: deobfJar.archivePath) - } - scp('/') { fileset(file: 'web/changelog.txt') fileset(file: 'web/versions.ini') @@ -273,4 +265,4 @@ uploadArchives { } } -defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curseforge', 'upload' +defaultTasks 'clean', 'build', 'sort', 'incrementBuildNumber', 'upload' diff --git a/build.properties b/build.properties index 1a63c13d6..6be4fd28f 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Tue Apr 24 17:09:29 BST 2018 +#Mon Aug 27 22:18:41 BST 2018 mod_name=Botania cf_meta_version=1.12.2 forge_version=14.23.4.2705 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=snapshot_20171217 version=r1.10 dir_output=../Build Output/Botania/ +build_number=356 mc_version=1.12.2 -build_number=355 diff --git a/version/1.12.2.txt b/version/1.12.2.txt index 24da6d579..30132f95f 100644 --- a/version/1.12.2.txt +++ b/version/1.12.2.txt @@ -1 +1 @@ -r1.10-354 \ No newline at end of file +r1.10-355 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index e9c31167e..fe2aa99ad 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,37 @@ +r1.10 355 +*Added a Thinking Hand cosmetic bauble (quat) +*Added back the ability to request items from the Corporea Index with a keybind from JEI. (Hubry) +*Added JEI support for the Orechid and Orechid Ignem. (codewarrior0) +*Added Thaumcraft Aspects for all major Botania base things. (Hubry) +*Added the ability to request a nice amount of items from the Coporea Index. (quat) +*Corporea Retainers use the same logarithmic signal scale as Crystal Cubes. +*Fixed a crash when creating Terrasteel. +*Fixed a crash when trying to activate the elven portal with a dispenser. +*Fixed a crash with other modders rendering tooltips before a world exists. +*Fixed a network crash. (codewarrior0) +*Fixed Elementium tools being repaired with Manasteel instead of Elementium. (ALongStringOfNumbers) +*Fixed Googly Eyes rendering inside the player's head. (quat) +*Fixed some typos. +*Fixed Sparks' vertical distance being inconsistent between the up and down directions. +*Fixed the Alfheim Portal storing useless items internally. (Hubry) +*Fixed the Entropynnium absorbing multiple TNTs at once. +*Fixed the Gaia Guardian being immune to /kill. +*Fixed the Manufactory Halo crashing the game if you use a Thaumcraft Thaumatorium. (Hubry) +*Fixed the Orechid misbehaving around Granite, Andesite, and Diorite. +*Fixed the Tainted Blood Pendant with Night Vision causing horrible flickering. (codycoolwaffle) +*Flowers added by other mods will now show the name of the mod that adds them in the tooltip instead of Botania if you have a mod that adds that feature. +*Going under sea level in Garden of Glass will no longer make the sky black. (Xaphiosis) +*Llamas and parrots can now spawn from the Cocoon of Caprice. (Hubry) +*Made some internal bounding boxes smaller so which improves performance a tiny bit. +*Removed Railcraft support for the Mana Poll with Minecart because the API for it isn't stable yet and was causing crashes. (matthijsvdmeulen) +*Rewrote a bit of internal Gaia Guardian logic. +*The Gaia Guardian's music now repeats while the battle goes on. +*Tiny Potatoes being held by other Tiny Potatoes look better now. Very important fix. (codewarrior0) +*Updated a bunch of recipes to use ore dictionary tags. (Hubry) +*Updated Thaumcraft Integration for TC6. (Hubry) +*[API] Added in a bunch of hooks for corporea stuff. (quat) +*[API] Updated the wiki links to new ones. (Hubry) +*[API] Increased Version Number to 91. r1.10 354 *Added a config to disable botania's F3 info. *Fixed baubles disappearing when they're right clicked with one already equipped. diff --git a/web/versions.ini b/web/versions.ini index 55be6f1c4..55e5f245f 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -305,4 +305,5 @@ r1.10-350=1.12.1 r1.10-351=1.12.1 r1.10-352=1.12.1 r1.10-353=1.12.2 -r1.10-354=1.12.2 \ No newline at end of file +r1.10-354=1.12.2 +r1.10-355=1.12.2 \ No newline at end of file