aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-01-30 09:57:25 +0100
committerGitHub <noreply@github.com>2022-01-30 09:57:25 +0100
commit69834eef41c6cb12d69b1963603f7426e0736682 (patch)
tree4b3e3887be059a2e3373a89e7aa8ffa996478a05 /src/main/resources/assets
parent8cc0619706f93b4e81fb930ec7fb85cdcbd5d734 (diff)
parent1d983706ef427b1d008787843ac23529e43cc659 (diff)
downloadGT5-Unofficial-69834eef41c6cb12d69b1963603f7426e0736682.tar.gz
GT5-Unofficial-69834eef41c6cb12d69b1963603f7426e0736682.tar.bz2
GT5-Unofficial-69834eef41c6cb12d69b1963603f7426e0736682.zip
Merge pull request #102 from GTNewHorizons/St00f
St00f
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r--src/main/resources/assets/miscutils/lang/en_US.lang9
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.pngbin0 -> 209 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.pngbin0 -> 547 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.pngbin0 -> 782 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.pngbin0 -> 701 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.pngbin0 -> 925 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/magicfeather.pngbin0 -> 324 bytes
7 files changed, 8 insertions, 1 deletions
diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang
index b0e0741159..505a52d4e8 100644
--- a/src/main/resources/assets/miscutils/lang/en_US.lang
+++ b/src/main/resources/assets/miscutils/lang/en_US.lang
@@ -3376,4 +3376,11 @@ item.BasicGenericChemItem.13.name=Formaldehyde Catalyst
item.hydrogenchloridemix.name=Hydrogen Chlorine Mix
//Added 19/01/22
-item.SunnariumBit.name=Sunnarium Bit \ No newline at end of file
+item.SunnariumBit.name=Sunnarium Bit
+
+//Added 29/01/22
+sleep.event.okay=You slept well and now feel a little better.
+sleep.event.good=You slept well and now feel much better.
+sleep.event.wellrested=You feel really well rested.
+sleep.event.downsides=The downsides of life no longer effect you.
+item.miscutils:magicfeather.name=Magical Feather \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png
new file mode 100644
index 0000000000..87b1b2b7d3
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png
new file mode 100644
index 0000000000..631045a936
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png
new file mode 100644
index 0000000000..e987c60374
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png
new file mode 100644
index 0000000000..67965b0c01
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png
new file mode 100644
index 0000000000..c587e84b78
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/magicfeather.png b/src/main/resources/assets/miscutils/textures/items/magicfeather.png
new file mode 100644
index 0000000000..634529b925
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/magicfeather.png
Binary files differ