Stained clinker added. CTRL-SHIFT tooltips opt-out config added. Recipe conditions updated due to detailed opt-out possibilities.

This commit is contained in:
stfwi 2019-06-10 12:12:06 +02:00
parent bb5b525f66
commit 46c2747a87
87 changed files with 309 additions and 61 deletions

View file

@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G
version_minecraft=1.12.2 version_minecraft=1.12.2
version_forge=14.23.5.2768 version_forge=14.23.5.2768
version_jei=4.10.0.198 version_jei=4.10.0.198
version_engineersdecor=1.0.8-b2 version_engineersdecor=1.0.8

View file

@ -1,6 +1,7 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": { "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-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.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.", "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." "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": { "promos": {
"1.12.2-recommended": "1.0.7", "1.12.2-recommended": "1.0.8",
"1.12.2-latest": "1.0.8-b2" "1.12.2-latest": "1.0.8"
} }
} }

View file

@ -10,6 +10,19 @@ Mod sources for Minecraft version 1.12.2.
---- ----
## Revision history ## 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). - v1.0.8-b2 [F] Config opt-out fixed (thx IronPiston for the report #30).
[A] Added opt-out config for detailed including/excluding [A] Added opt-out config for detailed including/excluding
of features (using registry name wildcard matching). of features (using registry name wildcard matching).

View file

