Merge branch '1.12' into feature/solar-panles

Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
This commit is contained in:
drcrazy 2017-11-28 17:28:47 +03:00
commit eab088c094
77 changed files with 948 additions and 967 deletions

View file

@ -1,12 +1,12 @@
{
"forge_marker": 1,
"variants": {
"techreborn.berylium": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidberylium"
}
},
"forge_marker": 1,
"defaults": {
"model": "forge:fluid"
},
"variants": {
"techreborn.berylium": [{
"custom": { "fluid": "fluidberylium" }
}],
"techreborn.calcium": {
"model": "forge:fluid",
"custom": {

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/misc/missing_recipe"
}
}

View file

@ -0,0 +1,9 @@
{
"ctm":{
"ctm_version": 1,
"type":"CTM",
"textures":[
"techreborn:blocks/machines/energy/ev_multi_side_ctm"
]
}
}