aboutsummaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
author‭huajijam <strhuaji@gmail.com>2019-05-17 23:26:41 +0800
committer‭huajijam <strhuaji@gmail.com>2019-05-17 23:26:41 +0800
commit5920c6db3ff62d89ba41db4eda59cc6d70ddce3b (patch)
treed4d6d5036e8cb95d2232066f0ee257f59b5aa967 /src/resources
parent787c31758d2ea3259f8da9c5c7ffd4b28429eb9a (diff)
parentcacc2915ef0039e3460817e4f116d44cf8e44e5f (diff)
downloadGT5-Unofficial-5920c6db3ff62d89ba41db4eda59cc6d70ddce3b.tar.gz
GT5-Unofficial-5920c6db3ff62d89ba41db4eda59cc6d70ddce3b.tar.bz2
GT5-Unofficial-5920c6db3ff62d89ba41db4eda59cc6d70ddce3b.zip
Automatic synchronization
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang77
-rw-r--r--src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.pngbin0 -> 367 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.pngbin0 -> 608 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.pngbin0 -> 489 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.pngbin0 -> 451 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.pngbin0 -> 449 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.pngbin0 -> 463 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.pngbin0 -> 465 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.pngbin0 -> 462 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.pngbin0 -> 477 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.pngbin0 -> 461 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.pngbin0 -> 474 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.pngbin0 -> 482 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.pngbin0 -> 1326 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/1.pngbin0 -> 1327 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/2.pngbin0 -> 1335 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/3.pngbin0 -> 1340 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/4.pngbin0 -> 1306 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/5.pngbin0 -> 1302 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemFineWire.pngbin0 -> 514 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemHeavyPlate.pngbin597 -> 397 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.pngbin0 -> 471 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemSmallSpring.pngbin0 -> 317 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemSpring.pngbin0 -> 276 bytes
-rw-r--r--src/resources/mcmod.info2
25 files changed, 69 insertions, 10 deletions
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 1ddcef9c74..38188e838b 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2794,15 +2794,15 @@ item.itemPlateDoubleRunite.name=Double Runite Plate
item.itemCellRunite.name=Runite Cell
tile.Block of Runite.name=Block of Runite
-item.itemIngotDragonblood.name=Dragonblood Ingot
-item.itemDustDragonblood.name=Dragonblood Dust
-item.itemDustTinyDragonblood.name=Tiny Pile of Dragonblood Dust
-item.itemDustSmallDragonblood.name=Small Pile of Dragonblood Dust
-item.itemNuggetDragonblood.name=Dragonblood Nugget
-item.itemPlateDragonblood.name=Dragonblood Plate
-item.itemPlateDoubleDragonblood.name=Double Dragonblood Plate
+item.itemIngotDragonblood.name=Dragon Metal Ingot
+item.itemDustDragonblood.name=Dragon Metal Dust
+item.itemDustTinyDragonblood.name=Tiny Pile of Dragon Metal Dust
+item.itemDustSmallDragonblood.name=Small Pile of Dragon Metal Dust
+item.itemNuggetDragonblood.name=Shard of Dragonblood
+item.itemPlateDragonblood.name=Dragon Metal Plate
+item.itemPlateDoubleDragonblood.name=Double Dragon Metal Plate
item.itemCellDragonblood.name=Dragonblood Cell
-tile.Block of Dragonblood.name=Block of Dragonblood
+tile.Block of Dragonblood.name=Block of Dragon Metal
item.itemIngotBlackTitanium.name=Black Titanium Ingot
item.itemDustBlackTitanium.name=Black Titanium Dust
@@ -2896,4 +2896,63 @@ item.itemNuggetRhugnor.name=Rhugnor Nugget
item.itemPlateRhugnor.name=Rhugnor Plate
item.itemPlateDoubleRhugnor.name=Double Rhugnor Plate
item.itemCellRhugnor.name=Rhugnor Cell
-tile.Block of Rhugnor.name=Block of Rhugnor \ No newline at end of file
+tile.Block of Rhugnor.name=Block of Rhugnor
+
+
+
+
+//Added 13/5/19
+
+item.GTPP.BattPack.01.name=Charge Pack [LV]
+item.GTPP.BattPack.02.name=Charge Pack [MV]
+item.GTPP.BattPack.03.name=Charge Pack [HV]
+item.GTPP.BattPack.04.name=Charge Pack [EV]
+item.GTPP.BattPack.05.name=Charge Pack [IV]
+item.IndustrialDiamondExquisite.name=Exquisite Industrial Diamond
+
+item.itemSpringCelestialTungsten.name=Celestial Tungsten Spring
+item.itemSpringWhiteMetal.name=White Metal Spring
+item.itemSpringNitinol60.name=Nitinol 60 Spring
+item.itemSpringWatertightSteel.name=Watertight Steel Spring
+item.itemSpringEglinSteel.name=Eglin Steel Spring
+
+item.itemSmallSpringMaragingSteel250.name=Small Maraging Steel 250 Spring
+item.itemSmallSpringNichrome.name=Small Nichrome Spring
+item.itemSmallSpringStaballoy.name=Small Staballoy Spring
+item.itemSmallSpringBlackSteel.name=Small Black Steel Spring
+item.itemSmallSpringBlackTitanium.name=Small Black Titanium Spring
+
+item.itemFineWireWhiteMetal.name=Fine White Metal Wire
+item.itemFineWirePalladium.name=Fine Palladium Wire
+item.itemFineWireZirconium.name=Fine Zirconium Wire
+item.itemFineWireGrisium.name=Fine Grisium Wire
+item.itemFineWireBabbitAlloy.name=Fine Babbit Alloy Wire
+item.itemFineWireKoboldite.name=Fine Koboldite Wire
+item.itemFineWireHG1223.name=Fine HG-1223 Wire
+item.itemFineWireQuantum.name=Fine Quantum Wire
+
+item.itemHeavyPlatePotin.name=Heavy Potin Plate
+item.itemHeavyPlateWatertightSteel.name=Heavy Watertight Steel Plate
+item.itemHeavyPlateBronze.name=Heavy Bronze Plate
+item.itemHeavyPlateOsmiridium.name=Heavy Osmiridium Plate
+item.itemHeavyPlateQuantum.name=Heavy Quantum Plate
+item.itemHeavyPlateBlackSteel.name=Heavy Black Steel Plate
+item.itemHeavyPlateStainlessSteel.name=Heavy Stainless Steel Plate
+item.itemHeavyPlateEglinSteel.name=Heavy Eglin Steel Plate
+item.itemHeavyPlateMaragingSteel300.name=Heavy Maraging Steel 300 Plate
+item.itemHeavyPlateTalonite.name=Heavy Talonite Plate
+item.itemHeavyPlateHypogen.name=Heavy Hypogen Plate
+item.itemHeavyPlateRhugnor.name=Heavy Rhugnor Plate
+item.itemHeavyPlateAdvancedNitinol.name=Heavy Advanced Nitinol Plate
+item.itemHeavyPlateAstralTitanium.name=Heavy Astral Titanium Plate
+item.itemHeavyPlateCelestialTungsten.name=Heavy Celestial Tungsten Plate
+item.itemHeavyPlateWhiteMetal.name=Heavy White Metal Plate
+item.itemHeavyPlateBlackMetal.name=Heavy Black Metal Plate
+item.itemHeavyPlateAncientGranite.name=Heavy Ancient Granite Plate
+
+item.GTPP.bauble.fireprotection.0.name=Supreme Pizza Gloves
+
+
+//Added 16/5/19
+item.itemCellSeleniumDioxide.name=Selenium Dioxide Cell
+item.itemCellSeleniousAcid.name=Selenious Acid Cell
diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png
new file mode 100644
index 0000000000..3a1b683837
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png b/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png
new file mode 100644
index 0000000000..5427f66858
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png
new file mode 100644
index 0000000000..1938287f27
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png
new file mode 100644
index 0000000000..327e530f1b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png
new file mode 100644
index 0000000000..635be463af
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png
new file mode 100644
index 0000000000..24afa30c17
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png
new file mode 100644
index 0000000000..847e54ef60
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png
new file mode 100644
index 0000000000..ddd9cb7a2f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png
new file mode 100644
index 0000000000..e21c4fb78c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png
new file mode 100644
index 0000000000..29e270f862
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png
new file mode 100644
index 0000000000..87a48050fd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png
new file mode 100644
index 0000000000..3836414587
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png b/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png
new file mode 100644
index 0000000000..8576ae1b7a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/1.png b/src/resources/assets/miscutils/textures/items/chargepack/1.png
new file mode 100644
index 0000000000..9039d443c3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/2.png b/src/resources/assets/miscutils/textures/items/chargepack/2.png
new file mode 100644
index 0000000000..7023e7ce82
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/3.png b/src/resources/assets/miscutils/textures/items/chargepack/3.png
new file mode 100644
index 0000000000..4d787e7aa8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/4.png b/src/resources/assets/miscutils/textures/items/chargepack/4.png
new file mode 100644
index 0000000000..9320de0611
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/5.png b/src/resources/assets/miscutils/textures/items/chargepack/5.png
new file mode 100644
index 0000000000..ab8771c89c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemFineWire.png b/src/resources/assets/miscutils/textures/items/itemFineWire.png
new file mode 100644
index 0000000000..1804dc358b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemFineWire.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png b/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png
index 1f005e0156..e09ff6d1df 100644
--- a/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png
+++ b/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png b/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png
new file mode 100644
index 0000000000..c3835b07c1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemSmallSpring.png b/src/resources/assets/miscutils/textures/items/itemSmallSpring.png
new file mode 100644
index 0000000000..54b3afb24e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemSmallSpring.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/itemSpring.png b/src/resources/assets/miscutils/textures/items/itemSpring.png
new file mode 100644
index 0000000000..df442ed454
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemSpring.png
Binary files differ
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 4bf9f01d84..626949452a 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
"credits": "",
"logoFile": "",
- "version": "1.7.02.99-pre",
+ "version": "1.7.03.01",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",