diff options
| author | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 16:35:15 +0100 |
|---|---|---|
| committer | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 16:35:15 +0100 |
| commit | 2c4a94b808c61d66163d9969017c2819ddb2c5ae (patch) | |
| tree | 3af0f3ca11bb52b3183ef100e4dc6892a76f83e7 /src/resources/assets | |
| parent | 09b08b073aea41bfbdf189c88cc722912952ea6d (diff) | |
| download | GT5-Unofficial-2c4a94b808c61d66163d9969017c2819ddb2c5ae.tar.gz GT5-Unofficial-2c4a94b808c61d66163d9969017c2819ddb2c5ae.tar.bz2 GT5-Unofficial-2c4a94b808c61d66163d9969017c2819ddb2c5ae.zip | |
+ Added a Pine Tree.
+ Oredict BoP Pinecone if it exists.
$ Fixed Algae Farm controller recipe.
$ Fixed bug where getOrePrefixStack(rod) would return null.
$ Fixed a bug where getItemStackFromFQRN didn't work correctly.
Diffstat (limited to 'src/resources/assets')
| -rw-r--r-- | src/resources/assets/miscutils/lang/en_US.lang | 8 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png | bin | 0 -> 688 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png | bin | 0 -> 687 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png | bin | 0 -> 432 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png | bin | 0 -> 357 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png | bin | 0 -> 648 bytes |
6 files changed, 6 insertions, 2 deletions
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index fd8e59662b..0dc4b4e170 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3157,11 +3157,15 @@ item.FrothNickelflotation.name=Nickel Flotation Froth Cell item.FrothPlatinumflotation.name=Platinum Flotation Froth Cell item.FrothPentlanditeflotation.name=Pentlandite Flotation Froth Cell - +//Added 31/03/20 item.BasicGenericChemItem.9.name=Sodium Ethoxide Dust item.BasicGenericChemItem.10.name=Sodium Ethyl Xanthate Dust item.BasicGenericChemItem.11.name=Potassium Ethyl Xanthate Dust item.BasicGenericChemItem.12.name=Potassium Hydroxide Dust item.CarbonDisulfide.name=Carbon Disulfide Cell -item.HydrogenSulfide.name=Hydrogen Sulfide Cell
\ No newline at end of file +item.HydrogenSulfide.name=Hydrogen Sulfide Cell + +item.BasicAgrichemItem.24.name=Pinecone +item.BasicAgrichemItem.25.name=Crushed Pine Materials +item.pineoil.name=Pine Oil Cell
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png Binary files differnew file mode 100644 index 0000000000..68949e5f47 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png Binary files differnew file mode 100644 index 0000000000..c7c0d6492f --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png b/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png Binary files differnew file mode 100644 index 0000000000..f4c3ca84ac --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png Binary files differnew file mode 100644 index 0000000000..0c065db4ce --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png Binary files differnew file mode 100644 index 0000000000..168b15adb3 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png |
