From 2c4a94b808c61d66163d9969017c2819ddb2c5ae Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 31 Mar 2020 16:35:15 +0100 Subject: + 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. --- src/resources/assets/miscutils/lang/en_US.lang | 8 ++++++-- .../textures/blocks/trees/leaves/leaves_pine.png | Bin 0 -> 688 bytes .../textures/blocks/trees/leaves/leaves_pine_opaque .png | Bin 0 -> 687 bytes .../textures/blocks/trees/saplings/sapling_pine.png | Bin 0 -> 432 bytes .../miscutils/textures/items/bioscience/MetaItem1/24.png | Bin 0 -> 357 bytes .../miscutils/textures/items/bioscience/MetaItem1/25.png | Bin 0 -> 648 bytes 6 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png create mode 100644 src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png create mode 100644 src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png create mode 100644 src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png create mode 100644 src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png (limited to 'src/resources') 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 new file mode 100644 index 0000000000..68949e5f47 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png differ 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 new file mode 100644 index 0000000000..c7c0d6492f Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png differ 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 new file mode 100644 index 0000000000..f4c3ca84ac Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png differ diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png new file mode 100644 index 0000000000..0c065db4ce Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png differ diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png new file mode 100644 index 0000000000..168b15adb3 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png differ -- cgit