From a0e28b336732c8258d3cb5db516566fe7447def2 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 1 Jun 2019 12:54:52 +0200 Subject: [PATCH] Standalone recipes added. Sign backgrounds adapted. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +-- 1.12/readme.md | 13 ++++++- ..._electrical_furnace_recipe_standalone.json | 32 ++++++++++++++++++ .../blocks/sign/sign_danger_texture.png | Bin 1280 -> 1303 bytes .../blocks/sign/sign_hotwire_texture.png | Bin 1138 -> 1164 bytes 1.13/readme.md | 11 ++++++ meta/update.json | 9 +++-- 8 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 569025c..4ec3dd3 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.7-b3 +version_engineersdecor=1.0.7 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index abf540a..e72c9da 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.7": "[R] Release based on v1.0.7-b2. Release-to-release changes: * Factory dropper added. * Defense system warning sign added. * Warning sign backgrounds adapted. * Standalone recipes added. * Lang files updated.\n[A] Added standalone recipes for signs, factory dropper, and electrical furnace.\n[M] Adapted \"Caution\" sign backgrounds to the yellow defense system warning background.", "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.", "1.0.7-b1": "[M] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!", "1.0.6": "[R] Release based on v1.0.6-b1. Release-to-release changes: * Fixed FML remapping issue (COULD CAUSE CRASHES). * Small waste incinerator added. * Lang files updated/corrections. * Metal ladder easier to break.\n[A] Added factory dropper (config:experimental).\n[C] Thx to abdurraslan for the detailed issue #25.", @@ -39,7 +40,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.6", - "1.12.2-latest": "1.0.7-b2" + "1.12.2-recommended": "1.0.7", + "1.12.2-latest": "1.0.7" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 897db87..d51f796 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,7 +10,18 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history - ~ v1.0.7-b3 [A] Added standalone recipes for signs and factory dropper. + ------------------------------------------------------------------- + - v1.0.7 [R] Release based on v1.0.7-b2. Release-to-release changes: + * Factory dropper added. + * Defense system warning sign added. + * Warning sign backgrounds adapted. + * Standalone recipes added. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added standalone recipes for signs, factory dropper, and + electrical furnace. + [M] Adapted "Caution" sign backgrounds to the yellow defense + system warning background. - v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver). [M] Factory dropper non-experimental now. GUI click area tuning. diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json new file mode 100644 index 0000000..9a4b322 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_electrical_furnace_recipe_standalone.json @@ -0,0 +1,32 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:small_electrical_furnace", + "required": ["engineersdecor:small_lab_furnace"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + "HFH" + ], + "key": { + "F": { + "item": "engineersdecor:small_lab_furnace", + "data": 0 + }, + "C": { + "item": "#ingotIron", + "data": 0 + }, + "H": { + "item": "#anyHopper", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:small_electrical_furnace", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_danger_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_danger_texture.png index eca97c571ba93b96c426a8021e0936055ebd774d..9d62f0bd5b119b48b7640af6eb337eef2c4fc7fb 100644 GIT binary patch delta 1244 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 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_hotwire_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_hotwire_texture.png index 293b5c5a20031ae3c775fbe72d4cd89cb2e4b231..a925fd45d794005aee33d3ee163a44bda842c303 100644 GIT binary patch delta 1104 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 diff --git a/1.13/readme.md b/1.13/readme.md index 9f3792e..024e00e 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,6 +10,17 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history + - v1.0.7-b3 [V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported + to 1.13.2 implemented/prepared, therefore version re-assigned. + [A] Sign background colors adapted. + + - v1.0.4-b6 [A] Added Small Electrical Furnace. + [A] Added Small Waste Incinerator. + [A] Experimental: Added fluid check valve. + [A] Experimental: Added fluid redstone controlled valve. + [A] Experimental: Added fluid redstone analog valve. + [A] Experimental: Added passive fluid accumulator. + - v1.0.4-b5 [A] Added Factory Dropper. [A] Added "Caution Defense System Ahead" sign. diff --git a/meta/update.json b/meta/update.json index fccfebc..6965b17 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.7": "[R] Release based on v1.0.7-b2. Release-to-release changes: * Factory dropper added. * Defense system warning sign added. * Warning sign backgrounds adapted. * Standalone recipes added. * Lang files updated.\n[A] Added standalone recipes for signs, factory dropper, and electrical furnace.\n[M] Adapted \"Caution\" sign backgrounds to the yellow defense system warning background.", "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.", "1.0.7-b1": "[M] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!", "1.0.6": "[R] Release based on v1.0.6-b1. Release-to-release changes: * Fixed FML remapping issue (COULD CAUSE CRASHES). * Small waste incinerator added. * Lang files updated/corrections. * Metal ladder easier to break.\n[A] Added factory dropper (config:experimental).\n[C] Thx to abdurraslan for the detailed issue #25.", @@ -39,6 +40,8 @@ "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." }, "1.13.2": { + "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Sign background colors adapted.", + "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", @@ -50,9 +53,9 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "promos": { - "1.12.2-recommended": "1.0.6", - "1.12.2-latest": "1.0.7-b2", + "1.12.2-recommended": "1.0.7", + "1.12.2-latest": "1.0.7", "1.13.2-recommended": "", - "1.13.2-latest": "1.0.4-b5" + "1.13.2-latest": "1.0.7-b3" } } \ No newline at end of file