summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorRobert Sosnitzka <robert.sosnitzka@gmail.com>2017-01-14 08:20:27 +0100
committerRobert Sosnitzka <robert.sosnitzka@gmail.com>2017-01-14 08:20:27 +0100
commit251e1d9d78150392807fd753e9ea3d2dfa48bb72 (patch)
tree9e78d74bba39987dbe506c4de7b56291d4cfaed5 /src/main/resources
parente24a8390ecf9bf8b14b4d8b14cab2871ed33b2b1 (diff)
Fixed pissble crash by adding missing texture. Changed texture path for book images.
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json2
-rw-r--r--src/main/resources/assets/taiga/book/de_DE/taiga/intro.json2
-rw-r--r--src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json2
-rw-r--r--src/main/resources/assets/taiga/textures/gui/book/logo.pngbin57158 -> 44669 bytes
-rw-r--r--src/main/resources/assets/taiga/textures/gui/book/ores.pngbin0 -> 825221 bytes
-rw-r--r--src/main/resources/assets/taiga/textures/gui/logo_s.pngbin0 -> 33396 bytes
-rw-r--r--src/main/resources/assets/taiga/textures/logo.pngbin44669 -> 0 bytes
7 files changed, 3 insertions, 3 deletions
diff --git a/src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json b/src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json
index 4b412a4..d068a9b 100644
--- a/src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json
+++ b/src/main/resources/assets/taiga/book/de_DE/taiga/firstwords.json
@@ -1,7 +1,7 @@
{
"title": "Neue Erze",
"image": {
- "file": "taiga:textures/book/ores.png"
+ "file": "taiga:textures/gui/book/ores.png"
},
"text": [
{
diff --git a/src/main/resources/assets/taiga/book/de_DE/taiga/intro.json b/src/main/resources/assets/taiga/book/de_DE/taiga/intro.json
index de3c623..f40f8ec 100644
--- a/src/main/resources/assets/taiga/book/de_DE/taiga/intro.json
+++ b/src/main/resources/assets/taiga/book/de_DE/taiga/intro.json
@@ -1,7 +1,7 @@
{
"title": "TAIGA: Tinkers' Alloying Addon",
"image": {
- "file": "taiga:textures/logo.png"
+ "file": "taiga:textures/gui/book/logo.png"
},
"text": [
{
diff --git a/src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json b/src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json
index d2e77f6..1808723 100644
--- a/src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json
+++ b/src/main/resources/assets/taiga/book/en_US/taiga/firstwords.json
@@ -1,7 +1,7 @@
{
"title": "New ores",
"image": {
- "file": "taiga:textures/book/ores.png"
+ "file": "taiga:textures/gui/book/ores.png"
},
"text": [
{
diff --git a/src/main/resources/assets/taiga/textures/gui/book/logo.png b/src/main/resources/assets/taiga/textures/gui/book/logo.png
index 3ab7aaa..ef1862b 100644
--- a/src/main/resources/assets/taiga/textures/gui/book/logo.png
+++ b/src/main/resources/assets/taiga/textures/gui/book/logo.png
Binary files differ
diff --git a/src/main/resources/assets/taiga/textures/gui/book/ores.png b/src/main/resources/assets/taiga/textures/gui/book/ores.png
new file mode 100644
index 0000000..522ed80
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/gui/book/ores.png
Binary files differ
diff --git a/src/main/resources/assets/taiga/textures/gui/logo_s.png b/src/main/resources/assets/taiga/textures/gui/logo_s.png
new file mode 100644
index 0000000..8b044af
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/gui/logo_s.png
Binary files differ
diff --git a/src/main/resources/assets/taiga/textures/logo.png b/src/main/resources/assets/taiga/textures/logo.png
deleted file mode 100644
index ef1862b..0000000
--- a/src/main/resources/assets/taiga/textures/logo.png
+++ /dev/null
Binary files differ