Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified assets/avaritia/textures/blocks/block_infinity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/avaritia/textures/items/resource_infinity_catalyst.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,37 +1,9 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
0,
0,
1,
1,
1,
2,
2,
2,
3,
3,
4,
4,
5,
6,
7,
8,
7,
6,
5,
4,
4,
3,
3,
2,
2,
2,
1,
1,
1
"interpolate": true,
"frames": [
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
}
Binary file modified assets/avaritia/textures/items/resource_infinity_ingot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 4 additions & 19 deletions assets/avaritia/textures/items/resource_infinity_ingot.png.mcmeta
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
{
"animation": {
"interpolate": true,
"frametime": 30,
"frames": [
{index: 0, time: 3},
{index: 1, time: 3},
{index: 2, time: 3},
{index: 3, time: 2},
{index: 4, time: 2},
5,
6,
7,
8,
7,
6,
5,
{index: 4, time: 2},
{index: 3, time: 2},
{index: 2, time: 3},
{index: 1, time: 3},
"interpolate": true,
"frames": [
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/blocks/draconic_block.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/items/draconicIngot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/items/draconic_Heart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/items/draconiumIngot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/items/dragonHeart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified assets/draconicevolution/textures/items/nuggetAwakened.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/draconicevolution/textures/items/nuggetDraconium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dreamcraft/textures/blocks/blockGaia.png
Binary file added assets/dreamcraft/textures/blocks/blockManaPearl.png
Binary file added assets/dreamcraft/textures/blocks/blockPixieDust.png
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.exciteddtcc.png
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.exciteddtec.png
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.exciteddtpc.png
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.exciteddtrc.png
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.png
Original file line number Diff line number Diff line change
@@ -1,37 +1,9 @@
{
"animation": {
"frametime": 1,
"interpolate": true,
"frames": [
0,
0,
0,
1,
1,
1,
2,
2,
2,
3,
3,
4,
4,
5,
6,
7,
8,
7,
6,
5,
4,
4,
3,
3,
2,
2,
2,
1,
1,
1
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Binary file modified assets/gregtech/textures/blocks/fluids/fluid.plasma.infinity.png
Original file line number Diff line number Diff line change
@@ -1,37 +1,9 @@
{
"animation": {
"frametime": 1,
"interpolate": true,
"frames": [
0,
0,
0,
1,
1,
1,
2,
2,
2,
3,
3,
4,
4,
5,
6,
7,
8,
7,
6,
5,
4,
4,
3,
3,
2,
2,
2,
1,
1,
1
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_CASING_GEARBOX_TUNGSTENSTEEL_ctm",
"alt": "gregtech:iconsets/MACHINE_CASING_GEARBOX_TUNGSTENSTEEL_alt"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_CASING_ITEM_PIPE_OSMIUM_ctm",
"alt": "gregtech:iconsets/MACHINE_CASING_ITEM_PIPE_OSMIUM_alt"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
"connection": "gregtech:iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE_ctm",
"alt": "gregtech:iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE_alt"
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_CASING_PIPE_TUNGSTENSTEEL_ctm",
"alt": "gregtech:iconsets/MACHINE_CASING_PIPE_TUNGSTENSTEEL_alt"
}
}
Binary file modified assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_INFINITY.png
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,12 @@
"animation": {
"interpolate": true,
"frames": [
{ "index": 0, "time": 8 },
{ "index": 1, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 8, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 1, "time": 8 }
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
},
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_COIL_INFINITY_ctm"
}
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_COIL_INFINITY_ctm",
"alt": "gregtech:iconsets/MACHINE_COIL_INFINITY_alt"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,12 @@
"animation": {
"interpolate": true,
"frames": [
{ "index": 0, "time": 8 },
{ "index": 1, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 8, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 1, "time": 8 }
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
},
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_COIL_INFINITY_BACKGROUND_ctm"
}
"myctmlib": {
"connection": "gregtech:iconsets/MACHINE_COIL_INFINITY_BACKGROUND_ctm",
"alt": "gregtech:iconsets/MACHINE_COIL_INFINITY_BACKGROUND_alt"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"animation": {
"interpolate": true,
"frames": [
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,8 @@
"animation": {
"interpolate": true,
"frames": [
{ "index": 0, "time": 8 },
{ "index": 1, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 8, "time": 8 },
{ "index": 7, "time": 8 },
{ "index": 6, "time": 8 },
{ "index": 5, "time": 8 },
{ "index": 4, "time": 8 },
{ "index": 3, "time": 8 },
{ "index": 2, "time": 8 },
{ "index": 1, "time": 8 }
{"index": 0, "time": 16},
{"index": 1, "time": 16}
]
}
}
Loading