diff --git a/1.14/build.gradle b/1.14/build.gradle index 4a77f48..ee605f1 100644 --- a/1.14/build.gradle +++ b/1.14/build.gradle @@ -79,8 +79,8 @@ minecraft { dependencies { minecraft "net.minecraftforge:forge:${version_forge_minecraft}" - compileOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}:api") - runtimeOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}") + compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") + runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") } jar { diff --git a/1.14/gradle.properties b/1.14/gradle.properties index 8b3a0f7..eff64e2 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -1,10 +1,10 @@ # @file gradle.properties org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G -version_minecraft=1.14.3 -version_forge_minecraft=1.14.4-28.0.2 +version_minecraft=1.14.4 +version_forge_minecraft=1.14.4-28.0.11 version_fml_mappings=20190719-1.14.3 -version_jei=6.0.0.7 +version_jei=1.14.3:6.0.0.8 version_engineersdecor=1.0.9-b8 # # 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 246fba4..fd3cd7b 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.14.4": { + "1.0.9-b8": "[U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3.", "1.0.9-b7": "[U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3.\n[F] Disabled all early implemented fuild handling of valves and the Fluid Accumulator to prevent world loading hang-ups (issue #42, thx TheOhmegha for reporting). Will be re-enabled after fluid handling released in Forge.\n[F] Fixed blockstate model locations for signs and crafting table (issue #43, thx ProsperCraft for the beta test).", "1.0.9-b6": "[U] Updated to Forge 1.14.3-27.0.50/20190621-1.14.2.", "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.", @@ -16,7 +17,7 @@ "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks." }, "promos": { - "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b7" + "1.14.4-recommended": "", + "1.14.4-latest": "1.0.9-b8" } } \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md index 27216dd..713d3af 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,7 +10,7 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history - ~ v1.0.9-b8 [U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.2/20190719-1.14.3. + - v1.0.9-b8 [U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3. - v1.0.9-b7 [U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3. [F] Disabled all early implemented fuild handling of valves diff --git a/1.14/src/main/java/wile/engineersdecor/ModContent.java b/1.14/src/main/java/wile/engineersdecor/ModContent.java index 17be32b..0b29260 100644 --- a/1.14/src/main/java/wile/engineersdecor/ModContent.java +++ b/1.14/src/main/java/wile/engineersdecor/ModContent.java @@ -539,7 +539,7 @@ public class ModContent public static final EntityType ET_CHAIR = EntityType.Builder .create(BlockDecorChair.EntityChair::new, EntityClassification.MISC) - .immuneToFire().size(1e-3f, 1e-3f) + .immuneToFire().size(1e-3f, 1e-3f).disableSerialization() .setShouldReceiveVelocityUpdates(false).setUpdateInterval(4) .setCustomClientFactory(BlockDecorChair.EntityChair::customClientFactory) .build(new ResourceLocation(ModEngineersDecor.MODID, "et_chair").toString()) diff --git a/meta/update.json b/meta/update.json index 8551d7d..b4a3c93 100644 --- a/meta/update.json +++ b/meta/update.json @@ -62,7 +62,8 @@ "1.0.0-a2": "[A] Added panzer glass.", "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, - "1.14.3": { + "1.14.4": { + "1.0.9-b8": "[U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3.", "1.0.9-b7": "[U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3.\n[F] Disabled all early implemented fuild handling of valves and the Fluid Accumulator to prevent world loading hang-ups (issue #42, thx TheOhmegha for reporting). Will be re-enabled after fluid handling released in Forge.\n[F] Fixed blockstate model locations for signs and crafting table (issue #43, thx ProsperCraft for the beta test).", "1.0.9-b6": "[U] Updated to Forge 1.14.3-27.0.50/20190621-1.14.2.", "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.", @@ -82,7 +83,7 @@ "1.12.2-latest": "1.0.10-b1", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", - "1.14.3-recommended": "", - "1.14.3-latest": "1.0.9-b7" + "1.14.4-recommended": "", + "1.14.4-latest": "1.0.9-b8" } } \ No newline at end of file diff --git a/tasks.js b/tasks.js index 68ad046..3cf8bb8 100644 --- a/tasks.js +++ b/tasks.js @@ -13,20 +13,20 @@ tasks["update-json"] = function() { var update_jsons = { "1.12.2": JSON.parse(fs.readfile(root_dir + "/1.12/meta/update.json")), "1.13.2": JSON.parse(fs.readfile(root_dir + "/1.13/meta/update.json")), - "1.14.3": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json")) + "1.14.4": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json")) }; var update_json = { homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": update_jsons["1.12.2"]["1.12.2"], "1.13.2": update_jsons["1.13.2"]["1.13.2"], - "1.14.3": update_jsons["1.14.3"]["1.14.3"], + "1.14.4": update_jsons["1.14.4"]["1.14.4"], promos: { "1.12.2-recommended": update_jsons["1.12.2"]["promos"]["1.12.2-recommended"], "1.12.2-latest": update_jsons["1.12.2"]["promos"]["1.12.2-latest"], "1.13.2-recommended": update_jsons["1.13.2"]["promos"]["1.13.2-recommended"], "1.13.2-latest": update_jsons["1.13.2"]["promos"]["1.13.2-latest"], - "1.14.3-recommended": update_jsons["1.14.3"]["promos"]["1.14.3-recommended"], - "1.14.3-latest": update_jsons["1.14.3"]["promos"]["1.14.3-latest"] + "1.14.4-recommended": update_jsons["1.14.4"]["promos"]["1.14.4-recommended"], + "1.14.4-latest": update_jsons["1.14.4"]["promos"]["1.14.4-latest"] } } fs.mkdir(root_dir + "/meta");