From fc785fd77ff9d05cefbc370dff819fcc4348b426 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sun, 16 Jun 2019 09:44:51 +0200 Subject: [PATCH] Release notes updated, version data updated, meta data updated, merge fixed. --- 1.12/gradle.properties | 2 +- 1.12/readme.md | 2 ++ .../assets/engineersdecor/lang/ru_ru.lang | 19 ------------------- 1.13/readme.md | 4 +++- meta/update.json | 3 ++- 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 1a40bc4..ee11ec5 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.8 +version_engineersdecor=1.0.9-b1 diff --git a/1.12/readme.md b/1.12/readme.md index a7dd1d6..25e52fd 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + ~ v1.0.9-b1 [U] Lang file ru_ru updated (PR#31, yaroslav4167). + ------------------------------------------------------------------- - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 6e9edf2..2f951db 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -141,24 +141,6 @@ tile.engineersdecor.sign_defense.help=§6Предупреждающий знак tile.engineersdecor.sign_factoryarea.name=Знак «Заводская зона» tile.engineersdecor.sign_factoryarea.help=§6Знак для зданий или областей, где находятся действительно большие машины. #----------------------------------------------------------------------------------------------------------- -<<<<<<< HEAD -tile.engineersdecor.halfslab_rebar_concrete.name=Rebar Concrete Slice -#tile.engineersdecor.halfslab_rebar_concrete.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_concrete.name=Concrete Slice -#tile.engineersdecor.halfslab_concrete.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_treated_wood.name=Treated Wood Slice -#tile.engineersdecor.halfslab_treated_wood.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_iron.name=Iron Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_iron.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_steel.name=Steel Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_steel.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_copper.name=Copper Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_copper.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_gold.name=Gold Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Aluminum Sheet Metal Slice -#tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices. -======= tile.engineersdecor.halfslab_rebar_concrete.name=Арматура для бетона tile.engineersdecor.halfslab_rebar_concrete.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. tile.engineersdecor.halfslab_concrete.name=Бетонный срез @@ -175,7 +157,6 @@ tile.engineersdecor.halfslab_sheetmetal_gold.name=Часть золотого л tile.engineersdecor.halfslab_sheetmetal_gold.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. tile.engineersdecor.halfslab_sheetmetal_aluminum.name=Часть алюминиевого листового металла tile.engineersdecor.halfslab_sheetmetal_aluminum.help=§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей. ->>>>>>> 2b610eab0d3f304ee203932b61d0071d8719063b #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.13/readme.md b/1.13/readme.md index 75a3ac8..a1c6669 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,7 +10,9 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history - ~ v1.0.7-b4 [A] + ~ v1.0.7-b5 [A] + + - v1.0.7-b4 [A] Added stained clinker brick block/stairs. - 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. diff --git a/meta/update.json b/meta/update.json index 9b4248b..501f647 100644 --- a/meta/update.json +++ b/meta/update.json @@ -43,6 +43,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." }, "1.13.2": { + "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", "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] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", "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.", @@ -59,6 +60,6 @@ "1.12.2-recommended": "1.0.8", "1.12.2-latest": "1.0.8", "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b3" + "1.13.2-latest": "1.0.7-b4" } } \ No newline at end of file