From 46c2747a87fe286b32277a94d2522d2a5884f180 Mon Sep 17 00:00:00 2001 From: stfwi Date: Mon, 10 Jun 2019 12:12:06 +0200 Subject: [PATCH] Stained clinker added. CTRL-SHIFT tooltips opt-out config added. Recipe conditions updated due to detailed opt-out possibilities. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +++-- 1.12/readme.md | 13 +++++++++++ .../wile/engineersdecor/blocks/ModBlocks.java | 17 +++++++------- .../engineersdecor/detail/ModAuxiliaries.java | 1 + .../wile/engineersdecor/detail/ModConfig.java | 9 +++++++- .../assets/engineersdecor/lang/en_us.lang | 16 ++++++------- .../assets/engineersdecor/lang/ru_ru.lang | 16 ++++++------- .../engineersdecor/recipes/_constants.json | 17 +++++++++++++- .../clinker_brick_block_recipe.json | 0 .../clinker_brick_stained_block_recipe.json | 0 ...er_brick_stained_block_recipe_reverse.json | 16 +++++++++++++ .../clinker_brick_stained_stairs_recipe.json | 3 ++- ...brick_stained_stairs_recipe_decompose.json | 3 ++- .../clinker_brick_stairs_recipe.json | 3 ++- ...clinker_brick_stairs_recipe_decompose.json | 3 ++- .../clinker_brick_wall_recipe.json | 3 ++- .../clinker_brick_wall_recipe_decompose.json | 3 ++- .../{ => brick}/slag_brick_block_recipe.json | 0 .../{ => brick}/slag_brick_stairs_recipe.json | 3 ++- .../slag_brick_stairs_recipe_decompose.json | 3 ++- .../{ => brick}/slag_brick_wall_recipe.json | 3 ++- .../slag_brick_wall_recipe_decompose.json | 3 ++- .../concrete_wall_recipe_ie_required.json | 0 .../panzerglass_block_recipe.json | 0 .../rebar_concrete_block_recipe.json | 0 .../rebar_concrete_stairs_recipe.json | 3 ++- ...ebar_concrete_stairs_recipe_decompose.json | 3 ++- .../rebar_concrete_tile_recipe.json | 3 ++- .../rebar_concrete_tile_recipe_decompose.json | 3 ++- .../rebar_concrete_tile_stairs_recipe.json | 3 ++- ...concrete_tile_stairs_recipe_decompose.json | 3 ++- .../rebar_concrete_wall_recipe.json | 3 ++- .../rebar_concrete_wall_recipe_decompose.json | 3 ++- .../{ => device}/factory_dropper_recipe.json | 0 .../passive_fluid_accumulator_recipe.json | 0 .../small_electrical_furnace_recipe.json | 0 .../small_lab_furnace_recipe.json | 0 .../small_waste_incinerator_recipe.json | 0 .../straight_pipe_valve_recipe.json | 0 ...ght_pipe_valve_redstone_analog_recipe.json | 0 .../straight_pipe_valve_redstone_recipe.json | 0 ..._pipe_valve_redstone_recipe_backcycle.json | 0 .../treated_wood_crafting_table_recipe.json | 0 .../treated_wood_stool_recipe.json | 2 +- .../treated_wood_table_recipe.json | 2 +- .../treated_wood_windowsill_recipe.json | 0 .../metal_rung_ladder_recipe.json | 0 .../{ => ladder}/metal_rung_steps_recipe.json | 0 .../treated_wood_ladder_recipe.json | 0 .../{ => light}/iron_inset_light_recipe.json | 0 .../{ => sign}/sign_danger_recipe.json | 0 .../{ => sign}/sign_defense_recipe.json | 0 .../{ => sign}/sign_factoryarea_recipe.json | 4 ++-- .../{ => sign}/sign_hotwire_recipe.json | 0 .../sign_hotwire_recipe_backcycle.json | 0 .../slab/halfslab_concrete_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_rebar_concrete_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_aluminum_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_copper_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_sheetmetal_gold_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_sheetmetal_iron_recipe.json | 21 ++++++++++++++++++ .../halfslab_sheetmetal_steel_recipe.json | 21 ++++++++++++++++++ .../slab/halfslab_treated_wood_recipe.json | 21 ++++++++++++++++++ .../steel_double_t_support_recipe.json | 0 .../thick_steel_pole_head_recipe.json | 3 ++- .../thick_steel_pole_recipe.json | 0 .../thick_steel_pole_recipe_backcycle.json | 3 ++- .../thin_steel_pole_head_recipe.json | 3 ++- .../{ => support}/thin_steel_pole_recipe.json | 0 .../thin_steel_pole_recipe_backcycle.json | 3 ++- .../treated_wood_pole_head_recipe.json | 3 ++- .../treated_wood_pole_recipe.json | 0 .../treated_wood_pole_support_recipe.json | 3 ++- .../treated_wood_pole_wrapover_recipe.json | 3 ++- .../steel_framed_window_recipe.json | 0 .../treated_wood_window_recipe.json | 0 .../clinker_brick_stained_texture0.png | Bin 737 -> 757 bytes .../clinker_brick_stained_texture1.png | Bin 748 -> 731 bytes .../clinker_brick_stained_texture2.png | Bin 740 -> 750 bytes .../clinker_brick_stained_texture3.png | Bin 738 -> 738 bytes .../clinker_brick_stained_texture4.png | Bin 756 -> 751 bytes .../clinker_brick_stained_texture5.png | Bin 738 -> 739 bytes .../clinker_brick_stained_texture6.png | Bin 748 -> 750 bytes .../clinker_brick_stained_texture7.png | Bin 734 -> 753 bytes 1.13/readme.md | 2 ++ meta/update.json | 5 +++-- 87 files changed, 309 insertions(+), 61 deletions(-) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_block_recipe.json (100%) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/brick/clinker_brick_stained_block_recipe_reverse.json rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_stairs_recipe.json (74%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stained_stairs_recipe_decompose.json (73%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stairs_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_wall_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/clinker_brick_wall_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_stairs_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_wall_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => brick}/slag_brick_wall_recipe_decompose.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/concrete_wall_recipe_ie_required.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/panzerglass_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_block_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_stairs_recipe.json (76%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_stairs_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_stairs_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_tile_stairs_recipe_decompose.json (74%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_wall_recipe.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => concrete}/rebar_concrete_wall_recipe_decompose.json (75%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/factory_dropper_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/passive_fluid_accumulator_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_electrical_furnace_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_lab_furnace_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/small_waste_incinerator_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_analog_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/straight_pipe_valve_redstone_recipe_backcycle.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => device}/treated_wood_crafting_table_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_stool_recipe.json (83%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_table_recipe.json (84%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => furniture}/treated_wood_windowsill_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/metal_rung_ladder_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/metal_rung_steps_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => ladder}/treated_wood_ladder_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => light}/iron_inset_light_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_danger_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_defense_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_factoryarea_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_hotwire_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => sign}/sign_hotwire_recipe_backcycle.json (100%) create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_concrete_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_rebar_concrete_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_aluminum_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_copper_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_gold_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_iron_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_sheetmetal_steel_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/slab/halfslab_treated_wood_recipe.json rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/steel_double_t_support_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_head_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thick_steel_pole_recipe_backcycle.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_head_recipe.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/thin_steel_pole_recipe_backcycle.json (71%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_head_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_support_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => support}/treated_wood_pole_wrapover_recipe.json (70%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => window}/steel_framed_window_recipe.json (100%) rename 1.12/src/main/resources/assets/engineersdecor/recipes/{ => window}/treated_wood_window_recipe.json (100%) 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 25fac1a422b9b8e1a4865288741d1ee05c2cc283..0e3f2b7745102fd38ca3349e1436c520ef9ca6a2 100644 GIT binary patch delta 694 zcmV;n0!jVh1@#4xOMjI~L_t(I%O%lIid)k$~T5_jOl4G4k*wMRV= z6`Z&XLBt?}BL_~zt!Qvy0zm{x_8=sR6YcKmu736E-FweD4zh*slZWrW9d?*m4?Sn^ zU2ys2CvNA3K-ez@bH_YT5#IXfQ~rDWGa^Dk$X!QPt4yU~1b@fjT+a*595=@zSob|s ztr&`^aNQg+W8G!k9c^Z4Ql{$M?(UeDO07mjaBt`-b;jo%8+9(XH;5Y~#R>YHkRQMO zI!dWDYYgK^0P}uNR;5L7^Uq(b#u3-daPk^%jZT&IX2X6zlmC74i2brKEe#K+*MtEU z&KvKZ^WxbbxPKWD2rQr{6~Ow)uptj3-Pr>6vgxihXeakarDkPFCIT4BUl7iIUxkP z+Hi9yoPGE)`KC6aHB^kb98eJemZfk6D6l&$AmE-*KpsdOMih$L_t(I%PrGOYn@dTfZ=zoz4v!HCzl!&oheESrLBRYr~?&o zUMM*A_jY2Tqc~_Ch?5{8X-;y^ciDTb<)Hq97am@D`Sf8VtDKGl>G3)3&o}I*g)Sv( zGb|kUz&!Z;r(byg$1AEk6(K~?UV^nbcgsRbncAEHZs(Qz+JA^pS_GuTI1Ehg?AHeF zM62X###l0a&X^l+j)tN*A&{k!e5I5Db7!MMHxvL=l*|{82vv^G&bYj~Vtn)jSyyyk zNUGR!V7nO^H(T!ad*tC$ioogdF|{>v_s=^D@bB9O;oOB#!;yf`zWI)u*B4A4R8^We z~@GKVU4gxmIx+m2*Sag zq6t+n6bT4(77ubt6dVr_YluL}nSA>7bNW(HRdUL#%SsTK86f2I=ST=kt$g(0got1m z1`dabsWq~^yWsXPkwtj${g2#Tydi+*fe^HSK^0Y@e1G}_*RNl(4@Xr$h|RT;x}IiE zNdoysvC4&VKa{W2Os=`56Q-gH~;_u07*qo IM6N<$f@T&#BLDyZ 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 6d7324ffd12fe192f2127b70c0479f78999a83d1..b581cc05a956ac2e301a2f0946d580c106c94446 100644 GIT binary patch delta 668 zcmV;N0%QH`1=|IXOMiPwL_t(I%SDpCs$^9VMpxC|=XCen?w-W^0+X1C2Et%!qKO6u zA|i~4_y7ZfkszXpsfmf0h>D;nOyVS_zQH7-AcBDiS3ReD|5cSi2S#7|t;Ldep1m9G zeCF0>;?4^%^UH&;0kDA9jika-8WF+W*WTdKH(wwkG$7}Rtbf)S-DpX;efx-N;$}V5 zx}ix(2nghPOUgr!8C*)sugSmt@I9p&r!lzm{EPhh<3l2XNq-b~BdIdX*=FULdvEgdw_mc9 z%6^{ty$|xusSp9?aanUD;6$f&W0w;U)aJC-S!>7LS$ju-OaxO(3Q7nN18tgksK;vRPsE}%mNz~x?jRk0=FRNg!O^Aqky{u&;do5=Lz}rqYt8# zhWTLLY``5<*-R5ILPTJ#;{i50s*1ZaO_}}S$Q6I-e1?GZG;Kow0000L_t(I%RQ4ji(XX}K-b>qoO{35%*4^Cjh&<$As9raun+`` z6ek9xTnco_}T{pw>WCh*CJ&?^(>4 zs*wn2l{~F0XMIm~I1Wb$p-+VYFwYC-&ZcBUpwAik=JQYE_49Mqb!BZv zR%MwcJc4_#p0iF9&77`e_WJ`8&T$;s^gWyHhCKaz#dCpbMiQYbh0%i~!u=0F;*YEE zSCkMK&u-$C1 zW>hokvas828K#Ms*GIOe2lDvrDc9x%aC-5Oe}4astbfXlKo&@<;Et+t|KWQKzh3e8 zFcCmf$Tw@H(}b#`k{FhiUCET3n3|Kg3utECjw4cyh@ex5fV|6z)q?A3qKqS1g`0UH zsosG}Ig3OK=(>*Ed8Q91NyY-?yRW{8WnCG@33Eq9=u1IWxfupFeNQe0H)Frw^UBGA z&2~#l%71aVCBJy~6B5qcoY9;fqa|fq3U6FI;`xtHaC00uYzlumOrqHBz=Ox1kZUtE zoQ!j-P+jPA!4dkBDa|l~-kq1Xm4?uTGpvnLGC7xwx5_>h%!4ihiNHK4rMsKP9VKvg zGO&73R1s0~Tkl_TydKc3bX|wHhN#k&Lci^K`zGVZSZnMK2izKFhN@C)g@FG6I9Phm T(T;bh00000NkvXXu0mjfdB#j! 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 82ca51b0f1283130f89b8dbe4e6e7f04bbb50f78..9270c7bcb8bed14407172290d6cd443bcd67dc76 100644 GIT binary patch delta 687 zcmV;g0#NO=wq!tX=ScqV!V5QYX zkz5i|TKEyt2L;hjV4;QBh>#Fe5-j`#cD6#WFa(5{b8^qj>^*y}WpTd2%k%!^?)&d} zooCFQH$S<}UqAoEzb_|Z2m}#A5KNsuN8b48lD~hskBCr#oPQFjb7g7`7hxDj4yA!Z zYYGAaEM`>MVD9W|Ma%){h7F;qGIky6u#|maA2wKPNC;rYxZ6?YnYON&Lr$6W&*O)*)>z6)Q6)%Vb;sO! z>+%jyetp2PHh<=|;W!`+DYES|uU}k}4#%07b)^e|+7uThNnpqcbLTLxC`KQINu7u> z$&)eLutIe|IVl({y#m>BwmnUPZ<)J7Kr&5TW#a5vJ8k8g3DXG8>dXIU!4 zu;DmOG*@2x@B+*TDWR>==Zxd18JkT{diwYQ&yN*z*0nK}dV+*ILyoMb z3`0*-qnd$35{N-CKm~$C+>9cgmJfHjFGo*-61_Y zPN0gq%k2q(C5s!+bB{>LF>uBww2AMXITo4bAJ9R{{xS< Vg&Z}3=4$`|002ovPDHLkV1l)SMi~GA delta 677 zcmV;W0$Tm<1>^;gOMiq(L_t(I%Po`3idqoLg0?N_Q6oA1$I2ok$EKW?;ZU z6yNv_et?5aoICTA#6S`U5`>@=KS0C~L}MqNu6yg=d(Ph5LFEtDVzK1w_pSzYrkZp0 zi?4Wi?>0~S0aVE%csL$HR^|1ZAM?lE+aOR8mN}Di7(+9LT7Nm;^$fKELYPwpRD>Wf zRa$M#Ze)aJ&g@Q(2m+WKtXBT(M+7KI=|nJ96vfQ2*2pOl0pURlkne7N6Z1UN4|^6} zhpJ+&()RbAbzF=iT~g+0rkT-NBmZ;%Cxqa9Khs;#%t2t46Ib4Tm&d>V z%Ae+hHB^KyC4Ug5D~Z=`+$0avOl`(Kpcx>72#mE+TVQfR0|@4)Av8%uRA|r9)Fwx%^VRS3An?nAAQ23J3lg1 z<8qgIlry=XDj;|S?t!$1Szyoex(Dj<}c`0ayS5 zqF@ntz-qB%vPwybE-4_$_ut+MMCkW>j*gERb~`S1JHmscN+}t6PMC6LyFKCQ`7??N zr4;htKY!n4oGUJghY_SUv0W{ZoT+bKyyeQ-6=mid{t%M%Ug|b`kty?dpqc?`L{lnd~xgDI3AB|$AMRF-RAPq0|0u! zloQWuB^;VNZ=HY4A3uD90}Wv)g>1Fr=FHkCx{%GBxkTT5*5~T!JKuBt;?+fh#j|Qo^15#+?glYmCD{MDXPDU!1_KvDvJ7^}Y9za6}U? zzqDh>nNl*{9ZgF9`{(bOmrm`Sv%8=2__v2NcNC$T5q~1Al7a}Yee?;xfA=-vPDu$w z(5J@*>mBP(c(BdN7(tHClmzJ=YsSbmSrhKTu^HAoN(2aWaZ*l*C^x5(^-$1&4mj}N z(zu!zQW9=#CrVOE%EW`uwu9INAtVG)=)I;0E&OYc;>ekZ^Ka!!Z{V<{9(XawFJ0R~lqAisHj z!Rb_SH&6w4oa+$^uYYh(uMH3A)=*VyYs3rL{}hjTgb-_N9^e1~002ovPDHLkV1j`W BM2i3b delta 667 zcmV;M0%ZN-1>yyeQ-6~^i(OR|K-b>qocrL#$T}3DwaI@_`|rFCKTcF+wXY(_!nMI2l`UT zB6v6+LRRJO=U;O5_%{%!2t&?fS|!|>&A6EktmgD76XsL_6@MWJOqJG*)s2kM%vs&Z zb8D;)E(vRmmxmJql%#Ybm@0~5X1EzSB_bd^XaVxW!|x-fguCMrbfrThSeAux90+&L zFD@9mj{WI`gj1K5W=3sBKK%8RZBFc$%E5wW4gzCNTzqiJzt8^UA9KPQDngeMh|-nB z=Dm-|^Ri-9nSTSC0V0UNsW#TyI4zADhDNaKGDJ{v!UN`YArCoG12#!GX^;bIKoy}c z1xdnI3PTo}8DmMT))@Ojzul0x@84rH4s6De{WReY5WMxq>r{7Md-WRxp*ADJ*=$D+ z(~)^T5hCRJ_cN}|Ng}**|5IN4{wwCe3lEw*S(PN<4u5Zc@ikXJ|HQExV^%g@M?S2T zEJ_PUG+}FHu|Na>*5;HXG!KsR%=tJ{{m5L6q!kqckHEv&-PtiWBdK5k1c-t~-~nUb zvsfjk#8?s_$d8X6#%35uC3ENOjN>%1pC-bCq)I6nLH>up`NbK><4n<8#eDtr34;on zGFK6#wtsLj4oJ?_cQ3hl@&`+EJV1acfoyiv)_D8DSLErmvIq>N;sHs8>vUDp91s)PqB0TFmOsABHqcRqW-GOuVB z`o2da5KZ)5L6dTJ?-Q&UaBH{QZ83A!R!O4#2Nbw=a619RFbeN@A_z1La>m49#Y@yJJSyc%_$ z*^WJT-+GTt4JAV$O5o0wc+!&^T)dNA8 zYs1{>L|9uxL|MwpVJ)~hM9|h1ZDvTP{I?p1nd;RA}ps9BEtS+kGF=XQrE(?+p#V)3V1+Hne^o9F=QY4$XB0#8nrbp9{C-295`USIj!R)~POn0E(A?=9W^V+7yE7&w0i{+1_~&*efai7- zN(5t43}?UJk+cH^fF2MPj@3AtW7S!jaZ`E3

