summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-12-24 13:39:55 +0100
committerRobert Sosnitzka <robert.sosnitzka@gmail.com>2016-12-24 13:39:55 +0100
commiteabc1ffe8c81b57d07e3a1ef7fb07b646f032e96 (patch)
treef87cda27892373f86b3b2013f5c267f1782d20d9 /src/main/resources
parente539e506c30b7a2767796ecb76b61ae1a89189d4 (diff)
Added missing json files, fixed some coloring and spelling issues
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/taiga/blockstates/fluid_block.json7
-rw-r--r--src/main/resources/assets/taiga/lang/en_US.lang4
-rw-r--r--src/main/resources/assets/taiga/models/item/jauxum_dust.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/jauxum_ingot.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/jauxum_nugget.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/ovium_dust.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/ovium_ingot.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/ovium_nugget.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/terrax_dust.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/terrax_ingot.json6
-rw-r--r--src/main/resources/assets/taiga/models/item/terrax_nugget.json6
11 files changed, 56 insertions, 9 deletions
diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json
index 8ea98d9..475cd6f 100644
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -144,13 +144,6 @@
}
}
],
- "tiberiumX_fluid": [
- {
- "custom": {
- "fluid": "tiberiumX_fluid"
- }
- }
- ],
"fractum_fluid": [
{
"custom": {
diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang
index 5c1eba5..42636a2 100644
--- a/src/main/resources/assets/taiga/lang/en_US.lang
+++ b/src/main/resources/assets/taiga/lang/en_US.lang
@@ -313,13 +313,13 @@ modifier.heroic.desc=§oUntil you'll die.§r\nWhen the end is near, you grow str
modifier.hollow.name=Hollow
modifier.hollow.desc=§oBraindead!§r\nMakes your enemies brainless.
modifier.instable.name=Unstable
-modifier.instable.desc=§oCan you feel this?§r\nSeriously, this ist completely unstable! Expect explosions!
+modifier.instable.desc=§oCan you feel this?§r\nSeriously, this is completely unstable! Expect explosions!
modifier.naturebound.name=Naturebound
modifier.naturebound.desc=§oYou are one with your surrounding!§r\nRepairs the tool on several blocks.
modifier.pulverizing.name=Pulverizing
modifier.pulverizing.desc=§oSmash it!§r\nDestroy a lot of your drops.
modifier.resonance.name=Resonance
-modifier.resonance.desc=§oFeel the vibrations!§r\Enemies propably fly away after a hit!
+modifier.resonance.desc=§oFeel the vibrations!§r\nEnemies propably fly away after a hit!
modifier.slaughtering.name=Slaughtering
modifier.slaughtering.desc=§oYum yum!§r\nWho needs EXP if you can have a lot more meat?
modifier.softy.name=Softy
diff --git a/src/main/resources/assets/taiga/models/item/jauxum_dust.json b/src/main/resources/assets/taiga/models/item/jauxum_dust.json
new file mode 100644
index 0000000..2b3cf34
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/jauxum_dust.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/dust/jauxum"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/jauxum_ingot.json b/src/main/resources/assets/taiga/models/item/jauxum_ingot.json
new file mode 100644
index 0000000..b6fcb4f
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/jauxum_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/ingot/jauxum"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/jauxum_nugget.json b/src/main/resources/assets/taiga/models/item/jauxum_nugget.json
new file mode 100644
index 0000000..ff21b99
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/jauxum_nugget.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/nugget/jauxum"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ovium_dust.json b/src/main/resources/assets/taiga/models/item/ovium_dust.json
new file mode 100644
index 0000000..1db4511
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ovium_dust.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/dust/ovium"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ovium_ingot.json b/src/main/resources/assets/taiga/models/item/ovium_ingot.json
new file mode 100644
index 0000000..ccad8f3
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ovium_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/ingot/ovium"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ovium_nugget.json b/src/main/resources/assets/taiga/models/item/ovium_nugget.json
new file mode 100644
index 0000000..85a9edb
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ovium_nugget.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/nugget/ovium"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/terrax_dust.json b/src/main/resources/assets/taiga/models/item/terrax_dust.json
new file mode 100644
index 0000000..2675ed5
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/terrax_dust.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/dust/terrax"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/terrax_ingot.json b/src/main/resources/assets/taiga/models/item/terrax_ingot.json
new file mode 100644
index 0000000..795c4d4
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/terrax_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/ingot/terrax"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/terrax_nugget.json b/src/main/resources/assets/taiga/models/item/terrax_nugget.json
new file mode 100644
index 0000000..e15ce06
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/terrax_nugget.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "taiga:items/nugget/terrax"
+ }
+} \ No newline at end of file