From 0908735fc15396f8313d7643e952c1f9ce124d53 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 31 Mar 2020 12:33:16 +0100 Subject: + Added Carbon Disulfide. + Added Hydrogen Sulfide if it doesn't exist. + Added Sodium Ethoxide. + Added Potassium Hydroxide. + Added Sodium Ethyl Xanthate. + Added Potassium Ethyl Xanthate. + Added Base work for Froth Flotation Multi. --- src/resources/assets/miscutils/lang/en_US.lang | 11 ++++++++++- .../blocks/TileEntities/MACHINE_CASING_FLOTATION.png | Bin 0 -> 647 bytes .../textures/items/science/general/MetaItem1/10.png | Bin 0 -> 328 bytes .../textures/items/science/general/MetaItem1/11.png | Bin 0 -> 339 bytes .../textures/items/science/general/MetaItem1/12.png | Bin 0 -> 320 bytes .../textures/items/science/general/MetaItem1/9.png | Bin 0 -> 340 bytes 6 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 8064848316..fd8e59662b 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3155,4 +3155,13 @@ item.FrothZincflotation.name=Sphalerite Flotation Froth Cell item.FrothCopperflotation.name=Chalcopyrite Flotation Froth Cell item.FrothNickelflotation.name=Nickel Flotation Froth Cell item.FrothPlatinumflotation.name=Platinum Flotation Froth Cell -item.FrothPentlanditeflotation.name=Pentlandite Flotation Froth Cell \ No newline at end of file +item.FrothPentlanditeflotation.name=Pentlandite Flotation Froth Cell + + +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 diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png new file mode 100644 index 0000000000..5965bfce89 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png differ diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png new file mode 100644 index 0000000000..b50c781c6d Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png differ diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png new file mode 100644 index 0000000000..0656c10957 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png differ diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png new file mode 100644 index 0000000000..3a32ed06fc Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png differ diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png new file mode 100644 index 0000000000..0c165f3e59 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png differ -- cgit 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/assets/miscutils') 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 From acf7193504fba4a7165d2ba5732cc9ce5f35ec55 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 4 Apr 2020 16:57:56 +0100 Subject: + Added a new base bus type. + Added the Ball Housing bus. + Added the Catalyst Housing bus. + Added the Reinforced Engine Casing. + Made the Flotation Cell Regulator actually load. $ Fixed Tooltips on Milling Balls & Catalysts. $ Added improved item handling for Milling Balls. $ Added improved item handling for Catalysts. --- .../textures/blocks/iconsets/OVERLAY_CATALYSTS.png | Bin 0 -> 1371 bytes .../blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta | 5 +++++ .../blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png | Bin 0 -> 1652 bytes .../blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta | 5 +++++ 4 files changed, 10 insertions(+) create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png new file mode 100644 index 0000000000..110e9ee38f Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta new file mode 100644 index 0000000000..24f863c95e --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":3 + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png new file mode 100644 index 0000000000..c7b22a7ef8 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta new file mode 100644 index 0000000000..5d86d73ad2 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":5 + } +} \ No newline at end of file -- cgit From 59887a8c72f8f9e7d2679d33bfa49b563a920298 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 11 Apr 2020 22:57:17 +0100 Subject: + Added some localization for the new milling products. --- src/resources/assets/miscutils/lang/en_US.lang | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 0dc4b4e170..cb477971ac 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3147,25 +3147,33 @@ item.milledSphalerite.name=Milled Sphalerite item.milledNickel.name=Milled Nickel item.milledPlatinum.name=Milled Platinum item.milledPentlandite.name=Milled Pentlandite - -item.BasicGenericChemItem.7.name=Alumina Milling Ball -item.BasicGenericChemItem.8.name=Soapstone Milling Ball - item.FrothZincflotation.name=Sphalerite Flotation Froth Cell item.FrothCopperflotation.name=Chalcopyrite Flotation Froth Cell item.FrothNickelflotation.name=Nickel Flotation Froth Cell item.FrothPlatinumflotation.name=Platinum Flotation Froth Cell item.FrothPentlanditeflotation.name=Pentlandite Flotation Froth Cell +item.BasicGenericChemItem.7.name=Alumina Milling Ball +item.BasicGenericChemItem.8.name=Soapstone Milling Ball //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 - item.BasicAgrichemItem.24.name=Pinecone item.BasicAgrichemItem.25.name=Crushed Pine Materials -item.pineoil.name=Pine Oil Cell \ No newline at end of file +item.pineoil.name=Pine Oil Cell + +//Added 11/4/20 +item.milledRedstone.name=Milled Redstone +item.milledSpessartine.name=Milled Spessartine +item.milledGrossular.name=Milled Grossular +item.milledAlmandine.name=Milled Almandine +item.milledPyrope.name=Milled Pyrope +item.FrothRedstoneflotation.name=Redstone Flotation Froth Cell +item.FrothSpessartineflotation.name=Spessartine Flotation Froth Cell +item.FrothGrossularflotation.name=Grossular Flotation Froth Cell +item.FrothAlmandineflotation.name=Almandine Flotation Froth Cell +item.FrothPyropeflotation.name=Pyrope Flotation Froth Cell \ No newline at end of file -- cgit From 492aa5becc6c49cc3afde8c855b5bbcdc5055e51 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 14 Apr 2020 00:05:16 +0100 Subject: + Added an Advanced Hazmat Suit. + Added a T3 circuit for recipe selections. $ Disabled TT Thaumic Repairer patch. $ Fixed a bug in EnumUtils not correctly handling missing entries. --- src/resources/assets/miscutils/lang/en_US.lang | 5 ++++- .../textures/items/science/general/AdvancedCircuit.png | Bin 0 -> 515 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index cb477971ac..df6fbaa5b3 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3176,4 +3176,7 @@ item.FrothRedstoneflotation.name=Redstone Flotation Froth Cell item.FrothSpessartineflotation.name=Spessartine Flotation Froth Cell item.FrothGrossularflotation.name=Grossular Flotation Froth Cell item.FrothAlmandineflotation.name=Almandine Flotation Froth Cell -item.FrothPyropeflotation.name=Pyrope Flotation Froth Cell \ No newline at end of file +item.FrothPyropeflotation.name=Pyrope Flotation Froth Cell + +//Added 13/04/20 +item.T3RecipeSelector.name=Programmed Breakthrough Circuit \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png new file mode 100644 index 0000000000..8bcfa62ae4 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png differ -- cgit