Update to latest commit(Master)

This commit is contained in:
Dimmerworld 2017-10-05 02:38:11 +11:00 committed by drcrazy
parent c8b6edd390
commit c651363b73
12 changed files with 174 additions and 135 deletions

View file

@ -1,34 +1,60 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_bottom_top",
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom"
}
},
"variants": {
"inventory": {
"transform": "forge:default-block",
"model": "cube_bottom_top",
"textures": {
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"active": {
"true": {
"textures": {
"side": "techreborn:blocks/machines/generators/solar_panel_side_on"
}
},
"false": {
"textures": {
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
}
}
}
}
"forge_marker": 1,
"defaults": {
"textures": {},
"transform": "forge:default-block",
"model": "cube_bottom_top"
},
"variants": {
"inventory": {
"transform": "forge:default-block",
"model": "cube_bottom_top",
"textures": {
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"type": {
"basic": {
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom",
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"hybrid": {
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom",
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"advanced": {
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom",
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"ultimate": {
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom",
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
},
"quantum": {
"textures": {
"particle": "techreborn:blocks/machines/generators/solar_panel_side_off",
"top": "techreborn:blocks/machines/generators/solar_panel_top",
"down": "techreborn:blocks/machines/generators/generator_bottom",
"side": "techreborn:blocks/machines/generators/solar_panel_side_off"
}
}
}
}
}

View file

@ -59,7 +59,12 @@ tile.techreborn:machine_frame.advanced.name=Advanced Machine Frame
tile.techreborn:machine_frame.basic.name=Basic Machine Frame
tile.techreborn:ore2.copper.name=Copper Ore
tile.techreborn:ore2.tin.name=Tin Ore
tile.techreborn:solar_panel.name=Solar Panel
tile.techreborn:solar_panel.basic.name=Basic Solar Panel
tile.techreborn:solar_panel.hybrid.name=Hybrid Solar Panel
tile.techreborn:solar_panel.advanced.name=Advanced Solar Panel
tile.techreborn:solar_panel.ultimate.name=Ultimate Solar Panel
tile.techreborn:solar_panel.quantum.name=Quantum Solar Panel
tile.techreborn:creative_solar_panel.name=Creative Panel
tile.techreborn:water_mill.name=Water Mill
tile.techreborn:wind_mill.name=Wind Mill