diff --git a/assets/enderio/blockstates/blockIngotStorage.json b/assets/enderio/blockstates/blockIngotStorage.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_conductiveiron.json b/assets/enderio/models/block/block_conductiveiron.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_darksteel.json b/assets/enderio/models/block/block_darksteel.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_electricalsteel.json b/assets/enderio/models/block/block_electricalsteel.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_energeticalloy.json b/assets/enderio/models/block/block_energeticalloy.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_pulsatingiron.json b/assets/enderio/models/block/block_pulsatingiron.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_redstonealloy.json b/assets/enderio/models/block/block_redstonealloy.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_soularium.json b/assets/enderio/models/block/block_soularium.json old mode 100755 new mode 100644 diff --git a/assets/enderio/models/block/block_vibrantalloy.json b/assets/enderio/models/block/block_vibrantalloy.json old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/body.png.mcmeta b/assets/enderio/textures/blocks/energetic/body.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/frame.png.mcmeta b/assets/enderio/textures/blocks/energetic/frame.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_0.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_0.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_1.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_2.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_3.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_4.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_4.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_5.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_5.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_6.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_6.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_7.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_7.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_8.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_8.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/energetic/glow_9.png.mcmeta b/assets/enderio/textures/blocks/energetic/glow_9.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_1.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_2.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_3.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_adv_1.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_adv_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_adv_2.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_adv_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_adv_3.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_adv_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_vib_1.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_vib_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_vib_2.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_vib_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/solar/solar_glow_vib_3.png.mcmeta b/assets/enderio/textures/blocks/solar/solar_glow_vib_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/body.png.mcmeta b/assets/enderio/textures/blocks/vibrant/body.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/frame.png.mcmeta b/assets/enderio/textures/blocks/vibrant/frame.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_0.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_0.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_1.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_2.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_3.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_4.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_4.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_5.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_5.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_6.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_6.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_7.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_7.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_8.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_8.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/enderio/textures/blocks/vibrant/glow_9.png.mcmeta b/assets/enderio/textures/blocks/vibrant/glow_9.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/u_block_1.png.mcmeta b/assets/ic2/textures/blocks/resource/u_block_1.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/u_block_2.png.mcmeta b/assets/ic2/textures/blocks/resource/u_block_2.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/u_block_3.png.mcmeta b/assets/ic2/textures/blocks/resource/u_block_3.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/u_block_4.png.mcmeta b/assets/ic2/textures/blocks/resource/u_block_4.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/u_block_5.png.mcmeta b/assets/ic2/textures/blocks/resource/u_block_5.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/ic2/textures/blocks/resource/uranium_ore_glow.png.mcmeta b/assets/ic2/textures/blocks/resource/uranium_ore_glow.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/immersiveengineering/blockstates/ore.json b/assets/immersiveengineering/blockstates/ore.json old mode 100755 new mode 100644 diff --git a/assets/immersiveengineering/blockstates/storage.json b/assets/immersiveengineering/blockstates/storage.json old mode 100755 new mode 100644 diff --git a/assets/immersiveengineering/textures/blocks/ore_uranium_glow.png.mcmeta b/assets/immersiveengineering/textures/blocks/ore_uranium_glow.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/immersiveengineering/textures/blocks/storage_uranium_glow.png.mcmeta b/assets/immersiveengineering/textures/blocks/storage_uranium_glow.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/minecraft/blockstates/glass_pane.json b/assets/minecraft/blockstates/glass_pane.json index fe0d63e..f94db96 100644 --- a/assets/minecraft/blockstates/glass_pane.json +++ b/assets/minecraft/blockstates/glass_pane.json @@ -1,29 +1,29 @@ { "multipart": [ - { "apply": { "model": "glass_pane_post", "uvlock": true }}, + { "apply": { "model": "block/glass_pane_post", "uvlock": true }}, { "when": { "north": true }, - "apply": { "model": "glass_pane_side", "uvlock": true } + "apply": { "model": "block/glass_pane_side", "uvlock": true } }, { "when": { "east": true }, - "apply": { "model": "glass_pane_side", "y": 90, "uvlock": true } + "apply": { "model": "block/glass_pane_side", "y": 90, "uvlock": true } }, { "when": { "south": true }, - "apply": { "model": "glass_pane_side", "y": 180, "uvlock": true } + "apply": { "model": "block/glass_pane_side", "y": 180, "uvlock": true } }, { "when": { "west": true }, - "apply": { "model": "glass_pane_side", "y": 270, "uvlock": true } + "apply": { "model": "block/glass_pane_side", "y": 270, "uvlock": true } }, { "when": { "north": false }, - "apply": { "model": "glass_pane_noside", "uvlock": true } + "apply": { "model": "block/glass_pane_noside", "uvlock": true } }, { "when": { "east": false }, - "apply": { "model": "glass_pane_noside", "y": 90, "uvlock": true } + "apply": { "model": "block/glass_pane_noside", "y": 90, "uvlock": true } }, { "when": { "south": false }, - "apply": { "model": "glass_pane_noside", "y": 180, "uvlock": true } + "apply": { "model": "block/glass_pane_noside", "y": 180, "uvlock": true } }, { "when": { "west": false }, - "apply": { "model": "glass_pane_noside", "y": 270, "uvlock": true } + "apply": { "model": "block/glass_pane_noside", "y": 270, "uvlock": true } } ] } diff --git a/assets/minecraft/models/block/activator_rail_active_flat.json b/assets/minecraft/models/block/activator_rail_active_flat.json old mode 100755 new mode 100644 index 063d4a8..7decedc --- a/assets/minecraft/models/block/activator_rail_active_flat.json +++ b/assets/minecraft/models/block/activator_rail_active_flat.json @@ -1,9 +1,9 @@ { "parent": "minecraft:block/rail_flat_glow", "textures": { - "rail": "minecraft:blocks/rail_activator_powered", - "rail_glow": "minecraft:blocks/rail_activator_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_glow_faint" + "rail": "minecraft:block/rail_activator_powered", + "rail_glow": "minecraft:block/rail_activator_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_glow_faint" } } diff --git a/assets/minecraft/models/block/activator_rail_active_raised_ne.json b/assets/minecraft/models/block/activator_rail_active_raised_ne.json old mode 100755 new mode 100644 index 30bf874..7d26568 --- a/assets/minecraft/models/block/activator_rail_active_raised_ne.json +++ b/assets/minecraft/models/block/activator_rail_active_raised_ne.json @@ -1,9 +1,9 @@ { "parent": "minecraft:block/rail_raised_glow_ne", "textures": { - "rail": "minecraft:blocks/rail_activator_powered", - "rail_glow": "minecraft:blocks/rail_activator_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_glow_faint" + "rail": "minecraft:block/rail_activator_powered", + "rail_glow": "minecraft:block/rail_activator_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_glow_faint" } } diff --git a/assets/minecraft/models/block/activator_rail_active_raised_sw.json b/assets/minecraft/models/block/activator_rail_active_raised_sw.json old mode 100755 new mode 100644 index ffd29d0..2b7ece6 --- a/assets/minecraft/models/block/activator_rail_active_raised_sw.json +++ b/assets/minecraft/models/block/activator_rail_active_raised_sw.json @@ -1,9 +1,9 @@ { "parent": "minecraft:block/rail_raised_glow_sw", "textures": { - "rail": "minecraft:blocks/rail_activator_powered", - "rail_glow": "minecraft:blocks/rail_activator_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_glow_faint" + "rail": "minecraft:block/rail_activator_powered", + "rail_glow": "minecraft:block/rail_activator_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_glow_faint" } } diff --git a/assets/minecraft/models/block/beacon.json b/assets/minecraft/models/block/beacon.json old mode 100755 new mode 100644 index 2445c99..01fda52 --- a/assets/minecraft/models/block/beacon.json +++ b/assets/minecraft/models/block/beacon.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/block", "ambientocclusion": false, "textures": { - "particle": "blocks/glass", - "glass": "blocks/glass", - "obsidian": "blocks/obsidian", - "beacon": "blocks/beacon", - "beaconlines": "blocks/lines" + "particle": "block/glass", + "glass": "block/glass", + "obsidian": "block/obsidian", + "beacon": "block/beacon", + "beaconlines": "block/lines" }, "elements": [ { "__comment": "Glass shell", diff --git a/assets/minecraft/models/block/borked_magma.json b/assets/minecraft/models/block/borked_magma.json old mode 100755 new mode 100644 index 207e095..7f7ffd0 --- a/assets/minecraft/models/block/borked_magma.json +++ b/assets/minecraft/models/block/borked_magma.json @@ -1,9 +1,9 @@ { "parent": "block/util_cube_glow_3_all", "textures": { - "all": "blocks/magma", + "all": "block/magma", "particle": "#all", - "glow_1": "blocks/magma_glow", - "glow_2": "blocks/magma_glow_faint" + "glow_1": "block/magma_glow", + "glow_2": "block/magma_glow_faint" } } diff --git a/assets/minecraft/models/block/brewing_stand.json b/assets/minecraft/models/block/brewing_stand.json old mode 100755 new mode 100644 index 9e6116f..99cbcd3 --- a/assets/minecraft/models/block/brewing_stand.json +++ b/assets/minecraft/models/block/brewing_stand.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "blocks/brewing_stand", - "base": "blocks/brewing_stand_base", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_rod" + "particle": "block/brewing_stand", + "base": "block/brewing_stand_base", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_rod" }, "elements": [ { "from": [ 7, 0, 7 ], diff --git a/assets/minecraft/models/block/brewing_stand_bottle0.json b/assets/minecraft/models/block/brewing_stand_bottle0.json old mode 100755 new mode 100644 index e48c0f7..254c456 --- a/assets/minecraft/models/block/brewing_stand_bottle0.json +++ b/assets/minecraft/models/block/brewing_stand_bottle0.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube", - "glow_bottle": "blocks/brew_glow_bottle" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube", + "glow_bottle": "block/brew_glow_bottle" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/assets/minecraft/models/block/brewing_stand_bottle1.json b/assets/minecraft/models/block/brewing_stand_bottle1.json old mode 100755 new mode 100644 index 7c9c2e4..9e30914 --- a/assets/minecraft/models/block/brewing_stand_bottle1.json +++ b/assets/minecraft/models/block/brewing_stand_bottle1.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube", - "glow_bottle": "blocks/brew_glow_bottle" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube", + "glow_bottle": "block/brew_glow_bottle" }, "elements": [ { "from": [ -0.41, 0, 8 ], diff --git a/assets/minecraft/models/block/brewing_stand_bottle2.json b/assets/minecraft/models/block/brewing_stand_bottle2.json old mode 100755 new mode 100644 index d6741d6..b34df2a --- a/assets/minecraft/models/block/brewing_stand_bottle2.json +++ b/assets/minecraft/models/block/brewing_stand_bottle2.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube", - "glow_bottle": "blocks/brew_glow_bottle" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube", + "glow_bottle": "block/brew_glow_bottle" }, "elements": [ { "from": [ -0.41, 0, 8 ], diff --git a/assets/minecraft/models/block/brewing_stand_empty0.json b/assets/minecraft/models/block/brewing_stand_empty0.json old mode 100755 new mode 100644 index 15a1df8..90d0e49 --- a/assets/minecraft/models/block/brewing_stand_empty0.json +++ b/assets/minecraft/models/block/brewing_stand_empty0.json @@ -1,8 +1,8 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube" }, "elements": [ { "from": [ 8, 0, 8 ], diff --git a/assets/minecraft/models/block/brewing_stand_empty1.json b/assets/minecraft/models/block/brewing_stand_empty1.json old mode 100755 new mode 100644 index 2f9aa87..1fa5e21 --- a/assets/minecraft/models/block/brewing_stand_empty1.json +++ b/assets/minecraft/models/block/brewing_stand_empty1.json @@ -1,8 +1,8 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube" }, "elements": [ { "from": [ 0, 0, 8 ], diff --git a/assets/minecraft/models/block/brewing_stand_empty2.json b/assets/minecraft/models/block/brewing_stand_empty2.json old mode 100755 new mode 100644 index 79fdf0b..6b28f93 --- a/assets/minecraft/models/block/brewing_stand_empty2.json +++ b/assets/minecraft/models/block/brewing_stand_empty2.json @@ -1,8 +1,8 @@ { "textures": { - "particle": "blocks/brewing_stand", - "stand": "blocks/brewing_stand", - "glow_stand": "blocks/brew_glow_tube" + "particle": "block/brewing_stand", + "stand": "block/brewing_stand", + "glow_stand": "block/brew_glow_tube" }, "elements": [ { "from": [ 0, 0, 8 ], diff --git a/assets/minecraft/models/block/comparator_lit.json b/assets/minecraft/models/block/comparator_lit.json old mode 100755 new mode 100644 index dbc9416..d57737c --- a/assets/minecraft/models/block/comparator_lit.json +++ b/assets/minecraft/models/block/comparator_lit.json @@ -1,14 +1,14 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/comparator_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/comparator_on", - "unlit": "blocks/redstone_torch_off", - "lit": "blocks/redstone_torch_on", - "lit_glow": "blocks/redstone_torch_glow", - "glow": "blocks/comparator_glow", - "faint": "blocks/comparator_glow_faint" + "particle": "block/comparator_on", + "slab": "block/stone_slab_top", + "top": "block/comparator_on", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch_on", + "lit_glow": "block/redstone_torch_glow", + "glow": "block/comparator_glow", + "faint": "block/comparator_glow_faint" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/comparator_lit_subtract.json b/assets/minecraft/models/block/comparator_lit_subtract.json old mode 100755 new mode 100644 index 3f89029..1afe118 --- a/assets/minecraft/models/block/comparator_lit_subtract.json +++ b/assets/minecraft/models/block/comparator_lit_subtract.json @@ -1,14 +1,14 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/comparator_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/comparator_on", - "unlit": "blocks/redstone_torch_off", - "lit": "blocks/redstone_torch_on", - "lit_glow": "blocks/redstone_torch_glow", - "glow": "blocks/comparator_glow", - "faint": "blocks/comparator_glow_faint" + "particle": "block/comparator_on", + "slab": "block/stone_slab_top", + "top": "block/comparator_on", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch_on", + "lit_glow": "block/redstone_torch_glow", + "glow": "block/comparator_glow", + "faint": "block/comparator_glow_faint" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/comparator_unlit_subtract.json b/assets/minecraft/models/block/comparator_unlit_subtract.json old mode 100755 new mode 100644 index 88adb5c..f7533c6 --- a/assets/minecraft/models/block/comparator_unlit_subtract.json +++ b/assets/minecraft/models/block/comparator_unlit_subtract.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/comparator_off", - "slab": "blocks/stone_slab_top", - "top": "blocks/comparator_off", - "unlit": "blocks/redstone_torch_off", - "lit": "blocks/redstone_torch_on", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/comparator_off", + "slab": "block/stone_slab_top", + "top": "block/comparator_off", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch_on", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/daylight_detector.json b/assets/minecraft/models/block/daylight_detector.json old mode 100755 new mode 100644 index db31e68..b92f7d2 --- a/assets/minecraft/models/block/daylight_detector.json +++ b/assets/minecraft/models/block/daylight_detector.json @@ -1,9 +1,9 @@ { "parent": "block/thin_block", "textures": { - "particle": "blocks/daylight_detector_top", - "top": "blocks/daylight_detector_top", - "side": "blocks/daylight_detector_side", - "glow": "blocks/daylight_detector_glow" + "particle": "block/daylight_detector_top", + "top": "block/daylight_detector_top", + "side": "block/daylight_detector_side", + "glow": "block/daylight_detector_glow" }, "ambientocclusion": false, "elements": [ diff --git a/assets/minecraft/models/block/daylight_detector_inverted.json b/assets/minecraft/models/block/daylight_detector_inverted.json old mode 100755 new mode 100644 index f351a44..f95a53b --- a/assets/minecraft/models/block/daylight_detector_inverted.json +++ b/assets/minecraft/models/block/daylight_detector_inverted.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "blocks/daylight_detector_inverted_top", - "top": "blocks/daylight_detector_inverted_top", - "side": "blocks/daylight_detector_side", - "glow": "blocks/nightlight_detector_glow" + "particle": "block/daylight_detector_inverted_top", + "top": "block/daylight_detector_inverted_top", + "side": "block/daylight_detector_side", + "glow": "block/nightlight_detector_glow" }, "ambientocclusion": false, "elements": [ diff --git a/assets/minecraft/models/block/detector_rail_powered_flat.json b/assets/minecraft/models/block/detector_rail_powered_flat.json old mode 100755 new mode 100644 index 86dbb06..0ef5286 --- a/assets/minecraft/models/block/detector_rail_powered_flat.json +++ b/assets/minecraft/models/block/detector_rail_powered_flat.json @@ -1,9 +1,9 @@ { "parent": "block/rail_flat_glow", "textures": { - "rail": "blocks/rail_detector_powered", - "rail_glow": "blocks/rail_detector_glow", - "rail_glow_faint": "blocks/rail_detector_glow_half", - "rail_glow_faint_2": "blocks/rail_detector_glow_quarter" + "rail": "block/rail_detector_powered", + "rail_glow": "block/rail_detector_glow", + "rail_glow_faint": "block/rail_detector_glow_half", + "rail_glow_faint_2": "block/rail_detector_glow_quarter" } } diff --git a/assets/minecraft/models/block/detector_rail_powered_raised_ne.json b/assets/minecraft/models/block/detector_rail_powered_raised_ne.json old mode 100755 new mode 100644 index a0e2ba9..ba517c9 --- a/assets/minecraft/models/block/detector_rail_powered_raised_ne.json +++ b/assets/minecraft/models/block/detector_rail_powered_raised_ne.json @@ -1,9 +1,9 @@ { "parent": "block/rail_raised_glow_ne", "textures": { - "rail": "blocks/rail_detector_powered", - "rail_glow": "blocks/rail_detector_glow", - "rail_glow_faint": "blocks/rail_detector_glow_half", - "rail_glow_faint_2": "blocks/rail_detector_glow_quarter" + "rail": "block/rail_detector_powered", + "rail_glow": "block/rail_detector_glow", + "rail_glow_faint": "block/rail_detector_glow_half", + "rail_glow_faint_2": "block/rail_detector_glow_quarter" } } diff --git a/assets/minecraft/models/block/detector_rail_powered_raised_sw.json b/assets/minecraft/models/block/detector_rail_powered_raised_sw.json old mode 100755 new mode 100644 index a43f5e5..423d7ab --- a/assets/minecraft/models/block/detector_rail_powered_raised_sw.json +++ b/assets/minecraft/models/block/detector_rail_powered_raised_sw.json @@ -1,9 +1,9 @@ { "parent": "block/rail_raised_glow_sw", "textures": { - "rail": "blocks/rail_detector_powered", - "rail_glow": "blocks/rail_detector_glow", - "rail_glow_faint": "blocks/rail_detector_glow_half", - "rail_glow_faint_2": "blocks/rail_detector_glow_quarter" + "rail": "block/rail_detector_powered", + "rail_glow": "block/rail_detector_glow", + "rail_glow_faint": "block/rail_detector_glow_half", + "rail_glow_faint_2": "block/rail_detector_glow_quarter" } } diff --git a/assets/minecraft/models/block/diamond_ore.json b/assets/minecraft/models/block/diamond_ore.json old mode 100755 new mode 100644 index c405728..a979e82 --- a/assets/minecraft/models/block/diamond_ore.json +++ b/assets/minecraft/models/block/diamond_ore.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/diamond_ore_glow" + "all": "block/stone", + "glow": "block/diamond_ore_glow" } } diff --git a/assets/minecraft/models/block/diamond_ore_alt.json b/assets/minecraft/models/block/diamond_ore_alt.json old mode 100755 new mode 100644 index a788d2e..b177c13 --- a/assets/minecraft/models/block/diamond_ore_alt.json +++ b/assets/minecraft/models/block/diamond_ore_alt.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/diamond_ore_glow_alt" + "all": "block/stone", + "glow": "block/diamond_ore_glow_alt" } } diff --git a/assets/minecraft/models/block/emerald_ore.json b/assets/minecraft/models/block/emerald_ore.json old mode 100755 new mode 100644 index 57d18b6..c09e6d3 --- a/assets/minecraft/models/block/emerald_ore.json +++ b/assets/minecraft/models/block/emerald_ore.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/emerald_ore_glow" + "all": "block/stone", + "glow": "block/emerald_ore_glow" } } diff --git a/assets/minecraft/models/block/enchanting_table_base.json b/assets/minecraft/models/block/enchanting_table_base.json old mode 100755 new mode 100644 index e9833a9..7be9656 --- a/assets/minecraft/models/block/enchanting_table_base.json +++ b/assets/minecraft/models/block/enchanting_table_base.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "particle": "blocks/enchanting_table_bottom", - "bottom": "blocks/enchanting_table_bottom", - "top": "blocks/enchanting_table_top", - "side": "blocks/enchanting_table_side", - "glow_top": "blocks/enchanting_table_top_glow", - "glow_side": "blocks/enchanting_table_side_glow" + "particle": "block/enchanting_table_bottom", + "bottom": "block/enchanting_table_bottom", + "top": "block/enchanting_table_top", + "side": "block/enchanting_table_side", + "glow_top": "block/enchanting_table_top_glow", + "glow_side": "block/enchanting_table_side_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/end_portal_frame_empty.json b/assets/minecraft/models/block/end_portal_frame_empty.json old mode 100755 new mode 100644 index 0949a6c..7543b89 --- a/assets/minecraft/models/block/end_portal_frame_empty.json +++ b/assets/minecraft/models/block/end_portal_frame_empty.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "particle": "blocks/endframe_side", - "bottom": "blocks/end_stone", - "top": "blocks/endframe_top", - "side": "blocks/endframe_side", - "socket": "blocks/endframe_socket" + "particle": "block/endframe_side", + "bottom": "block/end_stone", + "top": "block/endframe_top", + "side": "block/endframe_side", + "socket": "block/endframe_socket" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/end_portal_frame_filled.json b/assets/minecraft/models/block/end_portal_frame_filled.json old mode 100755 new mode 100644 index f521c53..938074c --- a/assets/minecraft/models/block/end_portal_frame_filled.json +++ b/assets/minecraft/models/block/end_portal_frame_filled.json @@ -1,12 +1,12 @@ { "parent": "block/block", "textures": { - "particle": "blocks/endframe_side", - "bottom": "blocks/end_stone", - "top": "blocks/endframe_top", - "side": "blocks/endframe_side", - "eye": "blocks/endframe_eye", - "socket": "blocks/endframe_socket" + "particle": "block/endframe_side", + "bottom": "block/end_stone", + "top": "block/endframe_top", + "side": "block/endframe_side", + "eye": "block/endframe_eye", + "socket": "block/endframe_socket" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/glass_pane_noside.json b/assets/minecraft/models/block/glass_pane_noside.json index d08fd20..403e55e 100644 --- a/assets/minecraft/models/block/glass_pane_noside.json +++ b/assets/minecraft/models/block/glass_pane_noside.json @@ -1,7 +1,7 @@ { "parent": "block/ctm_pane_noside", "textures": { - "cap": "blocks/glass_pane_top", - "side": "blocks/glass" + "cap": "block/glass_pane_top", + "side": "block/glass" } } diff --git a/assets/minecraft/models/block/glass_pane_post.json b/assets/minecraft/models/block/glass_pane_post.json index 052b8fd..b536d26 100644 --- a/assets/minecraft/models/block/glass_pane_post.json +++ b/assets/minecraft/models/block/glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "block/ctm_pane_post", "textures": { - "cap": "blocks/glass_pane_top", - "side": "blocks/glass" + "cap": "block/glass_pane_top", + "side": "block/glass" } } diff --git a/assets/minecraft/models/block/glass_pane_side.json b/assets/minecraft/models/block/glass_pane_side.json index 5b2427a..69b1177 100644 --- a/assets/minecraft/models/block/glass_pane_side.json +++ b/assets/minecraft/models/block/glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "block/ctm_pane_side", "textures": { - "cap": "blocks/glass_pane_top", - "side": "blocks/glass" + "cap": "block/glass_pane_top", + "side": "block/glass" } } diff --git a/assets/minecraft/models/block/golden_rail_active_flat.json b/assets/minecraft/models/block/golden_rail_active_flat.json old mode 100755 new mode 100644 index 83bef54..978ace6 --- a/assets/minecraft/models/block/golden_rail_active_flat.json +++ b/assets/minecraft/models/block/golden_rail_active_flat.json @@ -1,9 +1,9 @@ { "parent": "block/rail_flat_glow", "textures": { - "rail": "blocks/rail_golden_powered", - "rail_glow": "blocks/rail_golden_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_gold" + "rail": "block/rail_golden_powered", + "rail_glow": "block/rail_golden_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_gold" } } diff --git a/assets/minecraft/models/block/golden_rail_active_raised_ne.json b/assets/minecraft/models/block/golden_rail_active_raised_ne.json old mode 100755 new mode 100644 index f564165..b8fbbfb --- a/assets/minecraft/models/block/golden_rail_active_raised_ne.json +++ b/assets/minecraft/models/block/golden_rail_active_raised_ne.json @@ -1,9 +1,9 @@ { "parent": "block/rail_raised_glow_ne", "textures": { - "rail": "blocks/rail_golden_powered", - "rail_glow": "blocks/rail_golden_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_gold" + "rail": "block/rail_golden_powered", + "rail_glow": "block/rail_golden_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_gold" } } diff --git a/assets/minecraft/models/block/golden_rail_active_raised_sw.json b/assets/minecraft/models/block/golden_rail_active_raised_sw.json old mode 100755 new mode 100644 index 2d39e9d..e62aaca --- a/assets/minecraft/models/block/golden_rail_active_raised_sw.json +++ b/assets/minecraft/models/block/golden_rail_active_raised_sw.json @@ -1,9 +1,9 @@ { "parent": "block/rail_raised_glow_sw", "textures": { - "rail": "blocks/rail_golden_powered", - "rail_glow": "blocks/rail_golden_glow", - "rail_glow_faint": "blocks/rail_glow_faint", - "rail_glow_faint_2": "blocks/rail_gold" + "rail": "block/rail_golden_powered", + "rail_glow": "block/rail_golden_glow", + "rail_glow_faint": "block/rail_glow_faint", + "rail_glow_faint_2": "block/rail_gold" } } diff --git a/assets/minecraft/models/block/golden_rail_flat.json b/assets/minecraft/models/block/golden_rail_flat.json old mode 100755 new mode 100644 index 7280635..e9cc229 --- a/assets/minecraft/models/block/golden_rail_flat.json +++ b/assets/minecraft/models/block/golden_rail_flat.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "textures": { "particle": "#rail", - "rail": "blocks/rail_golden", - "rail_glow": "blocks/rail_gold" + "rail": "block/rail_golden", + "rail_glow": "block/rail_gold" }, "elements": [ { "from": [ 0, 1, 0 ], diff --git a/assets/minecraft/models/block/golden_rail_raised_ne.json b/assets/minecraft/models/block/golden_rail_raised_ne.json old mode 100755 new mode 100644 index 8208438..b3cfba0 --- a/assets/minecraft/models/block/golden_rail_raised_ne.json +++ b/assets/minecraft/models/block/golden_rail_raised_ne.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "textures": { "particle": "#rail", - "rail": "blocks/rail_golden", - "rail_glow": "blocks/rail_gold" + "rail": "block/rail_golden", + "rail_glow": "block/rail_gold" }, "elements": [ { "from": [ 0, 9, 0 ], diff --git a/assets/minecraft/models/block/golden_rail_raised_sw.json b/assets/minecraft/models/block/golden_rail_raised_sw.json old mode 100755 new mode 100644 index 6ab8693..53eff5b --- a/assets/minecraft/models/block/golden_rail_raised_sw.json +++ b/assets/minecraft/models/block/golden_rail_raised_sw.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "textures": { "particle": "#rail", - "rail": "blocks/rail_golden", - "rail_glow": "blocks/rail_gold" + "rail": "block/rail_golden", + "rail_glow": "block/rail_gold" }, "elements": [ { "from": [ 0, 9, 0 ], diff --git a/assets/minecraft/models/block/lit_redstone_ore.json b/assets/minecraft/models/block/lit_redstone_ore.json old mode 100755 new mode 100644 index cc78baa..ac1b016 --- a/assets/minecraft/models/block/lit_redstone_ore.json +++ b/assets/minecraft/models/block/lit_redstone_ore.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/redstone_ore_glow" + "all": "block/stone", + "glow": "block/redstone_ore_glow" } } diff --git a/assets/minecraft/models/block/lit_redstone_ore_alt.json b/assets/minecraft/models/block/lit_redstone_ore_alt.json old mode 100755 new mode 100644 index b7634f8..33d8e2a --- a/assets/minecraft/models/block/lit_redstone_ore_alt.json +++ b/assets/minecraft/models/block/lit_redstone_ore_alt.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/redstone_ore_glow_alt" + "all": "block/stone", + "glow": "block/redstone_ore_glow_alt" } } diff --git a/assets/minecraft/models/block/lit_redstone_torch.json b/assets/minecraft/models/block/lit_redstone_torch.json old mode 100755 new mode 100644 index 4ffd680..c0e5e9a --- a/assets/minecraft/models/block/lit_redstone_torch.json +++ b/assets/minecraft/models/block/lit_redstone_torch.json @@ -1,7 +1,7 @@ { "parent": "block/torch_glow", "textures": { - "torch": "blocks/redstone_torch_on", - "glow": "blocks/redstone_torch_glow" + "torch": "block/redstone_torch_on", + "glow": "block/redstone_torch_glow" } } diff --git a/assets/minecraft/models/block/lit_redstone_torch_wall.json b/assets/minecraft/models/block/lit_redstone_torch_wall.json old mode 100755 new mode 100644 index 082b067..bd6d59e --- a/assets/minecraft/models/block/lit_redstone_torch_wall.json +++ b/assets/minecraft/models/block/lit_redstone_torch_wall.json @@ -1,7 +1,7 @@ { "parent": "block/torch_glow_wall", "textures": { - "torch": "blocks/redstone_torch_on", - "glow": "blocks/redstone_torch_glow" + "torch": "block/redstone_torch_on", + "glow": "block/redstone_torch_glow" } } diff --git a/assets/minecraft/models/block/obsidian.json b/assets/minecraft/models/block/obsidian.json old mode 100755 new mode 100644 index 1084cdf..36ca8d3 --- a/assets/minecraft/models/block/obsidian.json +++ b/assets/minecraft/models/block/obsidian.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/obsidian", - "glow": "blocks/obsidian_reflect" + "all": "block/obsidian", + "glow": "block/obsidian_reflect" } } diff --git a/assets/minecraft/models/block/rail_flat_glow.json b/assets/minecraft/models/block/rail_flat_glow.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/rail_raised_glow_ne.json b/assets/minecraft/models/block/rail_raised_glow_ne.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/rail_raised_glow_sw.json b/assets/minecraft/models/block/rail_raised_glow_sw.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/redstone_block.json b/assets/minecraft/models/block/redstone_block.json old mode 100755 new mode 100644 index b32b0c8..d320bca --- a/assets/minecraft/models/block/redstone_block.json +++ b/assets/minecraft/models/block/redstone_block.json @@ -1,11 +1,11 @@ { "parent": "block/util_cube_glow_5_all", "textures": { - "glow_4": "blocks/redstone_block_glow_4", - "glow_3": "blocks/redstone_block_glow_3", - "glow_2": "blocks/redstone_block_glow_2", - "glow_1": "blocks/redstone_block_glow_1", - "glow_0": "blocks/redstone_block_glow_0", - "particle": "blocks/redstone_block" + "glow_4": "block/redstone_block_glow_4", + "glow_3": "block/redstone_block_glow_3", + "glow_2": "block/redstone_block_glow_2", + "glow_1": "block/redstone_block_glow_1", + "glow_0": "block/redstone_block_glow_0", + "particle": "block/redstone_block" } } diff --git a/assets/minecraft/models/block/redstone_ore.json b/assets/minecraft/models/block/redstone_ore.json old mode 100755 new mode 100644 index cc78baa..ac1b016 --- a/assets/minecraft/models/block/redstone_ore.json +++ b/assets/minecraft/models/block/redstone_ore.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/redstone_ore_glow" + "all": "block/stone", + "glow": "block/redstone_ore_glow" } } diff --git a/assets/minecraft/models/block/redstone_ore_alt.json b/assets/minecraft/models/block/redstone_ore_alt.json old mode 100755 new mode 100644 index b7634f8..33d8e2a --- a/assets/minecraft/models/block/redstone_ore_alt.json +++ b/assets/minecraft/models/block/redstone_ore_alt.json @@ -1,7 +1,7 @@ { "parent": "block/util_cube_glow_2_all", "textures": { - "all": "blocks/stone", - "glow": "blocks/redstone_ore_glow_alt" + "all": "block/stone", + "glow": "block/redstone_ore_glow_alt" } } diff --git a/assets/minecraft/models/block/repeater_on_1tick.json b/assets/minecraft/models/block/repeater_on_1tick.json old mode 100755 new mode 100644 index 8762ced..1aa6e08 --- a/assets/minecraft/models/block/repeater_on_1tick.json +++ b/assets/minecraft/models/block/repeater_on_1tick.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_2tick.json b/assets/minecraft/models/block/repeater_on_2tick.json old mode 100755 new mode 100644 index 99fd880..d1c650e --- a/assets/minecraft/models/block/repeater_on_2tick.json +++ b/assets/minecraft/models/block/repeater_on_2tick.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_3tick.json b/assets/minecraft/models/block/repeater_on_3tick.json old mode 100755 new mode 100644 index 2f0a854..a009fe0 --- a/assets/minecraft/models/block/repeater_on_3tick.json +++ b/assets/minecraft/models/block/repeater_on_3tick.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_4tick.json b/assets/minecraft/models/block/repeater_on_4tick.json old mode 100755 new mode 100644 index 5eb678e..f47454b --- a/assets/minecraft/models/block/repeater_on_4tick.json +++ b/assets/minecraft/models/block/repeater_on_4tick.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_locked_1tick.json b/assets/minecraft/models/block/repeater_on_locked_1tick.json old mode 100755 new mode 100644 index 77e514b..7cfa42e --- a/assets/minecraft/models/block/repeater_on_locked_1tick.json +++ b/assets/minecraft/models/block/repeater_on_locked_1tick.json @@ -1,13 +1,13 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "lock": "blocks/bedrock", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "lock": "block/bedrock", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_locked_2tick.json b/assets/minecraft/models/block/repeater_on_locked_2tick.json old mode 100755 new mode 100644 index 8f82ffc..418a7d9 --- a/assets/minecraft/models/block/repeater_on_locked_2tick.json +++ b/assets/minecraft/models/block/repeater_on_locked_2tick.json @@ -1,13 +1,13 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "lock": "blocks/bedrock", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "lock": "block/bedrock", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_locked_3tick.json b/assets/minecraft/models/block/repeater_on_locked_3tick.json old mode 100755 new mode 100644 index f42f196..ec6b965 --- a/assets/minecraft/models/block/repeater_on_locked_3tick.json +++ b/assets/minecraft/models/block/repeater_on_locked_3tick.json @@ -1,13 +1,13 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "lock": "blocks/bedrock", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "lock": "block/bedrock", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/repeater_on_locked_4tick.json b/assets/minecraft/models/block/repeater_on_locked_4tick.json old mode 100755 new mode 100644 index 9de0858..26f1e9d --- a/assets/minecraft/models/block/repeater_on_locked_4tick.json +++ b/assets/minecraft/models/block/repeater_on_locked_4tick.json @@ -1,13 +1,13 @@ { "ambientocclusion": false, "textures": { - "particle": "blocks/repeater_on", - "slab": "blocks/stone_slab_top", - "top": "blocks/repeater_on", - "lit": "blocks/redstone_torch_on", - "lock": "blocks/bedrock", - "glow": "blocks/repeater_glow", - "lit_glow": "blocks/redstone_torch_glow" + "particle": "block/repeater_on", + "slab": "block/stone_slab_top", + "top": "block/repeater_on", + "lit": "block/redstone_torch_on", + "lock": "block/bedrock", + "glow": "block/repeater_glow", + "lit_glow": "block/redstone_torch_glow" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/assets/minecraft/models/block/torch_glow.json b/assets/minecraft/models/block/torch_glow.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/torch_glow_wall.json b/assets/minecraft/models/block/torch_glow_wall.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_block_no_ao.json b/assets/minecraft/models/block/util_block_no_ao.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_10_all.json b/assets/minecraft/models/block/util_cube_glow_10_all.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_2.json b/assets/minecraft/models/block/util_cube_glow_2.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_2_all.json b/assets/minecraft/models/block/util_cube_glow_2_all.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_2_column.json b/assets/minecraft/models/block/util_cube_glow_2_column.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_3_all.json b/assets/minecraft/models/block/util_cube_glow_3_all.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/block/util_cube_glow_5_all.json b/assets/minecraft/models/block/util_cube_glow_5_all.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/models/item/beacon.json b/assets/minecraft/models/item/beacon.json old mode 100755 new mode 100644 diff --git a/assets/minecraft/textures/block/black_stained_glass.png.mcmeta b/assets/minecraft/textures/block/black_stained_glass.png.mcmeta new file mode 100644 index 0000000..26ee9bd --- /dev/null +++ b/assets/minecraft/textures/block/black_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/black_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_black_ctm.png b/assets/minecraft/textures/block/black_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_black_ctm.png rename to assets/minecraft/textures/block/black_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/glass_blue.png.mcmeta b/assets/minecraft/textures/block/blue_stained_glass.png.mcmeta old mode 100755 new mode 100644 similarity index 84% rename from assets/minecraft/textures/blocks/glass_blue.png.mcmeta rename to assets/minecraft/textures/block/blue_stained_glass.png.mcmeta index 2fc0933..b704829 --- a/assets/minecraft/textures/blocks/glass_blue.png.mcmeta +++ b/assets/minecraft/textures/block/blue_stained_glass.png.mcmeta @@ -5,7 +5,7 @@ "type":"CTM", "layer":"TRANSLUCENT", "textures":[ - "minecraft:blocks/glass_blue_ctm" + "minecraft:block/blue_stained_glass_ctm" ] } } diff --git a/assets/minecraft/textures/blocks/glass_blue_ctm.png b/assets/minecraft/textures/block/blue_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_blue_ctm.png rename to assets/minecraft/textures/block/blue_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/brew_glow_bottle.png b/assets/minecraft/textures/block/brew_glow_bottle.png similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_bottle.png rename to assets/minecraft/textures/block/brew_glow_bottle.png diff --git a/assets/minecraft/textures/blocks/brew_glow_bottle.png.mcmeta b/assets/minecraft/textures/block/brew_glow_bottle.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_bottle.png.mcmeta rename to assets/minecraft/textures/block/brew_glow_bottle.png.mcmeta diff --git a/assets/minecraft/textures/blocks/brew_glow_rod.png b/assets/minecraft/textures/block/brew_glow_rod.png similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_rod.png rename to assets/minecraft/textures/block/brew_glow_rod.png diff --git a/assets/minecraft/textures/blocks/brew_glow_rod.png.mcmeta b/assets/minecraft/textures/block/brew_glow_rod.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_rod.png.mcmeta rename to assets/minecraft/textures/block/brew_glow_rod.png.mcmeta diff --git a/assets/minecraft/textures/blocks/brew_glow_tube.png b/assets/minecraft/textures/block/brew_glow_tube.png similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_tube.png rename to assets/minecraft/textures/block/brew_glow_tube.png diff --git a/assets/minecraft/textures/blocks/brew_glow_tube.png.mcmeta b/assets/minecraft/textures/block/brew_glow_tube.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/brew_glow_tube.png.mcmeta rename to assets/minecraft/textures/block/brew_glow_tube.png.mcmeta diff --git a/assets/minecraft/textures/block/brown_stained_glass.png.mcmeta b/assets/minecraft/textures/block/brown_stained_glass.png.mcmeta new file mode 100644 index 0000000..6c31ec7 --- /dev/null +++ b/assets/minecraft/textures/block/brown_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/brown_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_brown_ctm.png b/assets/minecraft/textures/block/brown_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_brown_ctm.png rename to assets/minecraft/textures/block/brown_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/comparator_glow.png b/assets/minecraft/textures/block/comparator_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/comparator_glow.png rename to assets/minecraft/textures/block/comparator_glow.png diff --git a/assets/minecraft/textures/blocks/comparator_glow.png.mcmeta b/assets/minecraft/textures/block/comparator_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/comparator_glow.png.mcmeta rename to assets/minecraft/textures/block/comparator_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/comparator_glow_faint.png b/assets/minecraft/textures/block/comparator_glow_faint.png similarity index 100% rename from assets/minecraft/textures/blocks/comparator_glow_faint.png rename to assets/minecraft/textures/block/comparator_glow_faint.png diff --git a/assets/minecraft/textures/blocks/comparator_glow_faint.png.mcmeta b/assets/minecraft/textures/block/comparator_glow_faint.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/comparator_glow_faint.png.mcmeta rename to assets/minecraft/textures/block/comparator_glow_faint.png.mcmeta diff --git a/assets/minecraft/textures/blocks/glass_brown.png.mcmeta b/assets/minecraft/textures/block/cyan_stained_glass.png.mcmeta old mode 100755 new mode 100644 similarity index 84% rename from assets/minecraft/textures/blocks/glass_brown.png.mcmeta rename to assets/minecraft/textures/block/cyan_stained_glass.png.mcmeta index dd45482..3cd3704 --- a/assets/minecraft/textures/blocks/glass_brown.png.mcmeta +++ b/assets/minecraft/textures/block/cyan_stained_glass.png.mcmeta @@ -5,7 +5,7 @@ "type":"CTM", "layer":"TRANSLUCENT", "textures":[ - "minecraft:blocks/glass_brown_ctm" + "minecraft:block/cyan_stained_glass_ctm" ] } } diff --git a/assets/minecraft/textures/blocks/glass_cyan_ctm.png b/assets/minecraft/textures/block/cyan_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_cyan_ctm.png rename to assets/minecraft/textures/block/cyan_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/daylight_detector_glow.png b/assets/minecraft/textures/block/daylight_detector_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/daylight_detector_glow.png rename to assets/minecraft/textures/block/daylight_detector_glow.png diff --git a/assets/minecraft/textures/blocks/daylight_detector_glow.png.mcmeta b/assets/minecraft/textures/block/daylight_detector_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/daylight_detector_glow.png.mcmeta rename to assets/minecraft/textures/block/daylight_detector_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/diamond_ore_glow.png b/assets/minecraft/textures/block/diamond_ore_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/diamond_ore_glow.png rename to assets/minecraft/textures/block/diamond_ore_glow.png diff --git a/assets/minecraft/textures/blocks/diamond_ore_glow.png.mcmeta b/assets/minecraft/textures/block/diamond_ore_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/diamond_ore_glow.png.mcmeta rename to assets/minecraft/textures/block/diamond_ore_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/emerald_ore_glow.png b/assets/minecraft/textures/block/emerald_ore_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/emerald_ore_glow.png rename to assets/minecraft/textures/block/emerald_ore_glow.png diff --git a/assets/minecraft/textures/blocks/emerald_ore_glow.png.mcmeta b/assets/minecraft/textures/block/emerald_ore_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/emerald_ore_glow.png.mcmeta rename to assets/minecraft/textures/block/emerald_ore_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/enchanting_table_side_glow.png b/assets/minecraft/textures/block/enchanting_table_side_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/enchanting_table_side_glow.png rename to assets/minecraft/textures/block/enchanting_table_side_glow.png diff --git a/assets/minecraft/textures/blocks/enchanting_table_side_glow.png.mcmeta b/assets/minecraft/textures/block/enchanting_table_side_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/enchanting_table_side_glow.png.mcmeta rename to assets/minecraft/textures/block/enchanting_table_side_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/enchanting_table_top_glow.png b/assets/minecraft/textures/block/enchanting_table_top_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/enchanting_table_top_glow.png rename to assets/minecraft/textures/block/enchanting_table_top_glow.png diff --git a/assets/minecraft/textures/blocks/enchanting_table_top_glow.png.mcmeta b/assets/minecraft/textures/block/enchanting_table_top_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/enchanting_table_top_glow.png.mcmeta rename to assets/minecraft/textures/block/enchanting_table_top_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/endframe_side.png.mcmeta b/assets/minecraft/textures/block/endframe_side.png.mcmeta old mode 100755 new mode 100644 similarity index 77% rename from assets/minecraft/textures/blocks/endframe_side.png.mcmeta rename to assets/minecraft/textures/block/endframe_side.png.mcmeta index 28add13..5261942 --- a/assets/minecraft/textures/blocks/endframe_side.png.mcmeta +++ b/assets/minecraft/textures/block/endframe_side.png.mcmeta @@ -3,7 +3,7 @@ "ctm_version": 1, "type":"CTM", "textures":[ - "minecraft:blocks/endframe_side_ct" + "minecraft:block/endframe_side_ct" ], "extra":{ "ignore_states":"true" diff --git a/assets/minecraft/textures/blocks/endframe_side_ct.png b/assets/minecraft/textures/block/endframe_side_ct.png similarity index 100% rename from assets/minecraft/textures/blocks/endframe_side_ct.png rename to assets/minecraft/textures/block/endframe_side_ct.png diff --git a/assets/minecraft/textures/blocks/endframe_socket.png b/assets/minecraft/textures/block/endframe_socket.png old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/endframe_socket.png rename to assets/minecraft/textures/block/endframe_socket.png diff --git a/assets/minecraft/textures/blocks/endframe_socket.png.mcmeta b/assets/minecraft/textures/block/endframe_socket.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/endframe_socket.png.mcmeta rename to assets/minecraft/textures/block/endframe_socket.png.mcmeta diff --git a/assets/minecraft/textures/blocks/endframe_top.png b/assets/minecraft/textures/block/endframe_top.png similarity index 100% rename from assets/minecraft/textures/blocks/endframe_top.png rename to assets/minecraft/textures/block/endframe_top.png diff --git a/assets/minecraft/textures/blocks/endframe_top.png.mcmeta b/assets/minecraft/textures/block/endframe_top.png.mcmeta old mode 100755 new mode 100644 similarity index 86% rename from assets/minecraft/textures/blocks/endframe_top.png.mcmeta rename to assets/minecraft/textures/block/endframe_top.png.mcmeta index c89756d..a536ab7 --- a/assets/minecraft/textures/blocks/endframe_top.png.mcmeta +++ b/assets/minecraft/textures/block/endframe_top.png.mcmeta @@ -4,7 +4,7 @@ "ctm_version": 1, "type":"CTM", "textures":[ - "minecraft:blocks/endframe_top_ct" + "minecraft:block/endframe_top_ct" ], "extra":{ "ignore_states":"true" diff --git a/assets/minecraft/textures/blocks/endframe_top_ct.png b/assets/minecraft/textures/block/endframe_top_ct.png similarity index 100% rename from assets/minecraft/textures/blocks/endframe_top_ct.png rename to assets/minecraft/textures/block/endframe_top_ct.png diff --git a/assets/minecraft/textures/blocks/farmland_ctm.png b/assets/minecraft/textures/block/farmland_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/farmland_ctm.png rename to assets/minecraft/textures/block/farmland_ctm.png diff --git a/assets/minecraft/textures/blocks/farmland_dry.png.mcmeta b/assets/minecraft/textures/block/farmland_dry.png.mcmeta old mode 100755 new mode 100644 similarity index 82% rename from assets/minecraft/textures/blocks/farmland_dry.png.mcmeta rename to assets/minecraft/textures/block/farmland_dry.png.mcmeta index 70bd235..ca4fb6b --- a/assets/minecraft/textures/blocks/farmland_dry.png.mcmeta +++ b/assets/minecraft/textures/block/farmland_dry.png.mcmeta @@ -3,8 +3,8 @@ "ctm_version": 1, "type": "EDGES", "textures": [ - "blocks/farmland_ctm", - "blocks/farmland_wet" + "block/farmland_ctm", + "block/farmland_wet" ], "extra": { "connect_to": [ diff --git a/assets/minecraft/textures/blocks/glass-ctm.png b/assets/minecraft/textures/block/glass-ctm.png old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/glass-ctm.png rename to assets/minecraft/textures/block/glass-ctm.png diff --git a/assets/minecraft/textures/blocks/glass.png.mcmeta b/assets/minecraft/textures/block/glass.png.mcmeta old mode 100755 new mode 100644 similarity index 87% rename from assets/minecraft/textures/blocks/glass.png.mcmeta rename to assets/minecraft/textures/block/glass.png.mcmeta index 6158fd9..3f69284 --- a/assets/minecraft/textures/blocks/glass.png.mcmeta +++ b/assets/minecraft/textures/block/glass.png.mcmeta @@ -5,7 +5,7 @@ "type":"CTM", "layer":"CUTOUT", "textures":[ - "minecraft:blocks/glass-ctm" + "minecraft:block/glass-ctm" ] } } diff --git a/assets/minecraft/textures/blocks/glass_pane_top.png b/assets/minecraft/textures/block/glass_pane_top.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_pane_top.png rename to assets/minecraft/textures/block/glass_pane_top.png diff --git a/assets/minecraft/textures/blocks/glass_cyan.png.mcmeta b/assets/minecraft/textures/block/gray_stained_glass.png.mcmeta old mode 100755 new mode 100644 similarity index 84% rename from assets/minecraft/textures/blocks/glass_cyan.png.mcmeta rename to assets/minecraft/textures/block/gray_stained_glass.png.mcmeta index 26109b0..75026cf --- a/assets/minecraft/textures/blocks/glass_cyan.png.mcmeta +++ b/assets/minecraft/textures/block/gray_stained_glass.png.mcmeta @@ -5,7 +5,7 @@ "type":"CTM", "layer":"TRANSLUCENT", "textures":[ - "minecraft:blocks/glass_cyan_ctm" + "minecraft:block/gray_stained_glass_ctm" ] } } diff --git a/assets/minecraft/textures/blocks/glass_gray_ctm.png b/assets/minecraft/textures/block/gray_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_gray_ctm.png rename to assets/minecraft/textures/block/gray_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/green_stained_glass.png.mcmeta b/assets/minecraft/textures/block/green_stained_glass.png.mcmeta new file mode 100644 index 0000000..d0f83fe --- /dev/null +++ b/assets/minecraft/textures/block/green_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/green_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_green_ctm.png b/assets/minecraft/textures/block/green_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_green_ctm.png rename to assets/minecraft/textures/block/green_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/light_blue_stained_glass.png.mcmeta b/assets/minecraft/textures/block/light_blue_stained_glass.png.mcmeta new file mode 100644 index 0000000..57664a0 --- /dev/null +++ b/assets/minecraft/textures/block/light_blue_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/light_blue_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_light_blue_ctm.png b/assets/minecraft/textures/block/light_blue_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_light_blue_ctm.png rename to assets/minecraft/textures/block/light_blue_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/light_gray_stained_glass.png.mcmeta b/assets/minecraft/textures/block/light_gray_stained_glass.png.mcmeta new file mode 100644 index 0000000..ec8e7a7 --- /dev/null +++ b/assets/minecraft/textures/block/light_gray_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/light_gray_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_silver_ctm.png b/assets/minecraft/textures/block/light_gray_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_silver_ctm.png rename to assets/minecraft/textures/block/light_gray_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/lime_stained_glass.png.mcmeta b/assets/minecraft/textures/block/lime_stained_glass.png.mcmeta new file mode 100644 index 0000000..269637d --- /dev/null +++ b/assets/minecraft/textures/block/lime_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/lime_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_lime_ctm.png b/assets/minecraft/textures/block/lime_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_lime_ctm.png rename to assets/minecraft/textures/block/lime_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/lines.png b/assets/minecraft/textures/block/lines.png old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/lines.png rename to assets/minecraft/textures/block/lines.png diff --git a/assets/minecraft/textures/blocks/lines.png.mcmeta b/assets/minecraft/textures/block/lines.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/lines.png.mcmeta rename to assets/minecraft/textures/block/lines.png.mcmeta diff --git a/assets/minecraft/textures/block/magenta_stained_glass.png.mcmeta b/assets/minecraft/textures/block/magenta_stained_glass.png.mcmeta new file mode 100644 index 0000000..bc48d9d --- /dev/null +++ b/assets/minecraft/textures/block/magenta_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/magenta_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_magenta_ctm.png b/assets/minecraft/textures/block/magenta_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_magenta_ctm.png rename to assets/minecraft/textures/block/magenta_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/magma_glow.png b/assets/minecraft/textures/block/magma_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/magma_glow.png rename to assets/minecraft/textures/block/magma_glow.png diff --git a/assets/minecraft/textures/blocks/magma_glow.png.mcmeta b/assets/minecraft/textures/block/magma_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/magma_glow.png.mcmeta rename to assets/minecraft/textures/block/magma_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/magma_glow_faint.png b/assets/minecraft/textures/block/magma_glow_faint.png similarity index 100% rename from assets/minecraft/textures/blocks/magma_glow_faint.png rename to assets/minecraft/textures/block/magma_glow_faint.png diff --git a/assets/minecraft/textures/blocks/magma_glow_faint.png.mcmeta b/assets/minecraft/textures/block/magma_glow_faint.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/magma_glow_faint.png.mcmeta rename to assets/minecraft/textures/block/magma_glow_faint.png.mcmeta diff --git a/assets/minecraft/textures/blocks/nightlight_detector_glow.png b/assets/minecraft/textures/block/nightlight_detector_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/nightlight_detector_glow.png rename to assets/minecraft/textures/block/nightlight_detector_glow.png diff --git a/assets/minecraft/textures/blocks/nightlight_detector_glow.png.mcmeta b/assets/minecraft/textures/block/nightlight_detector_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/nightlight_detector_glow.png.mcmeta rename to assets/minecraft/textures/block/nightlight_detector_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/obsidian.png.mcmeta b/assets/minecraft/textures/block/obsidian.png.mcmeta old mode 100755 new mode 100644 similarity index 85% rename from assets/minecraft/textures/blocks/obsidian.png.mcmeta rename to assets/minecraft/textures/block/obsidian.png.mcmeta index 1234aef..7373101 --- a/assets/minecraft/textures/blocks/obsidian.png.mcmeta +++ b/assets/minecraft/textures/block/obsidian.png.mcmeta @@ -3,7 +3,7 @@ "ctm_version": 1, "type": "EDGES_FULL", "textures": [ - "blocks/obsidian_portal" + "block/obsidian_portal" ], "extra": { "connect_to": [ diff --git a/assets/minecraft/textures/blocks/obsidian_portal.png b/assets/minecraft/textures/block/obsidian_portal.png similarity index 100% rename from assets/minecraft/textures/blocks/obsidian_portal.png rename to assets/minecraft/textures/block/obsidian_portal.png diff --git a/assets/minecraft/textures/blocks/obsidian_reflect.png b/assets/minecraft/textures/block/obsidian_reflect.png similarity index 100% rename from assets/minecraft/textures/blocks/obsidian_reflect.png rename to assets/minecraft/textures/block/obsidian_reflect.png diff --git a/assets/minecraft/textures/blocks/obsidian_reflect.png.mcmeta b/assets/minecraft/textures/block/obsidian_reflect.png.mcmeta old mode 100755 new mode 100644 similarity index 86% rename from assets/minecraft/textures/blocks/obsidian_reflect.png.mcmeta rename to assets/minecraft/textures/block/obsidian_reflect.png.mcmeta index 16aa16d..0dbc6ce --- a/assets/minecraft/textures/blocks/obsidian_reflect.png.mcmeta +++ b/assets/minecraft/textures/block/obsidian_reflect.png.mcmeta @@ -4,7 +4,7 @@ "type": "EDGES_FULL", "layer": "TRANSLUCENT", "textures": [ - "blocks/obsidian_reflect_ctm" + "block/obsidian_reflect_ctm" ], "extra": { "connect_to": [ diff --git a/assets/minecraft/textures/blocks/obsidian_reflect_ctm.png b/assets/minecraft/textures/block/obsidian_reflect_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/obsidian_reflect_ctm.png rename to assets/minecraft/textures/block/obsidian_reflect_ctm.png diff --git a/assets/minecraft/textures/block/orange_stained_glass.png.mcmeta b/assets/minecraft/textures/block/orange_stained_glass.png.mcmeta new file mode 100644 index 0000000..9dabe99 --- /dev/null +++ b/assets/minecraft/textures/block/orange_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/orange_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_orange_ctm.png b/assets/minecraft/textures/block/orange_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_orange_ctm.png rename to assets/minecraft/textures/block/orange_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/pink_stained_glass.png.mcmeta b/assets/minecraft/textures/block/pink_stained_glass.png.mcmeta new file mode 100644 index 0000000..796e6ae --- /dev/null +++ b/assets/minecraft/textures/block/pink_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/pink_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_pink_ctm.png b/assets/minecraft/textures/block/pink_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_pink_ctm.png rename to assets/minecraft/textures/block/pink_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/purple_stained_glass.png.mcmeta b/assets/minecraft/textures/block/purple_stained_glass.png.mcmeta new file mode 100644 index 0000000..578603b --- /dev/null +++ b/assets/minecraft/textures/block/purple_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/purple_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_purple_ctm.png b/assets/minecraft/textures/block/purple_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_purple_ctm.png rename to assets/minecraft/textures/block/purple_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/rail_activator_glow.png b/assets/minecraft/textures/block/rail_activator_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_activator_glow.png rename to assets/minecraft/textures/block/rail_activator_glow.png diff --git a/assets/minecraft/textures/blocks/rail_activator_glow.png.mcmeta b/assets/minecraft/textures/block/rail_activator_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_activator_glow.png.mcmeta rename to assets/minecraft/textures/block/rail_activator_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_detector_glow.png b/assets/minecraft/textures/block/rail_detector_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow.png rename to assets/minecraft/textures/block/rail_detector_glow.png diff --git a/assets/minecraft/textures/blocks/rail_detector_glow.png.mcmeta b/assets/minecraft/textures/block/rail_detector_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow.png.mcmeta rename to assets/minecraft/textures/block/rail_detector_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_detector_glow_half.png b/assets/minecraft/textures/block/rail_detector_glow_half.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow_half.png rename to assets/minecraft/textures/block/rail_detector_glow_half.png diff --git a/assets/minecraft/textures/blocks/rail_detector_glow_half.png.mcmeta b/assets/minecraft/textures/block/rail_detector_glow_half.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow_half.png.mcmeta rename to assets/minecraft/textures/block/rail_detector_glow_half.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_detector_glow_quarter.png b/assets/minecraft/textures/block/rail_detector_glow_quarter.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow_quarter.png rename to assets/minecraft/textures/block/rail_detector_glow_quarter.png diff --git a/assets/minecraft/textures/blocks/rail_detector_glow_quarter.png.mcmeta b/assets/minecraft/textures/block/rail_detector_glow_quarter.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_detector_glow_quarter.png.mcmeta rename to assets/minecraft/textures/block/rail_detector_glow_quarter.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_glow_faint.png b/assets/minecraft/textures/block/rail_glow_faint.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_glow_faint.png rename to assets/minecraft/textures/block/rail_glow_faint.png diff --git a/assets/minecraft/textures/blocks/rail_glow_faint.png.mcmeta b/assets/minecraft/textures/block/rail_glow_faint.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_glow_faint.png.mcmeta rename to assets/minecraft/textures/block/rail_glow_faint.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_gold.png b/assets/minecraft/textures/block/rail_gold.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_gold.png rename to assets/minecraft/textures/block/rail_gold.png diff --git a/assets/minecraft/textures/blocks/rail_gold.png.mcmeta b/assets/minecraft/textures/block/rail_gold.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_gold.png.mcmeta rename to assets/minecraft/textures/block/rail_gold.png.mcmeta diff --git a/assets/minecraft/textures/blocks/rail_golden_glow.png b/assets/minecraft/textures/block/rail_golden_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/rail_golden_glow.png rename to assets/minecraft/textures/block/rail_golden_glow.png diff --git a/assets/minecraft/textures/blocks/rail_golden_glow.png.mcmeta b/assets/minecraft/textures/block/rail_golden_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/rail_golden_glow.png.mcmeta rename to assets/minecraft/textures/block/rail_golden_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/glass_black.png.mcmeta b/assets/minecraft/textures/block/red_stained_glass.png.mcmeta old mode 100755 new mode 100644 similarity index 84% rename from assets/minecraft/textures/blocks/glass_black.png.mcmeta rename to assets/minecraft/textures/block/red_stained_glass.png.mcmeta index e4d6803..1e3eced --- a/assets/minecraft/textures/blocks/glass_black.png.mcmeta +++ b/assets/minecraft/textures/block/red_stained_glass.png.mcmeta @@ -5,7 +5,7 @@ "type":"CTM", "layer":"TRANSLUCENT", "textures":[ - "minecraft:blocks/glass_black_ctm" + "minecraft:block/red_stained_glass_ctm" ] } } diff --git a/assets/minecraft/textures/blocks/glass_red_ctm.png b/assets/minecraft/textures/block/red_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_red_ctm.png rename to assets/minecraft/textures/block/red_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/redstone_block.png.mcmeta b/assets/minecraft/textures/block/redstone_block.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block.png.mcmeta rename to assets/minecraft/textures/block/redstone_block.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_0.png b/assets/minecraft/textures/block/redstone_block_glow_0.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_0.png rename to assets/minecraft/textures/block/redstone_block_glow_0.png diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_0.png.mcmeta b/assets/minecraft/textures/block/redstone_block_glow_0.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_0.png.mcmeta rename to assets/minecraft/textures/block/redstone_block_glow_0.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_1.png b/assets/minecraft/textures/block/redstone_block_glow_1.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_1.png rename to assets/minecraft/textures/block/redstone_block_glow_1.png diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_1.png.mcmeta b/assets/minecraft/textures/block/redstone_block_glow_1.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_1.png.mcmeta rename to assets/minecraft/textures/block/redstone_block_glow_1.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_2.png b/assets/minecraft/textures/block/redstone_block_glow_2.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_2.png rename to assets/minecraft/textures/block/redstone_block_glow_2.png diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_2.png.mcmeta b/assets/minecraft/textures/block/redstone_block_glow_2.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_2.png.mcmeta rename to assets/minecraft/textures/block/redstone_block_glow_2.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_3.png b/assets/minecraft/textures/block/redstone_block_glow_3.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_3.png rename to assets/minecraft/textures/block/redstone_block_glow_3.png diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_3.png.mcmeta b/assets/minecraft/textures/block/redstone_block_glow_3.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_3.png.mcmeta rename to assets/minecraft/textures/block/redstone_block_glow_3.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_4.png b/assets/minecraft/textures/block/redstone_block_glow_4.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_4.png rename to assets/minecraft/textures/block/redstone_block_glow_4.png diff --git a/assets/minecraft/textures/blocks/redstone_block_glow_4.png.mcmeta b/assets/minecraft/textures/block/redstone_block_glow_4.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_block_glow_4.png.mcmeta rename to assets/minecraft/textures/block/redstone_block_glow_4.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_ore_glow.png b/assets/minecraft/textures/block/redstone_ore_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_ore_glow.png rename to assets/minecraft/textures/block/redstone_ore_glow.png diff --git a/assets/minecraft/textures/blocks/redstone_ore_glow.png.mcmeta b/assets/minecraft/textures/block/redstone_ore_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_ore_glow.png.mcmeta rename to assets/minecraft/textures/block/redstone_ore_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/redstone_torch_glow.png b/assets/minecraft/textures/block/redstone_torch_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/redstone_torch_glow.png rename to assets/minecraft/textures/block/redstone_torch_glow.png diff --git a/assets/minecraft/textures/blocks/redstone_torch_glow.png.mcmeta b/assets/minecraft/textures/block/redstone_torch_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/redstone_torch_glow.png.mcmeta rename to assets/minecraft/textures/block/redstone_torch_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/repeater_glow.png b/assets/minecraft/textures/block/repeater_glow.png similarity index 100% rename from assets/minecraft/textures/blocks/repeater_glow.png rename to assets/minecraft/textures/block/repeater_glow.png diff --git a/assets/minecraft/textures/blocks/repeater_glow.png.mcmeta b/assets/minecraft/textures/block/repeater_glow.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from assets/minecraft/textures/blocks/repeater_glow.png.mcmeta rename to assets/minecraft/textures/block/repeater_glow.png.mcmeta diff --git a/assets/minecraft/textures/blocks/sand.png.mcmeta b/assets/minecraft/textures/block/sand.png.mcmeta old mode 100755 new mode 100644 similarity index 89% rename from assets/minecraft/textures/blocks/sand.png.mcmeta rename to assets/minecraft/textures/block/sand.png.mcmeta index 46cca26..4726445 --- a/assets/minecraft/textures/blocks/sand.png.mcmeta +++ b/assets/minecraft/textures/block/sand.png.mcmeta @@ -3,7 +3,7 @@ "ctm_version": 1, "type": "EDGES_FULL", "textures": [ - "blocks/sand_damp" + "block/sand_damp" ], "extra": { "connect_to": [ diff --git a/assets/minecraft/textures/blocks/sand_damp.png b/assets/minecraft/textures/block/sand_damp.png similarity index 100% rename from assets/minecraft/textures/blocks/sand_damp.png rename to assets/minecraft/textures/block/sand_damp.png diff --git a/assets/minecraft/textures/blocks/sponge_wet.png.mcmeta b/assets/minecraft/textures/block/sponge_wet.png.mcmeta old mode 100755 new mode 100644 similarity index 84% rename from assets/minecraft/textures/blocks/sponge_wet.png.mcmeta rename to assets/minecraft/textures/block/sponge_wet.png.mcmeta index 662d330..8edb8b4 --- a/assets/minecraft/textures/blocks/sponge_wet.png.mcmeta +++ b/assets/minecraft/textures/block/sponge_wet.png.mcmeta @@ -4,7 +4,7 @@ "ctm_version": 1, "type":"CTM", "textures":[ - "minecraft:blocks/sponge_wet_ctm" + "minecraft:block/sponge_wet_ctm" ] } } diff --git a/assets/minecraft/textures/blocks/sponge_wet_ctm.png b/assets/minecraft/textures/block/sponge_wet_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/sponge_wet_ctm.png rename to assets/minecraft/textures/block/sponge_wet_ctm.png diff --git a/assets/minecraft/textures/block/white_stained_glass.png.mcmeta b/assets/minecraft/textures/block/white_stained_glass.png.mcmeta new file mode 100644 index 0000000..11905a3 --- /dev/null +++ b/assets/minecraft/textures/block/white_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/white_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_white_ctm.png b/assets/minecraft/textures/block/white_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_white_ctm.png rename to assets/minecraft/textures/block/white_stained_glass_ctm.png diff --git a/assets/minecraft/textures/block/yellow_stained_glass.png.mcmeta b/assets/minecraft/textures/block/yellow_stained_glass.png.mcmeta new file mode 100644 index 0000000..e726b4f --- /dev/null +++ b/assets/minecraft/textures/block/yellow_stained_glass.png.mcmeta @@ -0,0 +1,11 @@ +{ + "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "layer":"TRANSLUCENT", + "textures":[ + "minecraft:block/yellow_stained_glass_ctm" + ] + } +} diff --git a/assets/minecraft/textures/blocks/glass_yellow_ctm.png b/assets/minecraft/textures/block/yellow_stained_glass_ctm.png similarity index 100% rename from assets/minecraft/textures/blocks/glass_yellow_ctm.png rename to assets/minecraft/textures/block/yellow_stained_glass_ctm.png diff --git a/assets/minecraft/textures/blocks/glass_gray.png.mcmeta b/assets/minecraft/textures/blocks/glass_gray.png.mcmeta deleted file mode 100755 index 11a1a49..0000000 --- a/assets/minecraft/textures/blocks/glass_gray.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_gray_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_green.png.mcmeta b/assets/minecraft/textures/blocks/glass_green.png.mcmeta deleted file mode 100755 index 3193014..0000000 --- a/assets/minecraft/textures/blocks/glass_green.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_green_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_light_blue.png.mcmeta b/assets/minecraft/textures/blocks/glass_light_blue.png.mcmeta deleted file mode 100755 index d3a6353..0000000 --- a/assets/minecraft/textures/blocks/glass_light_blue.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_light_blue_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_lime.png.mcmeta b/assets/minecraft/textures/blocks/glass_lime.png.mcmeta deleted file mode 100755 index 7db7e89..0000000 --- a/assets/minecraft/textures/blocks/glass_lime.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_lime_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_magenta.png.mcmeta b/assets/minecraft/textures/blocks/glass_magenta.png.mcmeta deleted file mode 100755 index 718fa4d..0000000 --- a/assets/minecraft/textures/blocks/glass_magenta.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_magenta_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_orange.png.mcmeta b/assets/minecraft/textures/blocks/glass_orange.png.mcmeta deleted file mode 100755 index 4224f2c..0000000 --- a/assets/minecraft/textures/blocks/glass_orange.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_orange_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_pink.png.mcmeta b/assets/minecraft/textures/blocks/glass_pink.png.mcmeta deleted file mode 100755 index 9eaf5ab..0000000 --- a/assets/minecraft/textures/blocks/glass_pink.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_pink_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_purple.png.mcmeta b/assets/minecraft/textures/blocks/glass_purple.png.mcmeta deleted file mode 100755 index e6fce16..0000000 --- a/assets/minecraft/textures/blocks/glass_purple.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_purple_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_red.png.mcmeta b/assets/minecraft/textures/blocks/glass_red.png.mcmeta deleted file mode 100755 index 05c65a2..0000000 --- a/assets/minecraft/textures/blocks/glass_red.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_red_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_silver.png.mcmeta b/assets/minecraft/textures/blocks/glass_silver.png.mcmeta deleted file mode 100755 index 97b8ce5..0000000 --- a/assets/minecraft/textures/blocks/glass_silver.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_silver_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_white.png.mcmeta b/assets/minecraft/textures/blocks/glass_white.png.mcmeta deleted file mode 100755 index e339d5c..0000000 --- a/assets/minecraft/textures/blocks/glass_white.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_white_ctm" - ] - } -} diff --git a/assets/minecraft/textures/blocks/glass_yellow.png.mcmeta b/assets/minecraft/textures/blocks/glass_yellow.png.mcmeta deleted file mode 100755 index 28c52e1..0000000 --- a/assets/minecraft/textures/blocks/glass_yellow.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "__comment": "We will have a ctm_version to indicate the version that the json is built for. We will most likely not need it, but who knows? -D ", - "ctm":{ - "ctm_version": 1, - "type":"CTM", - "layer":"TRANSLUCENT", - "textures":[ - "minecraft:blocks/glass_yellow_ctm" - ] - } -} diff --git a/assets/soulshardstow/blockstates/BlockCage.json b/assets/soulshardstow/blockstates/BlockCage.json old mode 100755 new mode 100644 diff --git a/assets/soulshardstow/models/block/cage_glow.json b/assets/soulshardstow/models/block/cage_glow.json old mode 100755 new mode 100644 diff --git a/assets/soulshardstow/textures/blocks/face.png.mcmeta b/assets/soulshardstow/textures/blocks/face.png.mcmeta old mode 100755 new mode 100644 diff --git a/assets/soulshardstow/textures/blocks/skull.png.mcmeta b/assets/soulshardstow/textures/blocks/skull.png.mcmeta old mode 100755 new mode 100644 diff --git a/pack.mcmeta b/pack.mcmeta old mode 100755 new mode 100644 index d232389..0b7c1e8 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 2, + "pack_format": 6, "description": "Adds CTM to Vanilla Blocks plus some Modded Blocks!" } -} \ No newline at end of file +}