diff options
Diffstat (limited to 'src/resources')
26 files changed, 45 insertions, 5 deletions
diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png Binary files differnew file mode 100644 index 0000000000..a669575ce1 --- /dev/null +++ b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png Binary files differnew file mode 100644 index 0000000000..7ed8d56b0e --- /dev/null +++ b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png Binary files differnew file mode 100644 index 0000000000..ccbea96e0c --- /dev/null +++ b/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png diff --git a/src/resources/assets/ic2/lang/en_US.lang b/src/resources/assets/ic2/lang/en_US.lang index 3fb59885d4..9b44f2d14e 100644 --- a/src/resources/assets/ic2/lang/en_US.lang +++ b/src/resources/assets/ic2/lang/en_US.lang @@ -27,3 +27,9 @@ ic2.SulfuricLithium=Sulfuric Lithium Cell ic2.UraniumHexaFluoride=Uranium Hexafluoride Cell ic2.ThoriumTetraFluoride=Thorium Tetrafluoride Cell ic2.UraniumTetraFluoride=Uranium Tetrafluoride Cell + + +ic2.itemArmorHazmatHelmetEx=Advanced Hazmat Helmet +ic2.itemArmorHazmatChestplateEx=Advanced Hazmat Suit +ic2.itemArmorHazmatLeggingsEx=Advanced Hazmat Leggings +ic2.itemArmorRubBootsEx=Advanced Hazmat Boots
\ No newline at end of file diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_1.png b/src/resources/assets/ic2/textures/armor/hazmatEx_1.png Binary files differnew file mode 100644 index 0000000000..2275007fbe --- /dev/null +++ b/src/resources/assets/ic2/textures/armor/hazmatEx_1.png diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_2.png b/src/resources/assets/ic2/textures/armor/hazmatEx_2.png Binary files differnew file mode 100644 index 0000000000..758adafdf2 --- /dev/null +++ b/src/resources/assets/ic2/textures/armor/hazmatEx_2.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png Binary files differnew file mode 100644 index 0000000000..742d1d7035 --- /dev/null +++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png Binary files differnew file mode 100644 index 0000000000..5340375595 --- /dev/null +++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png Binary files differnew file mode 100644 index 0000000000..80cdca9b23 --- /dev/null +++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png b/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png Binary files differnew file mode 100644 index 0000000000..901a8fbc35 --- /dev/null +++ b/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 8064848316..df6fbaa5b3 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3147,12 +3147,36 @@ 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
\ No newline at end of file +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 + +//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 + +//Added 13/04/20 +item.T3RecipeSelector.name=Programmed Breakthrough Circuit
\ 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 Binary files differnew file mode 100644 index 0000000000..5965bfce89 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png Binary files differnew file mode 100644 index 0000000000..110e9ee38f --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png 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 Binary files differnew file mode 100644 index 0000000000..c7b22a7ef8 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png 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 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 diff --git a/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png Binary files differnew file mode 100644 index 0000000000..8bcfa62ae4 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png 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 Binary files differnew file mode 100644 index 0000000000..b50c781c6d --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png 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 Binary files differnew file mode 100644 index 0000000000..0656c10957 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png 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 Binary files differnew file mode 100644 index 0000000000..3a32ed06fc --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png 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 Binary files differnew file mode 100644 index 0000000000..0c165f3e59 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png |
