diff options
Diffstat (limited to 'src/main/resources')
12 files changed, 102 insertions, 3 deletions
diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 20fbe16..8ea98d9 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -88,6 +88,27 @@ } } ], + "jauxum_fluid": [ + { + "custom": { + "fluid": "jauxum_fluid" + } + } + ], + "ovium_fluid": [ + { + "custom": { + "fluid": "ovium_fluid" + } + } + ], + "terrax_fluid": [ + { + "custom": { + "fluid": "terrax_fluid" + } + } + ], "palladium_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_block.json index 07ba243..6df85dc 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/jauxum_block.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesinediorite" + "all": "taiga:blocks/block/jauxum" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json index 534c33e..846b091 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesinegranite" + "all": "taiga:blocks/ore/jauxum" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_block.json index bd66801..4052bcc 100644 --- a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json +++ b/src/main/resources/assets/taiga/blockstates/ovium_block.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:cube_all", "textures": { - "all": "taiga:blocks/ore/karmesineandensite" + "all": "taiga:blocks/block/ovium" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/taiga/blockstates/ovium_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_ore.json new file mode 100644 index 0000000..1c36838 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/ovium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/ovium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/terrax_block.json b/src/main/resources/assets/taiga/blockstates/terrax_block.json new file mode 100644 index 0000000..5bd661d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/terrax_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/terrax" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index eacf957..b96f169 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -6,6 +6,9 @@ material.duranite.name=Duranite material.valyrium.name=Valyrium material.vibranium.name=Vibranium material.karmesine.name=Karmesine +material.jauxum.name=Jauxum +material.ovium.name=Ovium +material.terrax.name=Terrax material.palladium.name=Palladium material.uru.name=Uru material.osram.name=Osram @@ -42,6 +45,9 @@ tile.duranite_block.name=Duranite Block tile.valyrium_block.name=Valyrium Block tile.vibranium_block.name=Vibranium Block tile.karmesine_block.name=Karmesine Block +tile.jauxum_block.name=Jauxum Block +tile.ovium_block.name=Ovium Block +tile.terrax_block.name=Terrax Block tile.palladium_block.name=Palladium Block tile.uru_block.name=Uru Block tile.osram_block.name=Osram Block @@ -78,6 +84,9 @@ tile.duranite_ore.name=Duranite Erz tile.valyrium_ore.name=Valyrium Erz tile.vibranium_ore.name=Vibranium Erz tile.karmesine_ore.name=Karmesine Erz +tile.jauxum_ore.name=Jauxum Erz +tile.ovium_ore.name=Ovium Erz +tile.terrax_ore.name=Terrax Erz tile.palladium_ore.name=Palladium Erz tile.uru_ore.name=Uru Erz tile.osram_ore.name=Osram Erz @@ -114,6 +123,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget +tile.jauxum_nugget.name=Jauxum Nugget +tile.ovium_nugget.name=Ovium Nugget +tile.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -150,6 +162,9 @@ item.duranite_dust.name=Duranite Staub item.valyrium_dust.name=Valyrium Staub item.vibranium_dust.name=Vibranium Staub item.karmesine_dust.name=Karmesine Staub +tile.jauxum_dust.name=Jauxum Staub +tile.ovium_dust.name=Ovium Staub +tile.terrax_dust.name=Terrax Staub item.palladium_dust.name=Palladium Staub item.uru_dust.name=Uru Staub item.osram_dust.name=Osram Staub @@ -186,6 +201,9 @@ item.duranite_ingot.name=Duranite Barren item.valyrium_ingot.name=Valyrium Barren item.vibranium_ingot.name=Vibranium Barren item.karmesine_ingot.name=Karmesine Barren +tile.jauxum_ingot.name=Jauxum Barren +tile.ovium_ingot.name=Ovium Barren +tile.terrax_ingot.name=Terrax Barren item.palladium_ingot.name=Palladium Barren item.uru_ingot.name=Uru Barren item.osram_ingot.name=Osram Barren @@ -222,6 +240,9 @@ fluid.tconstruct.duranite_fluid.name=Duranite Fluid fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid +fluid.tconstruct.jauxum_fluid.name=Jauxum Fluid +fluid.tconstruct.ovium_fluid.name=Ovium Fluid +fluid.tconstruct.terrax_fluid.name=Terrax Fluid fluid.tconstruct.palladium_fluid.name=Palladium Fluid fluid.tconstruct.uru_fluid.name=Uru Fluid fluid.tconstruct.osram_fluid.name=Osram Fluid diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 557c5af..75cc117 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -6,6 +6,9 @@ material.duranite.name=Duranite material.valyrium.name=Valyrium material.vibranium.name=Vibranium material.karmesine.name=Karmesine +material.jauxum.name=Jauxum +material.ovium.name=Ovium +material.terrax.name=Terrax material.palladium.name=Palladium material.uru.name=Uru material.osram.name=Osram @@ -42,6 +45,9 @@ tile.duranite_block.name=Duranite Block tile.valyrium_block.name=Valyrium Block tile.vibranium_block.name=Vibranium Block tile.karmesine_block.name=Karmesine Block +tile.jauxum_block.name=Jauxum Block +tile.ovium_block.name=Ovium Block +tile.terrax_block.name=Terrax Block tile.palladium_block.name=Palladium Block tile.uru_block.name=Uru Block tile.osram_block.name=Osram Block @@ -78,6 +84,9 @@ tile.duranite_ore.name=Duranite Ore tile.valyrium_ore.name=Valyrium Ore tile.vibranium_ore.name=Vibranium Ore tile.karmesine_ore.name=Karmesine Ore +tile.jauxum_ore.name=Jauxum Ore +tile.ovium_ore.name=Ovium Ore +tile.terrax_ore.name=Terrax Ore tile.palladium_ore.name=Palladium Ore tile.uru_ore.name=Uru Ore tile.osram_ore.name=Osram Ore @@ -114,6 +123,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget +tile.jauxum_nugget.name=Jauxum Nugget +tile.ovium_nugget.name=Ovium Nugget +tile.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -150,6 +162,9 @@ item.duranite_dust.name=Duranite Dust item.valyrium_dust.name=Valyrium Dust item.vibranium_dust.name=Vibranium Dust item.karmesine_dust.name=Karmesine Dust +tile.jauxum_dust.name=Jauxum Dust +tile.ovium_dust.name=Ovium Dust +tile.terrax_dust.name=Terrax Dust item.palladium_dust.name=Palladium Dust item.uru_dust.name=Uru Dust item.osram_dust.name=Osram Dust @@ -186,6 +201,9 @@ item.duranite_ingot.name=Duranite Ingot item.valyrium_ingot.name=Valyrium Ingot item.vibranium_ingot.name=Vibranium Ingot item.karmesine_ingot.name=Karmesine Ingot +tile.jauxum_ingot.name=Jauxum Ingot +tile.ovium_ingot.name=Ovium Ingot +tile.terrax_ingot.name=Terrax Ingot item.palladium_ingot.name=Palladium Ingot item.uru_ingot.name=Uru Ingot item.osram_ingot.name=Osram Ingot @@ -222,6 +240,9 @@ fluid.tconstruct.duranite_fluid.name=Duranite Fluid fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid +fluid.tconstruct.jauxum_fluid.name=Jauxum Fluid +fluid.tconstruct.ovium_fluid.name=Ovium Fluid +fluid.tconstruct.terrax_fluid.name=Terrax Fluid fluid.tconstruct.palladium_fluid.name=Palladium Fluid fluid.tconstruct.uru_fluid.name=Uru Fluid fluid.tconstruct.osram_fluid.name=Osram Fluid diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png Binary files differindex 7e4d7c2..811c9f0 100644 --- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png +++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png Binary files differdeleted file mode 100644 index 7e4d7c2..0000000 --- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png +++ /dev/null diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png Binary files differdeleted file mode 100644 index 4f14e7a..0000000 --- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png +++ /dev/null diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png Binary files differdeleted file mode 100644 index 9b42d38..0000000 --- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png +++ /dev/null |