@ -354,9 +354,17 @@ public class ModBlocks
private static final Object content[] = { private static final Object content[] = {
TREATED_WOOD_CRAFTING_TABLE, TREATED_WOOD_CRAFTING_TABLE_TEI, 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_BLOCK,
CLINKER_BRICK_STAIRS, CLINKER_BRICK_STAIRS,
CLINKER_BRICK_WALL, CLINKER_BRICK_WALL,
CLINKER_BRICK_STAINED_BLOCK,
CLINKER_BRICK_STAINED_STAIRS,
SLAG_BRICK_BLOCK, SLAG_BRICK_BLOCK,
SLAG_BRICK_STAIRS, SLAG_BRICK_STAIRS,
SLAG_BRICK_WALL, SLAG_BRICK_WALL,
@ -385,19 +393,10 @@ public class ModBlocks
THICK_STEEL_POLE_HEAD, THICK_STEEL_POLE_HEAD,
STEEL_DOUBLE_T_SUPPORT, STEEL_DOUBLE_T_SUPPORT,
SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_MODLOGO, 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[] = { private static final Object dev_content[] = {
SIGN_MINDSTEP, SIGN_MINDSTEP,
// design not sure yet ...
CLINKER_BRICK_STAINED_BLOCK,
CLINKER_BRICK_STAINED_STAIRS,
// handling not sure yet ... // handling not sure yet ...
HALFSLAB_REBARCONCRETE, HALFSLAB_REBARCONCRETE,
HALFSLAB_CONCRETE, HALFSLAB_CONCRETE,

View file

@ -85,6 +85,7 @@ public class ModAuxiliaries
{ {
// Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard, // Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard,
// so using this also here should be ok. // 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 help_available = (helpTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".help");
final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip"); final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip");
if((!help_available) && (!tip_available)) return false; if((!help_available) && (!tip_available)) return false;

View file

@ -176,6 +176,10 @@ public class ModConfig
@Config.Name("Without h. supports") @Config.Name("Without h. supports")
@Config.RequiresMcRestart @Config.RequiresMcRestart
public boolean without_hsupports = false; public boolean without_hsupports = false;
@Config.Comment({"Disable CTRL-SHIFT item tooltip display."})
@Config.Name("Without tooltips")
public boolean without_tooltips = false;
} }
@Config.Comment({ @Config.Comment({
@ -337,6 +341,9 @@ public class ModConfig
public static final boolean isWithoutRecipes() public static final boolean isWithoutRecipes()
{ return (zmisc==null) || (zmisc.without_recipes); } { return (zmisc==null) || (zmisc.without_recipes); }
public static boolean noToolTips()
{ return optout.without_tooltips; }
public static final boolean isOptedOut(final @Nullable Block block) public static final boolean isOptedOut(final @Nullable Block block)
{ return isOptedOut(block, false); } { return isOptedOut(block, false); }
@ -382,7 +389,7 @@ public class ModConfig
if(optout.without_walls && (block instanceof BlockDecorWall)) return true; if(optout.without_walls && (block instanceof BlockDecorWall)) return true;
if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true; if(optout.without_poles && (block instanceof BlockDecorStraightPole)) return true;
// String matching based evaluation // 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_slag_bricks && rn.startsWith("slag_brick_")) return true;
if(optout.without_rebar_concrete && rn.startsWith("rebar_concrete")) 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; if(optout.without_ie_concrete_wall && rn.startsWith("concrete_wall")) return true;

View file

@ -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.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.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.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.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.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.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.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.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.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 # EOF
#----------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------

View file

@ -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.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.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.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.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.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.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.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.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.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 # EOF
#----------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------

View file

@ -76,9 +76,17 @@
"name": "slabSheetmetalSteel" "name": "slabSheetmetalSteel"
}, },
{ {
"ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminium" }, "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminum" },
"name": "slabSheetmetalAluminium" "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" }, "ingredient": { "type": "forge:ore_dict", "ore": "sand" },
"name": "sand" "name": "sand"
@ -220,6 +228,13 @@
"ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 }, "ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 },
"name": "blockConcreteIe" "name": "blockConcreteIe"
}, },
{
"conditions": [
{ "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" }
],
"ingredient": { "item": "immersiveengineering:stone_decoration_slab", "data": 5 },
"name": "slabConcreteIe"
},
{ {
"conditions": [ "conditions": [
{ "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" } { "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" }

View file

@ -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"
}
}

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "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", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "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", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:clinker_brick_stairs" "result": "engineersdecor:clinker_brick_stairs",
"required": ["engineersdecor:clinker_brick_block"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:clinker_brick_block" "result": "engineersdecor:clinker_brick_block",
"required": ["engineersdecor:clinker_brick_stairs"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:clinker_brick_wall" "result": "engineersdecor:clinker_brick_wall",
"required": ["engineersdecor:clinker_brick_block"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:clinker_brick_block" "result": "engineersdecor:clinker_brick_block",
"required": ["engineersdecor:clinker_brick_wall"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:slag_brick_stairs" "result": "engineersdecor:slag_brick_stairs",
"required": ["engineersdecor:slag_brick_block"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:slag_brick_block" "result": "engineersdecor:slag_brick_block",
"required": ["engineersdecor:slag_brick_stairs"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:slag_brick_wall" "result": "engineersdecor:slag_brick_wall",
"required": ["engineersdecor:slag_brick_block"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:slag_brick_block" "result": "engineersdecor:slag_brick_block",
"required": ["engineersdecor:slag_brick_wall"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_stairs" "result": "engineersdecor:rebar_concrete_stairs",
"required": ["engineersdecor:rebar_concrete"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete" "result": "engineersdecor:rebar_concrete",
"required": ["engineersdecor:rebar_concrete_stairs"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_tile" "result": "engineersdecor:rebar_concrete_tile",
"required": ["engineersdecor:rebar_concrete"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete" "result": "engineersdecor:rebar_concrete",
"required": ["engineersdecor:rebar_concrete_tile"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_tile_stairs" "result": "engineersdecor:rebar_concrete_tile_stairs",
"required": ["engineersdecor:rebar_concrete_tile"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_tile" "result": "engineersdecor:rebar_concrete_tile",
"required": ["engineersdecor:rebar_concrete_tile_stairs"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_wall" "result": "engineersdecor:rebar_concrete_wall",
"required": ["engineersdecor:rebar_concrete"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete" "result": "engineersdecor:rebar_concrete",
"required": ["engineersdecor:rebar_concrete_wall"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -3,7 +3,7 @@
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:treated_wood_stool", "result": "engineersdecor:treated_wood_stool",
"required": ["immersiveengineering:material"] "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -3,7 +3,7 @@
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:treated_wood_table", "result": "engineersdecor:treated_wood_table",
"required": ["immersiveengineering:material"] "required": ["immersiveengineering:material", "engineersdecor:treated_wood_pole"]
} }
], ],
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",

View file

@ -2,8 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:sign_defense", "result": "engineersdecor:sign_factoryarea",
"required": ["engineersdecor:sign_danger"] "required": ["engineersdecor:sign_defense"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:thick_steel_pole_head" "result": "engineersdecor:thick_steel_pole_head",
"required": ["engineersdecor:thick_steel_pole"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:thick_steel_pole" "result": "engineersdecor:thick_steel_pole",
"required": ["engineersdecor:thick_steel_pole_head"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:thin_steel_pole_head" "result": "engineersdecor:thin_steel_pole_head",
"required": ["engineersdecor:thin_steel_pole"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:thin_steel_pole" "result": "engineersdecor:thin_steel_pole",
"required": ["engineersdecor:thin_steel_pole_head"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:treated_wood_pole_head" "result": "engineersdecor:treated_wood_pole_head",
"required": ["engineersdecor:treated_wood_pole"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "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", "type": "minecraft:crafting_shapeless",

View file

@ -2,7 +2,8 @@
"conditions": [ "conditions": [
{ {
"type": "engineersdecor:grc", "type": "engineersdecor:grc",
"result": "engineersdecor:treated_wood_pole" "result": "engineersdecor:treated_wood_pole",
"required": ["engineersdecor:treated_wood_pole_support"]
} }
], ],
"type": "minecraft:crafting_shapeless", "type": "minecraft:crafting_shapeless",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 757 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 B

After

Width:  |  Height:  |  Size: 731 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 740 B

After

Width:  |  Height:  |  Size: 750 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 738 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 756 B

After

Width:  |  Height:  |  Size: 751 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 739 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 B

After

Width:  |  Height:  |  Size: 750 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 734 B

After

Width:  |  Height:  |  Size: 753 B

Before After
Before After

View file

@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.13.2.
---- ----
## Revision history ## 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 - 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. to 1.13.2 implemented/prepared, therefore version re-assigned.
[A] Added "Factory Area" sign. [A] Added "Factory Area" sign.

View file

@ -1,6 +1,7 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": { "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-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.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.", "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." "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
}, },
"promos": { "promos": {
"1.12.2-recommended": "1.0.7", "1.12.2-recommended": "1.0.8",
"1.12.2-latest": "1.0.8-b2", "1.12.2-latest": "1.0.8",
"1.13.2-recommended": "", "1.13.2-recommended": "",
"1.13.2-latest": "1.0.7-b3" "1.13.2-latest": "1.0.7-b3"
} }