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

Fixes most of the item model issues after registry name changes.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-26 02:25:59 +02:00
parent 85cf7d7981
commit 5211bf4c98
121 changed files with 497 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json
-6
View File
@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/QuartzOreBlock"
}
}
src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json → src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json
View File
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json → src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json
View File
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json → src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json
View File
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json → src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json
View File
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json → src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json
View File
src/main/resources/assets/appliedenergistics2/models/block/fluix.json → src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/fluix"
"all": "appliedenergistics2:blocks/fluix_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/grinder.json
-9
View File
@@ -1,9 +0,0 @@
{
"parent": "appliedenergistics2:block/cube/cube_ae_machine",
"textures": {
"bottom": "appliedenergistics2:blocks/grinder_bottom",
"front": "appliedenergistics2:blocks/grinder_front",
"side": "appliedenergistics2:blocks/grinder_side",
"top": "appliedenergistics2:blocks/grinder"
}
}
src/main/resources/assets/appliedenergistics2/models/block/grindstone.json
+9
View File
@@ -0,0 +1,9 @@
{
"parent": "appliedenergistics2:block/cube/cube_ae_machine",
"textures": {
"bottom": "appliedenergistics2:blocks/grindstone_bottom",
"front": "appliedenergistics2:blocks/grindstone_front",
"side": "appliedenergistics2:blocks/grindstone_side",
"top": "appliedenergistics2:blocks/grindstone"
}
}
src/main/resources/assets/appliedenergistics2/models/block/quartz.json → src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/quartz"
"all": "appliedenergistics2:blocks/quartz_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "appliedenergistics2:blocks/quartz_pillar_block_top",
"side": "appliedenergistics2:blocks/quartz_pillar_block_side"
"end": "appliedenergistics2:blocks/quartz_pillar_top",
"side": "appliedenergistics2:blocks/quartz_pillar_side"
}
}
src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/sky_stone_block_block"
"all": "appliedenergistics2:blocks/sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/sky_stone_block_brick"
"all": "appliedenergistics2:blocks/sky_stone_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/sky_stone_block_small_brick"
"all": "appliedenergistics2:blocks/sky_stone_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/sky_stone_stone.json
-6
View File
@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/sky_stone_block_stone"
}
}
src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/smooth_sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json → src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json
View File
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json → src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json
View File
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json → src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json
View File
src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/fluix",
"side": "appliedenergistics2:blocks/fluix",
"top": "appliedenergistics2:blocks/fluix"
"bottom": "appliedenergistics2:blocks/fluix_block",
"side": "appliedenergistics2:blocks/fluix_block",
"top": "appliedenergistics2:blocks/fluix_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/fluix",
"side": "appliedenergistics2:blocks/fluix",
"top": "appliedenergistics2:blocks/fluix"
"bottom": "appliedenergistics2:blocks/fluix_block",
"side": "appliedenergistics2:blocks/fluix_block",
"top": "appliedenergistics2:blocks/fluix_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/fluix",
"side": "appliedenergistics2:blocks/fluix",
"top": "appliedenergistics2:blocks/fluix"
"bottom": "appliedenergistics2:blocks/fluix_block",
"side": "appliedenergistics2:blocks/fluix_block",
"top": "appliedenergistics2:blocks/fluix_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_block",
"side": "appliedenergistics2:blocks/quartz_block",
"top": "appliedenergistics2:blocks/quartz_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz",
"side": "appliedenergistics2:blocks/quartz",
"top": "appliedenergistics2:blocks/quartz"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz",
"side": "appliedenergistics2:blocks/quartz",
"top": "appliedenergistics2:blocks/quartz"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz",
"side": "appliedenergistics2:blocks/quartz",
"top": "appliedenergistics2:blocks/quartz"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_block_top",
"side": "appliedenergistics2:blocks/quartz_pillar_block_side",
"top": "appliedenergistics2:blocks/quartz_pillar_block_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_block_top",
"side": "appliedenergistics2:blocks/quartz_pillar_block_side",
"top": "appliedenergistics2:blocks/quartz_pillar_block_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_block_top",
"side": "appliedenergistics2:blocks/quartz_pillar_block_side",
"top": "appliedenergistics2:blocks/quartz_pillar_block_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_block",
"side": "appliedenergistics2:blocks/quartz_block",
"top": "appliedenergistics2:blocks/quartz_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_block",
"side": "appliedenergistics2:blocks/quartz_block",
"top": "appliedenergistics2:blocks/quartz_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_top",
"side": "appliedenergistics2:blocks/quartz_pillar_side",
"top": "appliedenergistics2:blocks/quartz_pillar_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_top",
"side": "appliedenergistics2:blocks/quartz_pillar_side",
"top": "appliedenergistics2:blocks/quartz_pillar_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/quartz_pillar_top",
"side": "appliedenergistics2:blocks/quartz_pillar_side",
"top": "appliedenergistics2:blocks/quartz_pillar_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block",
"side": "appliedenergistics2:blocks/sky_stone_block",
"top": "appliedenergistics2:blocks/sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_brick",
"side": "appliedenergistics2:blocks/sky_stone_brick",
"top": "appliedenergistics2:blocks/sky_stone_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_brick",
"side": "appliedenergistics2:blocks/sky_stone_brick",
"top": "appliedenergistics2:blocks/sky_stone_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_brick",
"side": "appliedenergistics2:blocks/sky_stone_brick",
"top": "appliedenergistics2:blocks/sky_stone_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block",
"side": "appliedenergistics2:blocks/sky_stone_block",
"top": "appliedenergistics2:blocks/sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block",
"side": "appliedenergistics2:blocks/sky_stone_block",
"top": "appliedenergistics2:blocks/sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_block",
"side": "appliedenergistics2:blocks/sky_stone_block_block",
"top": "appliedenergistics2:blocks/sky_stone_block_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"side": "appliedenergistics2:blocks/sky_stone_block_small_brick",
"top": "appliedenergistics2:blocks/sky_stone_block_small_brick"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_stone",
"side": "appliedenergistics2:blocks/sky_stone_block_stone",
"top": "appliedenergistics2:blocks/sky_stone_block_stone"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_stone",
"side": "appliedenergistics2:blocks/sky_stone_block_stone",
"top": "appliedenergistics2:blocks/sky_stone_block_stone"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json
-8
View File
@@ -1,8 +0,0 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/sky_stone_block_stone",
"side": "appliedenergistics2:blocks/sky_stone_block_stone",
"top": "appliedenergistics2:blocks/sky_stone_block_stone"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/smooth_sky_stone_block",
"side": "appliedenergistics2:blocks/smooth_sky_stone_block",
"top": "appliedenergistics2:blocks/smooth_sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/smooth_sky_stone_block",
"side": "appliedenergistics2:blocks/smooth_sky_stone_block",
"top": "appliedenergistics2:blocks/smooth_sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json
+8
View File
@@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "appliedenergistics2:blocks/smooth_sky_stone_block",
"side": "appliedenergistics2:blocks/smooth_sky_stone_block",
"top": "appliedenergistics2:blocks/smooth_sky_stone_block"
}
}
src/main/resources/assets/appliedenergistics2/models/block/test.json
-353
View File
@@ -1,353 +0,0 @@
{
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"elements": [
{
"faces": {
"down": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
1.0
]
},
"east": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
16.0
]
},
"north": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
16.0
]
},
"south": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
16.0
]
},
"up": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
1.0
]
},
"west": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
16.0
]
}
},
"from": [
0.0,
0.0,
15.0
],
"name": "Cube",
"to": [
16.0,
16.0,
16.0
]
},
{
"faces": {
"down": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
1.0
]
},
"east": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
6.0
]
},
"north": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
6.0
]
},
"south": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
6.0
]
},
"up": {
"texture": "#-1",
"uv": [
0.0,
0.0,
16.0,
1.0
]
},
"west": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
6.0
]
}
},
"from": [
0.0,
0.0,
0.0
],
"name": "Cube",
"to": [
16.0,
6.0,
1.0
]
},
{
"faces": {
"down": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
15.0
]
},
"east": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
1.0
]
},
"north": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
1.0
]
},
"south": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
1.0
]
},
"up": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
15.0
]
},
"west": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
1.0
]
}
},
"from": [
0.0,
6.0,
0.0
],
"name": "Cube",
"to": [
1.0,
7.0,
15.0
]
},
{
"faces": {
"down": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
15.0
]
},
"east": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
5.0
]
},
"north": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
5.0
]
},
"south": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
5.0
]
},
"up": {
"texture": "#-1",
"uv": [
0.0,
0.0,
1.0,
15.0
]
},
"west": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
5.0
]
}
},
"from": [
15.0,
0.0,
0.0
],
"name": "Cube",
"to": [
16.0,
5.0,
15.0
]
},
{
"faces": {
"down": {
"texture": "#-1",
"uv": [
0.0,
0.0,
10.0,
15.0
]
},
"east": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
1.0
]
},
"north": {
"texture": "#-1",
"uv": [
0.0,
0.0,
10.0,
1.0
]
},
"south": {
"texture": "#-1",
"uv": [
0.0,
0.0,
10.0,
1.0
]
},
"up": {
"texture": "#-1",
"uv": [
0.0,
0.0,
10.0,
15.0
]
},
"west": {
"texture": "#-1",
"uv": [
0.0,
0.0,
15.0,
1.0
]
}
},
"from": [
3.0,
15.0,
0.0
],
"name": "Cube",
"to": [
13.0,
16.0,
15.0
]
}
],
"textures": {
}
}
src/main/resources/assets/appliedenergistics2/models/block/wireless.json → src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point.json
+4 -4
View File
@@ -1,5 +1,5 @@
{
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"parent": "block/block",
"elements": [
{
"faces": {
@@ -762,8 +762,8 @@
}
],
"textures": {
"particle": "appliedenergistics2:blocks/wireless_inside",
"0": "appliedenergistics2:blocks/wireless_inside",
"1": "appliedenergistics2:blocks/wireless"
"particle": "appliedenergistics2:blocks/wireless_access_point_inside",
"0": "appliedenergistics2:blocks/wireless_access_point_inside",
"1": "appliedenergistics2:blocks/wireless_access_point"
}
}
src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/cell_workbench"
}
src/main/resources/assets/appliedenergistics2/models/item/charger.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/charger"
}
src/main/resources/assets/appliedenergistics2/models/item/condenser.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/condenser"
}
src/main/resources/assets/appliedenergistics2/models/item/drive.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/drive"
}
src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/energy_acceptor"
}
src/main/resources/assets/appliedenergistics2/models/item/grinder.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/grinder"
}
src/main/resources/assets/appliedenergistics2/models/item/inscriber.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/inscriber"
}
src/main/resources/assets/appliedenergistics2/models/item/ioport.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/ioport"
}
src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/quartz_growth_accelerator_off"
}
src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json → src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json
View File
src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json → src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"parent": "appliedenergistics2:item/sky_chest_stone",
"parent": "appliedenergistics2:item/sky_stone_chest",
"textures": {
"particle": "appliedenergistics2:models/skyblockchest",
"0": "appliedenergistics2:models/skyblockchest"
src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/spatial_ioport"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/fluix"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/quartz_certus"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/quartz_certus_chiseled"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/quartz_certus_pillar"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/skystone_block"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/skystone_brick"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/skystone_brick_small"
}
src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/stairs/skystone_stone"
}
src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/vibration_chamber_off"
}
src/main/resources/assets/appliedenergistics2/models/item/wireless.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "appliedenergistics2:block/wireless"
}