diff --git a/1.12/gradle.properties b/1.12/gradle.properties index aff41d6..f1f2d83 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.9 +version_engineersdecor=1.0.10-b1 diff --git a/1.12/readme.md b/1.12/readme.md index 6fef5a9..bbe0fa3 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,11 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history + ~ v1.0.10-b1 [I] Features WIP + [A] Treated wood side table added. + [F] Fixed recipe collision of Metal Rung Ladder (issue #37, + thx ProsperCraft for reporting). + ------------------------------------------------------------------- - v1.0.9 [R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang index aca7830..46ad420 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -81,7 +81,7 @@ tile.engineersdecor.thin_steel_pole_head.help=§6Steel part fitting as foot or h tile.engineersdecor.thick_steel_pole_head.name=Straight Thick Steel Pole Head/Foot tile.engineersdecor.thick_steel_pole_head.help=§6Steel part fitting as foot or head of the thick steel pole (6x6x16). tile.engineersdecor.steel_double_t_support.name=Steel Double T Support -tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support bream fragment. +tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support beam fragment. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Treated Wood Table tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r Indoor and outdoor use. @@ -155,7 +155,7 @@ tile.engineersdecor.small_mineral_smelter.help=§6High temperature, high insulat tile.engineersdecor.sign_decor.name=Sign Plate (Engineer's decor) tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. tile.engineersdecor.sign_hotwire.name=Sign "Caution Hot Wire" -tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit. +tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you will have a nonconformity in the next audit. tile.engineersdecor.sign_mindstep.name=Sign "Mind The Step" tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally). tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There" @@ -163,7 +163,7 @@ tile.engineersdecor.sign_danger.help=§6General danger warning. tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead" tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps. tile.engineersdecor.sign_factoryarea.name=Sign "Factory Area" -tile.engineersdecor.sign_factoryarea.help=§6Marker sign for buildings or areas where the really big machines are. +tile.engineersdecor.sign_factoryarea.help=§6Marker sign for buildings or areas where the really big machines are located. #----------------------------------------------------------------------------------------------------------- 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. diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang index 43890fd..f5b0145 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang @@ -79,7 +79,7 @@ tile.engineersdecor.thin_steel_pole_head.name=Straight Thin Steel Pole head/foot tile.engineersdecor.thick_steel_pole_head.name=Straight Thick Steel Pole Head/Foot #tile.engineersdecor.thick_steel_pole_head.help=§6Steel part fitting as foot or head of the thick steel pole (6x6x16). tile.engineersdecor.steel_double_t_support.name=Steel Double T Support -#tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support bream fragment. +#tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support beam fragment. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=经过处理的木桌 tile.engineersdecor.treated_wood_table.help=§6坚固的四足木桌. @@ -153,7 +153,7 @@ tile.engineersdecor.small_mineral_smelter.name=Small Mineral Melting Furnace tile.engineersdecor.sign_decor.name=Sign Plate (Engineer's decor) #tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. tile.engineersdecor.sign_hotwire.name=Sign "Caution Hot Wire" -#tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit. +#tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you will have a nonconformity in the next audit. tile.engineersdecor.sign_mindstep.name=Sign "Mind The Step" #tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally). tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There" @@ -161,7 +161,7 @@ tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There" tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead" #tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps. tile.engineersdecor.sign_factoryarea.name=Sign "Factory Area" -#tile.engineersdecor.sign_factoryarea.help=§6Marker sign for buildings or areas where the really big machines are. +#tile.engineersdecor.sign_factoryarea.help=§6Marker sign for buildings or areas where the really big machines are located. #----------------------------------------------------------------------------------------------------------- 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. diff --git a/1.14/gradle.properties b/1.14/gradle.properties index e67bc88..e10419a 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -5,7 +5,7 @@ version_minecraft=1.14.3 version_forge_minecraft=1.14.3-27.0.25 version_fml_mappings=20190621-1.14.2 version_jei=6.0.0.7 -version_engineersdecor=1.0.9-b4 +version_engineersdecor=1.0.9-b5 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/meta/update.json b/1.14/meta/update.json index 6d15301..48aafa1 100644 --- a/1.14/meta/update.json +++ b/1.14/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.14.3": { + "1.0.9-b5": "[A] Added missing recipes for slabs, stained clinker, half-slabs, valves.\n[M] Standalone recipes adapted.\n[F] Lang files: Fixed double newline escape.\n[A] Implicit opt-out of hard IE dependent blocks ported (e.g. Concrete Wall).\n[M] Basic mod config features, opt-outs and tweaks ported.", "1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).", "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", @@ -14,6 +15,6 @@ }, "promos": { "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b4" + "1.14.3-latest": "1.0.9-b5" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 9a5756b..9ef89ca 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,6 +10,12 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history + - v1.0.9-b5 [A] Added missing recipes for slabs, stained clinker, half-slabs, valves. + [M] Standalone recipes adapted. + [F] Lang files: Fixed double newline escape. + [A] Implicit opt-out of hard IE dependent blocks ported (e.g. Concrete Wall). + [M] Basic mod config features, opt-outs and tweaks ported. + - v1.0.9-b4 [E] Experimental: Config skel ported (!not all options have effect yet). [E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38). diff --git a/meta/lib/liblang.1.12.js b/meta/lib/liblang.1.12.js index 7c3e658..a4d7440 100644 --- a/meta/lib/liblang.1.12.js +++ b/meta/lib/liblang.1.12.js @@ -52,6 +52,7 @@ if(kv.length!=2) throw new Error("Invalid line in '"+file_path+"': '"+lines[i]+"'"); const key = kv[0].trim(); const text = kv[1].trim(); + text = text.replace("\\\\n", "\n").replace("\\n", "\n"); if(key.length == 0) { throw new Error("Empty key in '"+file_path+"' line '" + lines[i] + "'"); } else if(key.search("tile."+modid+".")==0) { diff --git a/meta/update.json b/meta/update.json index 16d3de6..97c32ca 100644 --- a/meta/update.json +++ b/meta/update.json @@ -62,6 +62,7 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "1.14.3": { + "1.0.9-b5": "[A] Added missing recipes for slabs, stained clinker, half-slabs, valves.\n[M] Standalone recipes adapted.\n[F] Lang files: Fixed double newline escape.\n[A] Implicit opt-out of hard IE dependent blocks ported (e.g. Concrete Wall).\n[M] Basic mod config features, opt-outs and tweaks ported.", "1.0.9-b4": "[E] Experimental: Config skel ported (!not all options have effect yet).\n[E] Experimental: JEI integration for opt-outs and crafting table ported (also addresses issue #38).", "1.0.9-b3": "[F] Additional item drop fixes when blocks are destroyed (issue #39).", "1.0.9-b2": "[U] Updated to Forge 1.14.3-27.0.25/20190621-1.14.2.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[F] Fixed opening crafting table, furni, dropper server crash issue #35 (thx ProsperCraft also here).\n[F] Fixed missing pole/support item drops (issue #36, ProsperCraft).", @@ -79,6 +80,6 @@ "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b4" + "1.14.3-latest": "1.0.9-b5" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 67e048a..308bc57 100644 --- a/readme.md +++ b/readme.md @@ -144,7 +144,10 @@ More to come slowly but steadily. ### Mod pack integration, forking, back ports, bug reports, testing - Packs: If your mod pack ***is open source as well and has no installer***, - you don't need to ask and simply integrate this mod. + you don't need to ask and simply integrate this mod. The mod has an extensive + configuration allowing you to choose exactly which features you want, and + additional tweaks like furni power consumption, smelting speed etc, allow + to adapt the mod to the context it is used in. - Bug reports: Yes, please let me know. Drop a mail or better open an issue for the repository.