5e->%9u(C=KL_tK-8Jl4Ay?gFCckjK{vUsnY)f`O5l&{{p?d!5I4Ffms zeaIg_{m9|e2|-99fIBG!lE9tMzvRy!9wGvZI-6l2wOUa#PJg|znE-z`V5kn-UNEAW7{o*rk zt+SgZhM`bm;&_}n-|s19;CP$~AyQJJY(~0vO3s)&wRPnF%^N=DLPbW>U^q#(Th z!AGP;jjo0-EB)Gq+KsdAaE+_{x2%L9V1~QX>Ov2~<>5fsj05IQiHWgf+##nx61f`I zo$XMVQX=4F5xOY?gb+yQZ@$C2thm514!j&AF)n9@oY`!*oIm)K-a3xpc6IZMivy>6 bqP5Qd@S%cP;Q!Ak00000NkvXXu0mjfq|#6e 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 68f5af520dcaf1f051b6f7646809851f0d74f02f..95b7a51869655049467faa0d3a58cea86f10e11d 100644 GIT binary patch delta 676 zcmV;V0$cs!1>*&fOMin&L_t(I%Qca)iX}x9K+nB(tGeH`>lhlU2#UdCU??Ug3#;zx zGK=U>mdP7fg`Ap$fjQ&JKg%SH+(7o)oKT+YbXUw$5a zcS^~q8NEC6%{3yzG)*KGhB7eEGj~o;+17=G&?Cr}v1b=g*juCTj)$}MV6ep2J8wSv znBRZ+76OVXbARiUY*;{6c;nHhnD$O>9aW+2feNg<69HRm^bS)I=Gv$p;C^c=0xGD7 zgFyE{lA@ZZzT>LoWQfAtoNUIF6cM3%$C486*sJfKAu24}#(Z4awvBNZNJ&A3yARJe z9*^{Zt!|tQ10K#e3}{m9>63Go+FACUm+n2_xAX5&6@S*+$qLzwB*OK!@%H0SczW?O zwKfhpLj-ntTpDVgi5YhHN% z4)*uO6MrsooWx%@Gu|qKfGT$%obl%`KY|AcY`bF$UPgKkUcCPScGY$UoXh!!V{Hg< zQjEFnx668GtBn8yyeOMik%L_t(I%Po<+iljvpfWLFMROx`0!hW~s z)*Ww7N=~X36M>{k4XCwIPzFt;q715}BzVBm8;9eFcxP2IQ)?tub2JxD2mDmMS|8_A64&FS6|Q2+wCzWJ1=-+#w(sSGKx zoh#Xlby8L)s``cf1=^o z^MW2nY(Fj3P)=sdqGME_5Oqe_GJ@=fwx5b-Zu-1CkTJqW3x5Czy z-B@_}o%i|Ymj{@G12wuPa5q~|ni-@oxpoy&3sDIs9RnU}BO+3DMPIw?H zD8e{o#@#hqZ|pt5Iw>Wh8%hLY$y5u>3^zv+_N}vZ!^7FvjlmlLIh=XSI6=t?x%2fG z5gv3idITkBhNKLou+)n8j;PXGW0+>foan8wZjA`YfB$r!t6HhsL2XQlrF9^<^~tCF ze(!s#8FR^)JAaxoqd<4(joTlSd+S`)PVI(7uy!Mh;=t9qLco{=dEsz~hNXl>fCw7l zy;OWJJ6PO>?cXa(aX2F{uoRKeDCwgb8 zDL_t(I%O%pwiXBxHfZ>0wy=qt0Ieif{L=b`_L4v3l6+BjWS}!A`UXB&1ZgFiICbVMY0#+M?Ma_HwJ&Qq$TNJOJh*c^Qm+g{=H}f`IRE7* z!kr#44T;to)q|xuuiyWar@#Kpl!PUMJd9W^h2~C;iXzky%741D*3N$-XnL+_|4(Ve7lv2^sWXFS^%jimBl4)ZS=4s1YPfBwjoa5%QpH z=b3RxBnd=dP(gnD{<~O~g=INVN@X)o{CjytZH;-J*vu2B$0zKruTg}E;N+!KdaX?J zgnawn?SH7fQhFfCh*r2b6o!;|?fsAV^S8&SJD~}HoRoRHWf0+wFTTY7URDgpdncvF zS{v@p(w+6Na=EM=4T(_&5W07EyB*uX*e`qRWHWQvUo#HIJQy*Klpd(Ut2bWZYBM43 zBoUGb1UP~Kt#$0y-FqCCf|`(XMkA1vm~zH}cP793nqC`$U`a7c)LN;n5dr@L80Bs8 ThdF{P00000NkvXXu0mjfBF;(N 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 8b6ab7edb2e7a9e7a6ffd1c45adf6cfaf59bdf83..af4dff35a27265a90a104d13e060c9e9a4b9d4f8 100644 GIT binary patch delta 690 zcmV;j0!{ti1@Q%tOMj6`L_t(I%SDsBie^O=M%S*|r_Slq_sl>8F)=XJSQ9}6Z4?nq z36}#?k46=w!ul7$hFc99Ouc`Ugzg8KSxB^4_Hz{Ykw(})=3)BY2to2a;da# z>`NsgfTPPwE`{UHBIyZIw_}<5^Nw-WH=;^xPvpuIb*GJyiDY7Xo$$i z@4fAlDs!4x))f&U?{^x-6p)NVZe z#+&?d;|oeR)_FhWQ|fkbB1+_Ibn1890~sGFP>t2&$2@ zbs^0OZQZD25ClMw|D-uWKnPK|`%l4qa5^WB=fq|Mje%Ax^67`~x|xxtL}``0-&og` z+A5k7DnbOhJ5m0}=TbO5J465c@fNulL7c~4c!i(7`G1PijiWg+ML|Pk(SV5X$n!7p z*Z1F2YQqrzFhlR|Hukj>MaX&M_#iPgBSqn=G?rl8+Xg`b54BDZq4Z95ST&+5aIz%2 z4-ml#Bn5HjNEL~~ii%geu+=Lx;@!)@G+7?c_Uwq>ReIG86Me)fXjZhsBKK?K~<0AV?#w9XS3 zFQeIv(L1egm^&JTkS4D327rxm{fQtrf(nFoMH|jmDxnQ$S1SieSyVZh7pggZK(}jY z=LZWZMig*!av$)Zmd`$V->>fPsI4-kga)Cs&MUgioSvUE%&>ahzV${oV~m0093P+X YFHwJa6@zMJ9smFU07*qoM6N<$f=il8egFUf delta 671 zcmV;Q0$}~|1>OaaOMiYzL_t(I%Po<+s$EqSK*yYOt+gNLL~h`r$V+1QxC4Pt8}Xdxt6$W6}K&$Z^XxcPy>U<~=@y?3M4MoEc#A3o;a->(4h zfMkNVMr}b7xO@487gtXS01*y-Pnwq%5k;iowNeA-Z6_j75q}cU2xRCHpuVB^Noear zI`)})b4-z z7zW0nC#A$t3iGnk_Z^lK^7VuJA>o+FjRjz;oVQB<;33POf6%F63a71NW{jqo!tF;N zk-RmMDSLCa=6@hUjYjpL^B`K#)S1`DR2#nTY$bDdD7-qINSzARg8&?%Iq=5f&c$v1 zG2y)Ic)+nF#!~PIT!f)y(!(#mqSZ!((>!=}{hF>Xs0gQN=HC04m?cydZw(P>?yTDm zBBZ~5`I%*J^f~eN2OsnI^JlEhId%n;08xrSNyeSaPk;FDw`c6Nky7~qSU|ey3)R6?Zq|qp277Ht1PBZz)0fQ9brco4 zoLJVKloRsP58s8vO~k!9*_6}yOv#yT-x<1&!{NZX?+oL}zHN+s&pb^W#*y^m>M8Dx zK+&98mwyQr!OVE)@>5J-FiwW~yDQ0wLs0w3B49U24Jks1bbcJGu0TIDz+X(lY3-_OV z#_2TS0?WLBJE$`DJ=Gf*j~-*H