From 17ab68eb78f16dac47852fcf78f8930014d825a2 Mon Sep 17 00:00:00 2001 From: stfwi Date: Fri, 25 Oct 2019 18:40:51 +0200 Subject: [PATCH] 1.12: v1.0.14 release commit. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +- 1.12/readme.md | 8 ++ .../java/wile/engineersdecor/ModContent.java | 61 +++++++++--- .../blockstates/iron_floor_edge_light.json | 9 ++ .../blockstates/iron_inset_light.json | 9 +- .../assets/engineersdecor/lang/en_us.lang | 6 +- .../assets/engineersdecor/lang/ru_ru.lang | 3 + .../assets/engineersdecor/lang/zh_cn.lang | 3 + .../block/light/floor_edge_light_model.json | 92 +++++++++++++++++++ .../iron_floor_edge_light_recipe.json | 16 ++++ .../iron_inset_light_recipe_backcycle.json | 16 ++++ 1.14/gradle.properties | 4 +- 1.14/readme.md | 2 + meta/update.json | 5 +- 15 files changed, 213 insertions(+), 28 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 961bd42..14b9159 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.14-b1 +version_engineersdecor=1.0.14 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 160158f..f8dab6a 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.14": "[R] Release based on v1.0.14-b1. Release-to-release changes: * Factory Hopper added. * Small Waste Incinerator improved. * Lang updates. * Recipe fixes.", "1.0.14-b1": "[A] Factory Hopper added (configurable hopper and item collector).\n[M] Small Waste Incinerator Fifo shifting improved.\n[M] Lang file zh_cn updated (scikirbypoke, PR#53).\n[F] Fixed conditional recipe constant for redstone pipe valve (thx @albert_ac).", "1.0.13": "[R] Release based on v1.0.13-b2. Release-to-release changes: * Small Tree Cutter device added. * Small Solar Panel added. * Steel Mesh Fence added. * Broad Window Sill added.", "1.0.13-b2": "[A] Added Steel Mesh Fence.\n[A] Added Broad Window Sill.\n[A] Small Tree Cutter can chop Dynamic Trees, chops at tree trunk radius 7 or higher.", @@ -61,7 +62,7 @@ "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, "promos": { - "1.12.2-recommended": "1.0.13", - "1.12.2-latest": "1.0.14-b1" + "1.12.2-recommended": "1.0.14", + "1.12.2-latest": "1.0.14" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index ee4c966..c139624 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,14 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history + ------------------------------------------------------------------- + - v1.0.14 [R] Release based on v1.0.14-b1. Release-to-release changes: + * Factory Hopper added. + * Small Waste Incinerator improved. + * Lang updates. + * Recipe fixes. + ------------------------------------------------------------------- + - v1.0.14-b1 [A] Factory Hopper added (configurable hopper and item collector). [M] Small Waste Incinerator Fifo shifting improved. [M] Lang file zh_cn updated (scikirbypoke, PR#53). diff --git a/1.12/src/main/java/wile/engineersdecor/ModContent.java b/1.12/src/main/java/wile/engineersdecor/ModContent.java index 4e34384..a5aa34d 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModContent.java +++ b/1.12/src/main/java/wile/engineersdecor/ModContent.java @@ -12,27 +12,58 @@ */ package wile.engineersdecor; -import wile.engineersdecor.detail.*; -import wile.engineersdecor.blocks.*; -import wile.engineersdecor.items.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.List; -import java.util.Collections; -import javax.annotation.Nonnull; +import wile.engineersdecor.blocks.BlockDecor; +import wile.engineersdecor.blocks.BlockDecorChair; +import wile.engineersdecor.blocks.BlockDecorCraftingTable; +import wile.engineersdecor.blocks.BlockDecorDirected; +import wile.engineersdecor.blocks.BlockDecorDropper; +import wile.engineersdecor.blocks.BlockDecorFence; +import wile.engineersdecor.blocks.BlockDecorFloorGrating; +import wile.engineersdecor.blocks.BlockDecorFull; +import wile.engineersdecor.blocks.BlockDecorFurnace; +import wile.engineersdecor.blocks.BlockDecorFurnaceElectrical; +import wile.engineersdecor.blocks.BlockDecorGlassBlock; +import wile.engineersdecor.blocks.BlockDecorHalfSlab; +import wile.engineersdecor.blocks.BlockDecorHopper; +import wile.engineersdecor.blocks.BlockDecorHorizontalSupport; +import wile.engineersdecor.blocks.BlockDecorLadder; +import wile.engineersdecor.blocks.BlockDecorMineralSmelter; +import wile.engineersdecor.blocks.BlockDecorPassiveFluidAccumulator; +import wile.engineersdecor.blocks.BlockDecorPipeValve; +import wile.engineersdecor.blocks.BlockDecorSlab; +import wile.engineersdecor.blocks.BlockDecorSolarPanel; +import wile.engineersdecor.blocks.BlockDecorStairs; +import wile.engineersdecor.blocks.BlockDecorStraightPole; +import wile.engineersdecor.blocks.BlockDecorTest; +import wile.engineersdecor.blocks.BlockDecorTreeCutter; +import wile.engineersdecor.blocks.BlockDecorWall; +import wile.engineersdecor.blocks.BlockDecorWasteIncinerator; +import wile.engineersdecor.blocks.BlockDecorWindow; +import wile.engineersdecor.blocks.BlockDecorWindowSill; +import wile.engineersdecor.detail.ModAuxiliaries; +import wile.engineersdecor.detail.ModConfig; +import wile.engineersdecor.detail.ModTesrs; +import wile.engineersdecor.items.ItemDecor; @SuppressWarnings("unused") public class ModContent @@ -279,11 +310,18 @@ public class ModContent public static final BlockDecorDirected INSET_LIGHT_IRON = new BlockDecorDirected( "iron_inset_light", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(14<