diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 43126e0..1a40bc4 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-b2 +version_engineersdecor=1.0.8 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 7d4a67f..ba18c8f 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.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).", "1.0.8-b1": "[A] Added \"Factory area\" sign.\n[M] Electrical furnace recipe changed (hoppers to conveyors).\n[A] Opt-out config options added.\n[F] Lang file fixes for en_us (Angela, PR#29).", "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.", @@ -42,7 +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." }, "promos": { - "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.8-b2" + "1.12.2-recommended": "1.0.8", + "1.12.2-latest": "1.0.8" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index c8ed268..a7dd1d6 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,19 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + ------------------------------------------------------------------- + - v1.0.8 [R] Release based on v1.0.8-b2. Release-to-release changes: + * Added factory area sign. + * Added stained clinker. + * Config opt-out fixes, detailed feature selection possible now. + * Recipe adaptions and fixes. + * Lang files updated. + ------------------------------------------------------------------- + [A] Added stained clinker brick block/stairs. Can be mixed with + "normal" clinkers. + [A] Added opt-out option for CTRL-SHIFT tooltips. + [M] Recipe condition requirements updated, recipes categorized. + - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30). [A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching). diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index bf05ea3..ff8fe25 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -354,9 +354,17 @@ public class ModBlocks private static final Object content[] = { TREATED_WOOD_CRAFTING_TABLE, TREATED_WOOD_CRAFTING_TABLE_TEI, + SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, + SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, + FACTORY_DROPPER, FACTORY_DROPPER_TEI, + SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, + STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI, + PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, CLINKER_BRICK_BLOCK, CLINKER_BRICK_STAIRS, CLINKER_BRICK_WALL, + CLINKER_BRICK_STAINED_BLOCK, + CLINKER_BRICK_STAINED_STAIRS, SLAG_BRICK_BLOCK, SLAG_BRICK_STAIRS, SLAG_BRICK_WALL, @@ -385,19 +393,10 @@ public class ModBlocks THICK_STEEL_POLE_HEAD, STEEL_DOUBLE_T_SUPPORT, SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_MODLOGO, - SMALL_LAB_FURNACE, SMALL_LAB_FURNACE_TEI, - SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI, - FACTORY_DROPPER, FACTORY_DROPPER_TEI, - SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI, - STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI, - PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, }; private static final Object dev_content[] = { SIGN_MINDSTEP, - // design not sure yet ... - CLINKER_BRICK_STAINED_BLOCK, - CLINKER_BRICK_STAINED_STAIRS, // handling not sure yet ... HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, diff --git a/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java b/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java index ba97651..3ffc24b 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java @@ -85,6 +85,7 @@ public class ModAuxiliaries { // Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard, // so using this also here should be ok. + if(ModConfig.noToolTips()) return false; final boolean help_available = (helpTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".help"); final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip"); if((!help_available) && (!tip_available)) return false; diff --git a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java index 9b2c77d..03ac8e1 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java @@ -176,6 +176,10 @@ public class ModConfig @Config.Name("Without h. supports") @Config.RequiresMcRestart public boolean without_hsupports = false; + + @Config.Comment({"Disable CTRL-SHIFT item tooltip display."}) + @Config.Name("Without tooltips") + public boolean without_tooltips = false; } @Config.Comment({ @@ -337,6 +341,9 @@ public class ModConfig public static final boolean isWithoutRecipes() { return (zmisc==null) || (zmisc.without_recipes); } + public static boolean noToolTips() + { return optout.without_tooltips; } + public static final boolean isOptedOut(final @Nullable Block block) { return isOptedOut(block, false); } @@ -382,7 +389,7 @@ public class ModConfig if(optout.without_walls && (block instanceof BlockDecorWall)) return true; if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true; // String matching based evaluation - if(optout.without_clinker_bricks && (rn.startsWith("clinker_brick_")) || (rn.startsWith("clinker_brick_stained_"))) return true; + if(optout.without_clinker_bricks && (rn.startsWith("clinker_brick_"))) return true; if(optout.without_slag_bricks && rn.startsWith("slag_brick_")) return true; if(optout.without_rebar_concrete && rn.startsWith("rebar_concrete")) return true; if(optout.without_ie_concrete_wall && rn.startsWith("concrete_wall")) return true; 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 3142729..9585494 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 @@ -147,21 +147,21 @@ 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.halfslab_rebar_concrete.name=Rebar Concrete Slice -tile.engineersdecor.halfslab_rebar_concrete.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +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. #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- 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 56747df..cd8bc77 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 @@ -140,21 +140,21 @@ 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.halfslab_rebar_concrete.name=Rebar Concrete Slice -#tile.engineersdecor.halfslab_rebar_concrete.help=§6Vertically stackable slice.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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.§rRight/left click with the slice stack on the top or bottom surface to add/remove slices. +#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. #----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json index 9720d11..8816856 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -76,9 +76,17 @@ "name": "slabSheetmetalSteel" }, { - "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminium" }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminum" }, "name": "slabSheetmetalAluminium" }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalCopper" }, + "name": "slabSheetmetalCopper" + }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalGold" }, + "name": "slabSheetmetalGold" + }, { "ingredient": { "type": "forge:ore_dict", "ore": "sand" }, "name": "sand" @@ -220,6 +228,13 @@ "ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 }, "name": "blockConcreteIe" }, + { + "conditions": [ + { "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" } + ], + "ingredient": { "item": "immersiveengineering:stone_decoration_slab", "data": 5 }, + "name": "slabConcreteIe" + }, { "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" } diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json new file mode 100644 index 0000000..4b32075 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json @@ -0,0 +1,16 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_stained_block"] + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:clinker_brick_stained_block" } + ], + "result": { + "item": "engineersdecor:clinker_brick_block" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json similarity index 74% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json index ec80be6..8356699 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stained_stairs" + "result": "engineersdecor:clinker_brick_stained_stairs", + "required": ["engineersdecor:clinker_brick_stained_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json similarity index 73% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json index 11d939e..bd69ba0 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stained_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stained_block" + "result": "engineersdecor:clinker_brick_stained_block", + "required": ["engineersdecor:clinker_brick_stained_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json index 17125d4..0a865a8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stairs" + "result": "engineersdecor:clinker_brick_stairs", + "required": ["engineersdecor:clinker_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json index 6d8ceab..9d38290 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json index 6a3be11..32162b2 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_wall" + "result": "engineersdecor:clinker_brick_wall", + "required": ["engineersdecor:clinker_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json index d146f3c..4e41df8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" + "result": "engineersdecor:clinker_brick_block", + "required": ["engineersdecor:clinker_brick_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json index 7f1019e..2af1f2a 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_stairs" + "result": "engineersdecor:slag_brick_stairs", + "required": ["engineersdecor:slag_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json index 7c8f171..f2d92b7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" + "result": "engineersdecor:slag_brick_block", + "required": ["engineersdecor:slag_brick_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json index a140b2a..7fc4f0e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_wall" + "result": "engineersdecor:slag_brick_wall", + "required": ["engineersdecor:slag_brick_block"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json index db1b40d..bd12d3e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/brick/slag_brick_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" + "result": "engineersdecor:slag_brick_block", + "required": ["engineersdecor:slag_brick_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/concrete_wall_recipe_ie_required.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/concrete_wall_recipe_ie_required.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/panzerglass_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/panzerglass_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/panzerglass_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/panzerglass_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json similarity index 76% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json index fc4f8c8..ee01dd4 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_stairs" + "result": "engineersdecor:rebar_concrete_stairs", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json index 13718e7..87388e7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json index 4eb6034..de264d6 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile" + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json index 5635ec7..f7a42cc 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_tile"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json index e3da4f1..b5b867e 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile_stairs" + "result": "engineersdecor:rebar_concrete_tile_stairs", + "required": ["engineersdecor:rebar_concrete_tile"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json similarity index 74% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json index fb6666e..86205f2 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_tile_stairs_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_tile" + "result": "engineersdecor:rebar_concrete_tile", + "required": ["engineersdecor:rebar_concrete_tile_stairs"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json index 61baf76..f9cf388 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_wall" + "result": "engineersdecor:rebar_concrete_wall", + "required": ["engineersdecor:rebar_concrete"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json similarity index 75% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json index cb12d06..5c003a8 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe_decompose.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete/rebar_concrete_wall_recipe_decompose.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" + "result": "engineersdecor:rebar_concrete", + "required": ["engineersdecor:rebar_concrete_wall"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/factory_dropper_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/factory_dropper_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/factory_dropper_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/factory_dropper_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/passive_fluid_accumulator_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/passive_fluid_accumulator_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/passive_fluid_accumulator_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/passive_fluid_accumulator_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_electrical_furnace_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_electrical_furnace_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_electrical_furnace_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_lab_furnace_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_lab_furnace_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_waste_incinerator_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/small_waste_incinerator_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_waste_incinerator_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/small_waste_incinerator_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_analog_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_analog_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_analog_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_analog_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe_backcycle.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/straight_pipe_valve_redstone_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/straight_pipe_valve_redstone_recipe_backcycle.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/device/treated_wood_crafting_table_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/device/treated_wood_crafting_table_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json similarity index 83% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json index 85cdeb1..8d24c1b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_stool_recipe.json @@ -3,7 +3,7 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:treated_wood_stool", - "required": ["immersiveengineering:material"] + "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json similarity index 84% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json index ad942dd..b736495 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_table_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_table_recipe.json @@ -3,7 +3,7 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:treated_wood_table", - "required": ["immersiveengineering:material"] + "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shaped", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_windowsill_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_windowsill_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_ladder_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_ladder_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_steps_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_steps_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_steps_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/metal_rung_steps_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/ladder/treated_wood_ladder_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/ladder/treated_wood_ladder_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/light/iron_inset_light_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/light/iron_inset_light_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_danger_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_danger_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_danger_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_danger_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_defense_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_defense_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_defense_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_defense_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json index 6dfecd4..42096da 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_factoryarea_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_factoryarea_recipe.json @@ -2,8 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:sign_defense", - "required": ["engineersdecor:sign_danger"] + "result": "engineersdecor:sign_factoryarea", + "required": ["engineersdecor:sign_defense"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe_backcycle.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_hotwire_recipe_backcycle.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json new file mode 100644 index 0000000..4f61115 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_concrete", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabConcreteIe" } + }, + "result": { + "item": "engineersdecor:halfslab_concrete", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json new file mode 100644 index 0000000..3adaacb --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_rebar_concrete", + "required": ["engineersdecor:rebar_concrete"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "S", + "S" + ], + "key": { + "S": { "item": "engineersdecor:rebar_concrete" } + }, + "result": { + "item": "engineersdecor:halfslab_rebar_concrete", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json new file mode 100644 index 0000000..0d59738 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_aluminum", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalAluminium" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_aluminum", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json new file mode 100644 index 0000000..6e6d180 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_copper", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalCopper" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_copper", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json new file mode 100644 index 0000000..4974a4d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_gold", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalGold" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_gold", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json new file mode 100644 index 0000000..69f9288 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_iron", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalIron" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_iron", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json new file mode 100644 index 0000000..817857e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_sheetmetal_steel", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabSheetmetalSteel" } + }, + "result": { + "item": "engineersdecor:halfslab_sheetmetal_steel", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json new file mode 100644 index 0000000..865a4fa --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:halfslab_treated_wood", + "required": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "#slabTreatedWood" } + }, + "result": { + "item": "engineersdecor:halfslab_treated_wood", + "count": 16 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/steel_double_t_support_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/steel_double_t_support_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json index e2efd5d..86ed2eb 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thick_steel_pole_head" + "result": "engineersdecor:thick_steel_pole_head", + "required": ["engineersdecor:thick_steel_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json index 8d4bc27..2319260 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thick_steel_pole_recipe_backcycle.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thick_steel_pole" + "result": "engineersdecor:thick_steel_pole", + "required": ["engineersdecor:thick_steel_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json index 88613a9..09e7f1b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thin_steel_pole_head" + "result": "engineersdecor:thin_steel_pole_head", + "required": ["engineersdecor:thin_steel_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json similarity index 71% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json index 9623469..306fb28 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/thin_steel_pole_recipe_backcycle.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:thin_steel_pole" + "result": "engineersdecor:thin_steel_pole", + "required": ["engineersdecor:thin_steel_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json index 9fc7e3d..735e3d7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_head_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_head_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole_head" + "result": "engineersdecor:treated_wood_pole_head", + "required": ["engineersdecor:treated_wood_pole"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json index 4be9e98..08ed0b9 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_support_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_support_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole_support" + "result": "engineersdecor:treated_wood_pole_support", + "required": ["engineersdecor:treated_wood_pole_head"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json similarity index 70% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json index 4f326b8..7942d20 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_wrapover_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/support/treated_wood_pole_wrapover_recipe.json @@ -2,7 +2,8 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole" + "result": "engineersdecor:treated_wood_pole", + "required": ["engineersdecor:treated_wood_pole_support"] } ], "type": "minecraft:crafting_shapeless", diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/steel_framed_window_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/window/steel_framed_window_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/steel_framed_window_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/window/steel_framed_window_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_window_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/window/treated_wood_window_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_window_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/window/treated_wood_window_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png index 25fac1a..0e3f2b7 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture0.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png index 6d7324f..b581cc0 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture1.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png index 82ca51b..9270c7b 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture2.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png index 1f17330..fc9916a 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture3.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png index 8c59908..1711670 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture4.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png index 68f5af5..95b7a51 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture5.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture6.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture6.png index d1f059c..e1df105 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture6.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture6.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png index 8b6ab7e..af4dff3 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/clinker_brick/clinker_brick_stained_texture7.png differ diff --git a/1.13/readme.md b/1.13/readme.md index 099ff8d..75a3ac8 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history + ~ v1.0.7-b4 [A] + - 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] Added "Factory Area" sign. diff --git a/meta/update.json b/meta/update.json index ba9c9fc..9b4248b 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.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.", "1.0.8-b2": "[F] Config opt-out fixed (thx IronPiston for the report #30).\n[A] Added opt-out config for detailed including/excluding of features (using registry name wildcard matching).", "1.0.8-b1": "[A] Added \"Factory area\" sign.\n[M] Electrical furnace recipe changed (hoppers to conveyors).\n[A] Opt-out config options added.\n[F] Lang file fixes for en_us (Angela, PR#29).", "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.", @@ -55,8 +56,8 @@ "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." }, "promos": { - "1.12.2-recommended": "1.0.7", - "1.12.2-latest": "1.0.8-b2", + "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" }