fix git fuckup

This commit is contained in:
Jenny committed 2024-12-30 23:15:27 +01:00
1 parent d65b1019af
commit dd0d538afb
149 files changed
+905 -299

No files matched your search

@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/andesite_1x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/andesite_2x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/andesite_3x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/andesite_4x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/cobblestone_1x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/cobblestone_2x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/cobblestone_3x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/cobblestone_4x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/diorite_1x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/diorite_2x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/diorite_3x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/diorite_4x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/granite_1x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/granite_2x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/granite_3x"}
}
}
@@ -0,0 +1,6 @@
{
"variants": {
"": {
"model": "compressedblocks:block/granite_4x"}
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/andesite_1x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/andesite_2x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/andesite_3x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/andesite_4x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/cobblestone_1x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/cobblestone_2x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/cobblestone_3x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/cobblestone_4x"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_1x"
"all": "compressedblocks:block/diorite_1x"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_2x"
"all": "compressedblocks:block/diorite_2x"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_3x"
"all": "compressedblocks:block/diorite_3x"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_4x"
"all": "compressedblocks:block/diorite_4x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/granite_1x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/granite_2x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/granite_3x"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "compressedblocks:block/granite_4x"
}
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/andesite_1x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/andesite_2x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/andesite_3x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/andesite_4x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/cobblestone_1x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/cobblestone_2x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/cobblestone_3x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/cobblestone_4x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/diorite_1x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/diorite_2x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/diorite_3x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/diorite_4x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/granite_1x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/granite_2x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/granite_3x"
}
@@ -0,0 +1,3 @@
{
"parent": "compressedblocks:block/granite_4x"
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_1x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_2x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_3x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_4x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_5x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_6x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_7x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_8x"}
}
}
@@ -1,6 +0,0 @@
{
"variants": {
"": {
"model": "examplemod:block/cobblestone_9x"}
}
}
@@ -1,11 +0,0 @@
{
"block.examplemod.cobblestone_1x": "Cobblestone¹",
"block.examplemod.cobblestone_2x": "Cobblestone²",
"block.examplemod.cobblestone_3x": "Cobblestone³",
"block.examplemod.cobblestone_4x": "Cobblestone⁴",
"block.examplemod.cobblestone_5x": "Cobblestone⁵",
"block.examplemod.cobblestone_6x": "Cobblestone⁶",
"block.examplemod.cobblestone_7x": "Cobblestone⁷",
"block.examplemod.cobblestone_8x": "Cobblestone⁸",
"block.examplemod.cobblestone_9x": "Cobblestone⁹"
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_5x"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_6x"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_7x"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_8x"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "examplemod:block/cobblestone_9x"
}
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_1x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_2x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_3x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_4x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_5x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_6x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_7x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_8x"
}
@@ -1,3 +0,0 @@
{
"parent": "examplemod:block/cobblestone_9x"
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 609 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 582 B