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 0d88e72e..388ead3b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta index 9f04d7ff..8e2af92c 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 3, "frames": [ 1, 2, @@ -13,7 +13,7 @@ 9, 10, 11, - 0 + 0 ] } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta index 3a077b37..313e1f2b 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 3, "frames": [ 0, 1, diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/molecular_assembler_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/molecular_assembler_lights.png.mcmeta index 3a077b37..313e1f2b 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/molecular_assembler_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/molecular_assembler_lights.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 3, "frames": [ 0, 1, diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta index 93541098..aa7d14af 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 4, + "frametime": 4, "frames": [ 0, 1, diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta index 93541098..aa7d14af 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 4, + "frametime": 4, "frames": [ 0, 1, diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta index 7fd9dc4c..c6924e89 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta @@ -1,18 +1,18 @@ { "animation": { - "frametime": 3, + "frametime": 3, "frames": [ - 6, - 0, - 1, - 6, - 2, - 3, - 6, - 4, - 5, - 6, - 6 + 6, + 0, + 1, + 6, + 2, + 3, + 6, + 4, + 5, + 6, + 6 ] } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta index 4dcf4d63..02dd518a 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta @@ -1,23 +1,23 @@ { "animation": { - "frametime": 2, + "frametime": 2, "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15 + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15 ] } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta index 4dcf4d63..02dd518a 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta @@ -1,23 +1,23 @@ { "animation": { - "frametime": 2, + "frametime": 2, "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15 + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15 ] } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta index 4dcf4d63..02dd518a 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta @@ -1,23 +1,23 @@ { "animation": { - "frametime": 2, + "frametime": 2, "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15 + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15 ] } }