From dafa0e85c9e13b98b2f5576c63e16bcc66c5cfdd Mon Sep 17 00:00:00 2001 From: yueh Date: Mon, 24 Oct 2016 15:39:06 +0200 Subject: [PATCH] Replaced a few tabs with spaces like everywhere else. --- .../models/block/inscriber.json | 75 +++++++++--------- .../models/block/quartz_fixture_standing.json | 2 +- .../block/quartz_fixture_standing_odd.json | 2 +- .../models/block/quartz_fixture_wall.json | 2 +- .../models/block/quartz_fixture_wall_odd.json | 2 +- .../models/block/tiny_tnt.json | 2 +- .../recipes/misc/chests.recipe | 2 +- .../recipes/misc/seeds.recipe | 6 +- .../textures/blocks/charger_side.png | Bin 448 -> 424 bytes .../controller_column_lights.png.mcmeta | 4 +- .../blocks/controller_lights.png.mcmeta | 2 +- .../molecular_assembler_lights.png.mcmeta | 2 +- .../quartz_growth_accelerator_on.png.mcmeta | 2 +- ...artz_growth_accelerator_side_on.png.mcmeta | 2 +- .../items/paint_ball_shimmer.png.mcmeta | 24 +++--- .../parts/annihilation_plane_on.png.mcmeta | 34 ++++---- .../parts/formation_plane_on.png.mcmeta | 34 ++++---- .../identity_annihilation_plane_on.png.mcmeta | 34 ++++---- 18 files changed, 115 insertions(+), 116 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json index dbedd6e0..0ab128b6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -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": [ { "faces": { "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -13,7 +17,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -22,7 +26,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -31,7 +35,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 0.0, @@ -40,7 +44,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -49,7 +53,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -73,7 +77,7 @@ { "faces": { "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -82,7 +86,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -91,7 +95,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 15.0, @@ -100,7 +104,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -118,7 +122,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 0.0, @@ -142,7 +146,7 @@ { "faces": { "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -151,7 +155,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -160,7 +164,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 0.0, @@ -169,7 +173,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -178,7 +182,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 0.0, @@ -187,7 +191,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -220,7 +224,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 0.0, @@ -229,7 +233,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 15.0, @@ -238,7 +242,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 0.0, @@ -247,7 +251,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 1.0, @@ -256,7 +260,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 15.0, @@ -298,7 +302,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 12.0, @@ -316,7 +320,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -349,7 +353,7 @@ { "faces": { "down": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -367,7 +371,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -376,7 +380,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -418,7 +422,7 @@ { "faces": { "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -436,7 +440,7 @@ ] }, "north": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -445,7 +449,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 0.0, @@ -454,7 +458,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -484,10 +488,5 @@ 16.0 ] } - ], - "parent": "block/orientable", - "textures": { - "particle": "appliedenergistics2:blocks/inscriber", - "0": "appliedenergistics2:blocks/inscriber" - } + ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json index b9b1b9c5..ecf70112 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json @@ -299,7 +299,7 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_fixture", + "particle": "appliedenergistics2:blocks/quartz_fixture", "metal": "appliedenergistics2:blocks/quartz_fixture_metal", "quartz": "appliedenergistics2:blocks/quartz_fixture" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json index b783db6f..6431256b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json @@ -299,7 +299,7 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_fixture", + "particle": "appliedenergistics2:blocks/quartz_fixture", "metal": "appliedenergistics2:blocks/quartz_fixture_metal", "quartz": "appliedenergistics2:blocks/quartz_fixture" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json index a30b5db4..2ff9d1ee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json @@ -201,7 +201,7 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_fixture", + "particle": "appliedenergistics2:blocks/quartz_fixture", "metal": "appliedenergistics2:blocks/quartz_fixture_metal", "quartz": "appliedenergistics2:blocks/quartz_fixture" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json index 89a6b8d1..b65b1c60 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json @@ -201,7 +201,7 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_fixture", + "particle": "appliedenergistics2:blocks/quartz_fixture", "metal": "appliedenergistics2:blocks/quartz_fixture_metal", "quartz": "appliedenergistics2:blocks/quartz_fixture" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json index f3ea85d4..0a4ef2ce 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json @@ -33,7 +33,7 @@ } ], "textures": { - "particle": "blocks/tnt_side", + "particle": "blocks/tnt_side", "side": "blocks/tnt_side", "top": "blocks/tnt_top", "bottom": "blocks/tnt_bottom" diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe index b63ae729..d534d41e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe @@ -1,6 +1,6 @@ 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_chest diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe index 90da7bc1..1e584493 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe @@ -1,3 +1,3 @@ -shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:crystal_seed.nether -shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:crystal_seed.certus -shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:crystal_seed.fluix +shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:crystal_seed.nether +shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:crystal_seed.certus +shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:crystal_seed.fluix diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png index 0d88e72e1729a734f582f70451d00bc8caff5955..388ead3bc0be017fd71da4175c31164691875dfb 100644 GIT binary patch delta 372 zcmV-)0gL{?1E>R#83+OZ005AYXf}}{D1RArMObuGZ)S9NVRB^vaA9d~bS`dXbRaY? zFfK7LtqKaj0003cNklAvqdqjScIw1T2O4bR`wR(g_x6@x4wJ13=Tnno(hDL}*0 znWO$2yjWs|$};XTPzbws%UG>HLs*5S)5vs%!6&}!I!ji@*(wIhI3vXeU}9_A_A=xv z-HnJ+u$jIJta};UGbCF^1c+3y4PpJCx~`Fzfz+7?U@2^@fJ|Vph#}Xb>4X8)dhz5; z1kx6#!Js=Po7@IhA|Mm;!qcF{OQO(L8uqyjX(54gCB-1%-dm3}1|k)vl=1^~;7kRD Sk4~@v0000da;MWm(!ZO>OXaKA-Cm@pL*BNq;;Z+kflz zDk8$|cI)DL*b=abvY{I3{eG8#xlkjiUHI704xUI2@V)6hJnl zkANlWoE!0B9LL&dAX5c!Z=8t#0zRN+gF&o&i~z7L>vQ4`=1U+$VTc3}o5Fhp%=Y_z zoi?!Kj0mtUhiINU3*_By_a~5FVR;P*A))8Y2M?|bc#MnO7J}L~p?8-5$!4>uSr