From eac3d1c36dc64c447aed254372fe04178b1072ea Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Jun 2020 16:19:19 -0500 Subject: [PATCH 1/3] Yeet --- src/main/java/vazkii/botania/common/block/ModSubtiles.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index 477455172..d97742b9f 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -19,7 +19,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.subtile.SubTileManastar; @@ -36,7 +35,6 @@ import java.util.function.Supplier; import static vazkii.botania.common.block.ModBlocks.register; -@ObjectHolder(LibMisc.MOD_ID) public class ModSubtiles { public static final Block pureDaisy = new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY), SubTilePureDaisy::new); public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15), SubTilePureDaisy::new); From 08a5dde75b04a33d2e3d49eae3261219d9b8ae7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 30 Jun 2020 10:25:43 -0500 Subject: [PATCH 2/3] Release 1.15-387 --- build.properties | 4 ++-- version/1.15.2.txt | 2 +- web/changelog.txt | 8 ++++++++ web/versions.ini | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 59389f3c8..a5cf8a19f 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # -#Wed Jun 17 08:32:24 CDT 2020 +#Tue Jun 30 10:24:45 CDT 2020 version=r1.15 dir_output=../Build Output/Botania/ dir_repo=./ -build_number=387 +build_number=388 mod_name=Botania diff --git a/version/1.15.2.txt b/version/1.15.2.txt index 488aad03d..6788c8202 100644 --- a/version/1.15.2.txt +++ b/version/1.15.2.txt @@ -1 +1 @@ -r1.15-386 \ No newline at end of file +r1.15-387 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 87f2dffca..fb83fe764 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,11 @@ +r1.15 387 +* Update critical hit logic in ancient wills to match vanilla +* Fix crashes with flugel tiara when running on Java 11 +* Many internal changes in preparation for portability to other mod loaders (dev team, MoriyaShiine) +* Fix typo in Bifrost rod description +* Restore Garden of Glass sky renderer +* Gourmaryllis mana formula has changed: it now rewards a longer chain of diverse foods. Alternating blindly between two foods is no longer the most optimal way, but should still work as a baseline starting point. Try to feed it many different foods! (Alwinfy) +* Barring no major catastrophes, this will likely be the final 1.15 build. 1.16 awaits! r1.15 386 * Fix dedicated server crash r1.15 385 diff --git a/web/versions.ini b/web/versions.ini index d4ec85944..00f50b977 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -330,4 +330,5 @@ r1.15-382=1.15.2 r1.15-383=1.15.2 r1.15-384=1.15.2 r1.15-385=1.15.2 -r1.15-386=1.15.2 \ No newline at end of file +r1.15-386=1.15.2 +r1.15-387=1.15.2 \ No newline at end of file From 50da75abb3172dad57e0f16c4079f1734866c645 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 3 Jul 2020 18:23:39 +0100 Subject: [PATCH 3/3] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 0f07b04f6..92b1cf3ff 100644 --- a/contributors.properties +++ b/contributors.properties @@ -426,3 +426,4 @@ fedx_j4ckb=14 lunekiska=6 bloodtap=14 zoggefuggs=1 +avvva=heiseiDream