fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced a few tabs with spaces like everywhere else.

Browse Source
This commit is contained in:
yueh
2016-10-24 15:39:06 +02:00
parent 581822b234
commit dafa0e85c9
18 changed files with 115 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/block/inscriber.json
+37 -38
View File
@@ -1,10 +1,14 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/orientable",
"textures": {
"particle": "appliedenergistics2:blocks/inscriber",
"side": "appliedenergistics2:blocks/inscriber"
},
"elements": [ "elements": [
{ {
"faces": { "faces": {
"down": { "down": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -13,7 +17,7 @@
] ]
}, },
"east": { "east": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -22,7 +26,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -31,7 +35,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
13.0, 13.0,
0.0, 0.0,
@@ -40,7 +44,7 @@
] ]
}, },
"up": { "up": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -49,7 +53,7 @@
] ]
}, },
"west": { "west": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -73,7 +77,7 @@
{ {
"faces": { "faces": {
"down": { "down": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -82,7 +86,7 @@
] ]
}, },
"east": { "east": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -91,7 +95,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
15.0, 15.0,
@@ -100,7 +104,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -118,7 +122,7 @@
] ]
}, },
"west": { "west": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
0.0, 0.0,
@@ -142,7 +146,7 @@
{ {
"faces": { "faces": {
"down": { "down": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -151,7 +155,7 @@
] ]
}, },
"east": { "east": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -160,7 +164,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
13.0, 13.0,
0.0, 0.0,
@@ -169,7 +173,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -178,7 +182,7 @@
] ]
}, },
"up": { "up": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
13.0, 13.0,
0.0, 0.0,
@@ -187,7 +191,7 @@
] ]
}, },
"west": { "west": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -220,7 +224,7 @@
] ]
}, },
"east": { "east": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
0.0, 0.0,
@@ -229,7 +233,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
15.0, 15.0,
@@ -238,7 +242,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
0.0, 0.0,
@@ -247,7 +251,7 @@
] ]
}, },
"up": { "up": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
1.0, 1.0,
@@ -256,7 +260,7 @@
] ]
}, },
"west": { "west": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
1.0, 1.0,
15.0, 15.0,
@@ -298,7 +302,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
12.0, 12.0,
@@ -316,7 +320,7 @@
] ]
}, },
"up": { "up": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
1.0, 1.0,
@@ -349,7 +353,7 @@
{ {
"faces": { "faces": {
"down": { "down": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
1.0, 1.0,
@@ -367,7 +371,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
1.0, 1.0,
@@ -376,7 +380,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
1.0, 1.0,
@@ -418,7 +422,7 @@
{ {
"faces": { "faces": {
"down": { "down": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -436,7 +440,7 @@
] ]
}, },
"north": { "north": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
1.0, 1.0,
@@ -445,7 +449,7 @@
] ]
}, },
"south": { "south": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
3.0, 3.0,
0.0, 0.0,
@@ -454,7 +458,7 @@
] ]
}, },
"up": { "up": {
"texture": "#0", "texture": "#side",
"uv": [ "uv": [
0.0, 0.0,
0.0, 0.0,
@@ -484,10 +488,5 @@
16.0 16.0
] ]
} }
], ]
"parent": "block/orientable",
"textures": {
"particle": "appliedenergistics2:blocks/inscriber",
"0": "appliedenergistics2:blocks/inscriber"
}
} }
src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json
+1 -1
View File
@@ -299,7 +299,7 @@
} }
], ],
"textures": { "textures": {
"particle": "appliedenergistics2:blocks/quartz_fixture", "particle": "appliedenergistics2:blocks/quartz_fixture",
"metal": "appliedenergistics2:blocks/quartz_fixture_metal", "metal": "appliedenergistics2:blocks/quartz_fixture_metal",
"quartz": "appliedenergistics2:blocks/quartz_fixture" "quartz": "appliedenergistics2:blocks/quartz_fixture"
} }
src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json
+1 -1
View File
@@ -299,7 +299,7 @@
} }
], ],
"textures": { "textures": {
"particle": "appliedenergistics2:blocks/quartz_fixture", "particle": "appliedenergistics2:blocks/quartz_fixture",
"metal": "appliedenergistics2:blocks/quartz_fixture_metal", "metal": "appliedenergistics2:blocks/quartz_fixture_metal",
"quartz": "appliedenergistics2:blocks/quartz_fixture" "quartz": "appliedenergistics2:blocks/quartz_fixture"
} }
src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json
+1 -1
View File
@@ -201,7 +201,7 @@
} }
], ],
"textures": { "textures": {
"particle": "appliedenergistics2:blocks/quartz_fixture", "particle": "appliedenergistics2:blocks/quartz_fixture",
"metal": "appliedenergistics2:blocks/quartz_fixture_metal", "metal": "appliedenergistics2:blocks/quartz_fixture_metal",
"quartz": "appliedenergistics2:blocks/quartz_fixture" "quartz": "appliedenergistics2:blocks/quartz_fixture"
} }
src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json
+1 -1
View File
@@ -201,7 +201,7 @@
} }
], ],
"textures": { "textures": {
"particle": "appliedenergistics2:blocks/quartz_fixture", "particle": "appliedenergistics2:blocks/quartz_fixture",
"metal": "appliedenergistics2:blocks/quartz_fixture_metal", "metal": "appliedenergistics2:blocks/quartz_fixture_metal",
"quartz": "appliedenergistics2:blocks/quartz_fixture" "quartz": "appliedenergistics2:blocks/quartz_fixture"
} }
src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json
+1 -1
View File
@@ -33,7 +33,7 @@
} }
], ],
"textures": { "textures": {
"particle": "blocks/tnt_side", "particle": "blocks/tnt_side",
"side": "blocks/tnt_side", "side": "blocks/tnt_side",
"top": "blocks/tnt_top", "top": "blocks/tnt_top",
"bottom": "blocks/tnt_bottom" "bottom": "blocks/tnt_bottom"
src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe
+1 -1
View File
@@ -1,6 +1,6 @@
shaped= shaped=
ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block, ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block,
ae2:sky_stone_block _ ae2:sky_stone_block, ae2:sky_stone_block _ ae2:sky_stone_block,
ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block
-> ae2:sky_stone_chest -> ae2:sky_stone_chest
src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe
+3 -3
View File
@@ -1,3 +1,3 @@
shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:crystal_seed.nether shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:crystal_seed.nether
shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:crystal_seed.certus shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:crystal_seed.certus
shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:crystal_seed.fluix shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:crystal_seed.fluix
src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 424 B

src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"animation": { "animation": {
"frametime": 3, "frametime": 3,
"frames": [ "frames": [
1, 1,
2, 2,
@@ -13,7 +13,7 @@
9, 9,
10, 10,
11, 11,
0 0
] ]
} }
} }
src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"animation": { "animation": {
"frametime": 3, "frametime": 3,
"frames": [ "frames": [
0, 0,
1, 1,
src/main/resources/assets/appliedenergistics2/textures/blocks/molecular_assembler_lights.png.mcmeta
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"animation": { "animation": {
"frametime": 3, "frametime": 3,
"frames": [ "frames": [
0, 0,
1, 1,
src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"animation": { "animation": {
"frametime": 4, "frametime": 4,
"frames": [ "frames": [
0, 0,
1, 1,
src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"animation": { "animation": {
"frametime": 4, "frametime": 4,
"frames": [ "frames": [
0, 0,
1, 1,
src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta
+12 -12
View File
@@ -1,18 +1,18 @@
{ {
"animation": { "animation": {
"frametime": 3, "frametime": 3,
"frames": [ "frames": [
6, 6,
0, 0,
1, 1,
6, 6,
2, 2,
3, 3,
6, 6,
4, 4,
5, 5,
6, 6,
6 6
] ]
} }
} }
src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta
+17 -17
View File
@@ -1,23 +1,23 @@
{ {
"animation": { "animation": {
"frametime": 2, "frametime": 2,
"frames": [ "frames": [
0, 0,
1, 1,
2, 2,
3, 3,
4, 4,
5, 5,
6, 6,
7, 7,
8, 8,
9, 9,
10, 10,
11, 11,
12, 12,
13, 13,
14, 14,
15 15
] ]
} }
} }
src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta
+17 -17
View File
@@ -1,23 +1,23 @@
{ {
"animation": { "animation": {
"frametime": 2, "frametime": 2,
"frames": [ "frames": [
0, 0,
1, 1,
2, 2,
3, 3,
4, 4,
5, 5,
6, 6,
7, 7,
8, 8,
9, 9,
10, 10,
11, 11,
12, 12,
13, 13,
14, 14,
15 15
] ]
} }
} }
src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta
+17 -17
View File
@@ -1,23 +1,23 @@
{ {
"animation": { "animation": {
"frametime": 2, "frametime": 2,
"frames": [ "frames": [
0, 0,
1, 1,
2, 2,
3, 3,
4, 4,
5, 5,
6, 6,
7, 7,
8, 8,
9, 9,
10, 10,
11, 11,
12, 12,
13, 13,
14, 14,
15 15
] ]
} }
} }