aboutsummaryrefslogtreecommitdiff
path: root/src/resources/assets
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/assets')
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.pngbin0 -> 1013 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.pngbin0 -> 399 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.pngbin0 -> 1010 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.pngbin0 -> 398 bytes
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang57
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.pngbin0 -> 1777 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.pngbin0 -> 654 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.pngbin0 -> 416 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.pngbin0 -> 353 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.pngbin0 -> 377 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.pngbin0 -> 360 bytes
-rw-r--r--src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.pngbin0 -> 2482 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemBasicTurbine.pngbin0 -> 475 bytes
-rw-r--r--src/resources/assets/spiceoflife/lang/de_DE.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/en_US.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/es_ES.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/fr_FR.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/it_IT.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/ko_KR.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/ru_RU.lang2
-rw-r--r--src/resources/assets/spiceoflife/lang/zh_CN.lang2
-rw-r--r--src/resources/assets/spiceoflife/textures/items/foodcrate.pngbin0 -> 365 bytes
-rw-r--r--src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.pngbin0 -> 355 bytes
-rw-r--r--src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.pngbin0 -> 509 bytes
25 files changed, 72 insertions, 1 deletions
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png
new file mode 100644
index 0000000000..13b37c999d
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png
new file mode 100644
index 0000000000..3fd5382926
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png
new file mode 100644
index 0000000000..ffd9d4893b
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png
new file mode 100644
index 0000000000..a08018f561
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png
Binary files differ
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index df6fbaa5b3..ac1d849dc2 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3179,4 +3179,59 @@ 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
+item.T3RecipeSelector.name=Programmed Breakthrough Circuit
+
+//Added 03/05/20
+entity.miscutils.batKing.name=Spectral Bat
+entity.miscutils.bigChickenFriendly.name=Giant Chicken
+entity.miscutils.AusDingo.name=Dingo
+entity.miscutils.AusBoar.name=Wild Boar
+entity.miscutils.AusSpider.name=Forest Spider
+entity.miscutils.AusOctopus.name=Octopus
+container.EggBox=Egg Hatching Box
+
+//Added 24/05/20
+container.VolumetricFlaskSetter=Volumetric Flask Configurator
+
+//Added 26/05/20
+item.itemIngotLaurenium.name=Laurenium Ingot
+item.itemHotIngotLaurenium.name=Hot Laurenium Ingot
+item.itemDustLaurenium.name=Laurenium Dust
+item.itemDustTinyLaurenium.name=Tiny Pile of Laurenium Dust
+item.itemDustSmallLaurenium.name=Small Pile of Laurenium Dust
+item.itemNuggetLaurenium.name=Laurenium Nugget
+item.itemPlateLaurenium.name=Laurenium Plate
+item.itemPlateDoubleLaurenium.name=Double Laurenium Plate
+item.itemBoltLaurenium.name=Laurenium Bolt
+item.itemRodLaurenium.name=Laurenium Rod
+item.itemRodLongLaurenium.name=Long Laurenium Rod
+item.itemRingLaurenium.name=Laurenium Ring
+item.itemScrewLaurenium.name=Laurenium Screw
+item.itemRotorLaurenium.name=Laurenium Rotor
+item.itemGearLaurenium.name=Laurenium Gear
+item.itemCellLaurenium.name=Laurenium Cell
+tile.Block of Laurenium.name=Block of Laurenium
+tile.Laurenium Frame Box.name=Laurenium Frame Box
+item.itemIngotBotmium.name=Botmium Ingot
+item.itemHotIngotBotmium.name=Hot Botmium Ingot
+item.itemDustBotmium.name=Botmium Dust
+item.itemDustTinyBotmium.name=Tiny Pile of Botmium Dust
+item.itemDustSmallBotmium.name=Small Pile of Botmium Dust
+item.itemNuggetBotmium.name=Botmium Nugget
+item.itemPlateBotmium.name=Botmium Plate
+item.itemPlateDoubleBotmium.name=Double Botmium Plate
+item.itemBoltBotmium.name=Botmium Bolt
+item.itemRodBotmium.name=Botmium Rod
+item.itemRodLongBotmium.name=Long Botmium Rod
+item.itemRingBotmium.name=Botmium Ring
+item.itemScrewBotmium.name=Botmium Screw
+item.itemRotorBotmium.name=Botmium Rotor
+item.itemGearBotmium.name=Botmium Gear
+item.itemCellBotmium.name=Botmium Cell
+tile.Block of Botmium.name=Block of Botmium
+tile.Botmium Frame Box.name=Botmium Frame Box
+
+//Added 29/05/20
+item.itemBasicTurbine.name=Basic Turbine
+item.itemBasicTurbine_0.name=Basic Iron Turbine
+item.itemBasicTurbine_1.name=Basic Bronze Turbine \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png
new file mode 100644
index 0000000000..787572ea3b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png
new file mode 100644
index 0000000000..771fef125a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png
new file mode 100644
index 0000000000..d766cc9f3f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png
new file mode 100644
index 0000000000..02bd653538
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png
new file mode 100644
index 0000000000..8b5f405322
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png
new file mode 100644
index 0000000000..2424eef68f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png
new file mode 100644
index 0000000000..0cf3f40762
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png b/src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png
new file mode 100644
index 0000000000..08f9761233
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemBasicTurbine.png b/src/resources/assets/miscutils/textures/items/itemBasicTurbine.png
new file mode 100644
index 0000000000..62de905fb9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemBasicTurbine.png
Binary files differ
diff --git a/src/resources/assets/spiceoflife/lang/de_DE.lang b/src/resources/assets/spiceoflife/lang/de_DE.lang
new file mode 100644
index 0000000000..63ad1e2a98
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/de_DE.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Voedselkrat \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/en_US.lang b/src/resources/assets/spiceoflife/lang/en_US.lang
new file mode 100644
index 0000000000..bf16f4dc93
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/en_US.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Food Crate \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/es_ES.lang b/src/resources/assets/spiceoflife/lang/es_ES.lang
new file mode 100644
index 0000000000..02fe4c8806
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/es_ES.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Caja de comida \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/fr_FR.lang b/src/resources/assets/spiceoflife/lang/fr_FR.lang
new file mode 100644
index 0000000000..418c2b7053
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/fr_FR.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Caisse alimentaire \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/it_IT.lang b/src/resources/assets/spiceoflife/lang/it_IT.lang
new file mode 100644
index 0000000000..841b97c63f
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/it_IT.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Cassa Alimentare \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/ko_KR.lang b/src/resources/assets/spiceoflife/lang/ko_KR.lang
new file mode 100644
index 0000000000..7e9973e936
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/ko_KR.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=음식 상자 \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/ru_RU.lang b/src/resources/assets/spiceoflife/lang/ru_RU.lang
new file mode 100644
index 0000000000..e167a0ae03
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/ru_RU.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=Продовольственный ящик \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/lang/zh_CN.lang b/src/resources/assets/spiceoflife/lang/zh_CN.lang
new file mode 100644
index 0000000000..bb211e7b57
--- /dev/null
+++ b/src/resources/assets/spiceoflife/lang/zh_CN.lang
@@ -0,0 +1,2 @@
+# Items
+item.spiceoflife.foodcrate.name=食品箱 \ No newline at end of file
diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate.png b/src/resources/assets/spiceoflife/textures/items/foodcrate.png
new file mode 100644
index 0000000000..b717dd0318
--- /dev/null
+++ b/src/resources/assets/spiceoflife/textures/items/foodcrate.png
Binary files differ
diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png b/src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png
new file mode 100644
index 0000000000..4dbfd54ea7
--- /dev/null
+++ b/src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png
Binary files differ
diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png b/src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png
new file mode 100644
index 0000000000..0284bd29ad
--- /dev/null
+++ b/src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png
Binary files differ