Merge remote-tracking branch 'origin/1.14' into 1.14.4

This commit is contained in:
modmuss50 2019-08-02 14:08:11 +01:00
commit 2715eae180
274 changed files with 567 additions and 2348 deletions

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/bucket_fluid_template",
"textures": {
"texture": "techreborn:item/bucket_background"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "techreborn:item/bucket_base"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "techreborn:item/bucket_fluid_template",
"textures": {
"texture": "techreborn:item/bucket_background"
}
}

View file

@ -0,0 +1,59 @@
{
"elements": [
{
"from": [4, 11, 7.5],
"to": [12, 13, 8.5],
"faces": {
"north": {"uv": [4, 3, 12, 5], "texture": "#texture"},
"south": {"uv": [4, 3, 12, 5], "texture": "#texture"}
}
},
{
"from": [5, 10, 7.5],
"to": [11, 11, 8.5],
"faces": {
"north": {"uv": [5, 5, 11, 6], "texture": "#texture"},
"south": {"uv": [5, 5, 11, 6], "texture": "#texture"}
}
},
{
"from": [3, 11, 7.5],
"to": [4, 12, 8.5],
"faces": {
"north": {"uv": [12, 4, 13, 5], "texture": "#texture"},
"south": {"uv": [12, 4, 13, 5], "texture": "#texture"}
}
},
{
"from": [12, 11, 7.5],
"to": [13, 12, 8.5],
"rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]},
"faces": {
"north": {"uv": [3, 4, 4, 5], "texture": "#texture"},
"south": {"uv": [3, 4, 4, 5], "texture": "#texture"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"firstperson_righthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"head": {
"rotation": [0, 180, 0],
"translation": [0, 13, 7]
},
"fixed": {
"rotation": [0, 180, 0]
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 B

View file

@ -0,0 +1,22 @@
{
"type": "techreborn:blast_furnace",
"power": 128,
"time": 1000,
"heat": 1500,
"ingredients": [
{
"fluid": "techreborn:calciumcarbonate",
"holder": "techreborn:cell",
"count": 2
}
],
"results": [
{
"item": "techreborn:silicon_plate"
},
{
"item": "techreborn:cell",
"count": 2
}
]
}

View file

@ -4,7 +4,7 @@
"time": 5,
"ingredients": [
{
"item": "minecraft:grass",
"item": "minecraft:grass_block",
"count": 16
}
],

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:aluminum_dust"
}
],
"results": [
{
"item": "techreborn:aluminum_plate"
}
]
}

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:brass_dust"
}
],
"results": [
{
"item": "techreborn:brass_plate"
}
]
}

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:bronze_dust"
}
],
"results": [
{
"item": "techreborn:bronze_plate"
}
]
}

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:chrome_dust"
}
],
"results": [
{
"item": "techreborn:chrome_plate"
}
]
}

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:copper_dust"
}
],
"results": [
{
"item": "techreborn:copper_plate"
}
]
}

View file

@ -1,15 +0,0 @@
{
"type": "techreborn:compressor",
"power": 10,
"time": 250,
"ingredients": [
{
"item": "techreborn:electrum_dust"
}
],
"results": [
{
"item": "techreborn:electrum_plate"
}
]
}

Some files were not shown because too many files have changed in this diff Show more