diff --git a/gradle.properties b/gradle.properties index b211924..765dd8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ meta_modid=engineersdecor meta_issues=https://github.com/stfwi/engineers-decor/issues meta_download=https://www.curseforge.com/minecraft/mc-mods/engineers-decor/ version_minecraft=1.18.2 -version_forge_minecraft=1.18.2-40.0.32 +version_forge_minecraft=1.18.2-40.1.51 version_jei=1.18.2:9.5.4.171 -version_engineersdecor=1.1.23-b1 +version_engineersdecor=1.1.23 diff --git a/meta/update.json b/meta/update.json index 91c6723..2de83d7 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.18.2": { + "1.1.23": "[R] Release build.\n[F] Updated Forge and re-enabled JSON tags (issue #217, ty snarkbait66).", "1.1.23-b1": "[A] Added ability to install inset lights in top-aligned catwalks (PR#215, Sergii).\n[A] Iron Hatch improved (PR#216, Sergii).", "1.1.22": "[R] Release build v1.1.22.\n[M] Factory Dropper stack size ignored for un-stackable items (issue #209, ty LesBeans).", "1.1.22-b2": "[F] Fixed stairs block reference (issue #207, ty freopt)", @@ -56,7 +57,7 @@ "1.1.2-b1": "[U] Ported to MC1.16.2." }, "promos": { - "1.18.2-recommended": "1.1.22", - "1.18.2-latest": "1.1.23-b1" + "1.18.2-recommended": "1.1.23", + "1.18.2-latest": "1.1.23" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 21ec424..e432d84 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.18.x. ## Version history + - v1.1.23 [R] Release build. + [F] Updated Forge and re-enabled JSON tags (issue #217, ty snarkbait66). + - v1.1.23-b1 [A] Added ability to install inset lights in top-aligned catwalks (PR#215, Sergii). [A] Iron Hatch improved (PR#216, Sergii). diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f084b8b..360095a 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ logoFile="logo.png" [[dependencies.engineersdecor]] modId="forge" mandatory=true - versionRange="[40,)" + versionRange="[40.1,)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/data/forge/tags_/blocks/dirt.json b/src/main/resources/data/forge/tags/blocks/dirt.json similarity index 100% rename from src/main/resources/data/forge/tags_/blocks/dirt.json rename to src/main/resources/data/forge/tags/blocks/dirt.json diff --git a/src/main/resources/data/forge/tags_/items/dirt.json b/src/main/resources/data/forge/tags/items/dirt.json similarity index 100% rename from src/main/resources/data/forge/tags_/items/dirt.json rename to src/main/resources/data/forge/tags/items/dirt.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/climbable.json b/src/main/resources/data/minecraft/tags/blocks/climbable.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/climbable.json rename to src/main/resources/data/minecraft/tags/blocks/climbable.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/doors.json b/src/main/resources/data/minecraft/tags/blocks/doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/doors.json rename to src/main/resources/data/minecraft/tags/blocks/doors.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/planks.json b/src/main/resources/data/minecraft/tags/blocks/planks.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/planks.json rename to src/main/resources/data/minecraft/tags/blocks/planks.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/slabs.json rename to src/main/resources/data/minecraft/tags/blocks/slabs.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/stairs.json rename to src/main/resources/data/minecraft/tags/blocks/stairs.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/walls.json rename to src/main/resources/data/minecraft/tags/blocks/walls.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/wither_immune.json b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/wither_immune.json rename to src/main/resources/data/minecraft/tags/blocks/wither_immune.json diff --git a/src/main/resources/data/minecraft/tags_/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/blocks/wooden_doors.json rename to src/main/resources/data/minecraft/tags/blocks/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags_/items/doors.json b/src/main/resources/data/minecraft/tags/items/doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/items/doors.json rename to src/main/resources/data/minecraft/tags/items/doors.json diff --git a/src/main/resources/data/minecraft/tags_/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/items/slabs.json rename to src/main/resources/data/minecraft/tags/items/slabs.json diff --git a/src/main/resources/data/minecraft/tags_/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/items/stairs.json rename to src/main/resources/data/minecraft/tags/items/stairs.json diff --git a/src/main/resources/data/minecraft/tags_/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/items/walls.json rename to src/main/resources/data/minecraft/tags/items/walls.json diff --git a/src/main/resources/data/minecraft/tags_/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/items/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags_/items/wooden_doors.json rename to src/main/resources/data/minecraft/tags/items/wooden_doors.json