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 eca97c5..9d62f0b 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_danger_texture.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_danger_texture.png differ 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 293b5c5..a925fd4 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_hotwire_texture.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_hotwire_texture.png differ 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