From f82bd998288253230713cb146f6294be2d02260c Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 May 2019 11:44:19 +1000 Subject: + Added 5 lower Tier charging packs. --- .../assets/miscutils/textures/items/chargepack/1.png | Bin 0 -> 1327 bytes .../assets/miscutils/textures/items/chargepack/2.png | Bin 0 -> 1335 bytes .../assets/miscutils/textures/items/chargepack/3.png | Bin 0 -> 1340 bytes .../assets/miscutils/textures/items/chargepack/4.png | Bin 0 -> 1306 bytes .../assets/miscutils/textures/items/chargepack/5.png | Bin 0 -> 1302 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/items/chargepack/1.png create mode 100644 src/resources/assets/miscutils/textures/items/chargepack/2.png create mode 100644 src/resources/assets/miscutils/textures/items/chargepack/3.png create mode 100644 src/resources/assets/miscutils/textures/items/chargepack/4.png create mode 100644 src/resources/assets/miscutils/textures/items/chargepack/5.png (limited to 'src/resources') 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/chargepack/1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/chargepack/2.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/chargepack/3.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/chargepack/4.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/chargepack/5.png differ -- cgit From f7390af19986b4e4370379bb46dee71f12b717e8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 May 2019 15:45:29 +1000 Subject: + Added High Quality Industrial Diamond. + Added various material components. + Added a debug machine used for calling the Garbage Collector. + Added recipe to obtain Hot Water. + Added way to obtain Dragonsblood. + Added lots of quick access fluids directly to FluidUtils. % Updated English Locale. $ Fixed issue preventing all Multiblocks from forming. $ Fixed some minor texture issues. --- src/resources/assets/miscutils/lang/en_US.lang | 70 ++++++++++++++++++--- .../textures/items/IndustrialDiamondExquisite.png | Bin 0 -> 608 bytes .../miscutils/textures/items/itemFineWire.png | Bin 0 -> 514 bytes .../miscutils/textures/items/itemHeavyPlate.png | Bin 597 -> 397 bytes .../textures/items/itemHeavyPlate_Overlay.png | Bin 0 -> 471 bytes .../miscutils/textures/items/itemSmallSpring.png | Bin 0 -> 317 bytes .../assets/miscutils/textures/items/itemSpring.png | Bin 0 -> 276 bytes 7 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png create mode 100644 src/resources/assets/miscutils/textures/items/itemFineWire.png create mode 100644 src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png create mode 100644 src/resources/assets/miscutils/textures/items/itemSmallSpring.png create mode 100644 src/resources/assets/miscutils/textures/items/itemSpring.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 1ddcef9c74..78001238f6 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,56 @@ 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 \ No newline at end of file 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemFineWire.png 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 Binary files a/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png and b/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemSmallSpring.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemSpring.png differ -- cgit From 9487e78564ff2a729bc5d6787b5326665e4780be Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 May 2019 20:10:06 +1000 Subject: % Adjusted ID of Industrial Vacuum Furnace. % Adjusted Textures on Industrial Vacuum Furnace. --- .../textures/blocks/metro/TEXTURE_STONE_RED_B.png | Bin 0 -> 367 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png (limited to 'src/resources') 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png differ -- cgit From 7cf3349898a30dd7809c7d8051b1d9c318e27bf1 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Tue, 14 May 2019 11:26:19 +1000 Subject: $ Fixed NPE when Thermal Foundation existed. ^ Version Bump. --- src/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/resources') 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", -- cgit From 014455279145d902618ed441a19c8ad0ece44387 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Tue, 14 May 2019 16:48:07 +1000 Subject: % Minor Adjustments. $ Minor Fixes. --- src/resources/assets/miscutils/lang/en_US.lang | 4 +++- .../items/baubles/itemFireProtectGlovesBetter.png | Bin 0 -> 1326 bytes 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.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 78001238f6..b96735a2f1 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2948,4 +2948,6 @@ 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 \ No newline at end of file +item.itemHeavyPlateAncientGranite.name=Heavy Ancient Granite Plate + +item.GTPP.bauble.fireprotection.0.name=Supreme Pizza Gloves \ No newline at end of file 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png differ -- cgit From c02c8398d45bbcaa90fd30f0a72a4937ed210467 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 16 May 2019 19:29:30 +1000 Subject: % Minor adjustments. --- src/resources/assets/miscutils/lang/en_US.lang | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (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 b96735a2f1..38188e838b 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2950,4 +2950,9 @@ 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 \ No newline at end of file +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 -- cgit From e72099798c9225d1c8ceed84e4a34150eade6fc7 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 17 May 2019 11:08:01 +1000 Subject: + Added Fake Covers for ULV-MAX casings. Now you can hide your cables better. % Migrated some recipes. --- .../miscutils/textures/items/MU-metaitem.01/130.png | Bin 0 -> 489 bytes .../miscutils/textures/items/MU-metaitem.01/131.png | Bin 0 -> 451 bytes .../miscutils/textures/items/MU-metaitem.01/132.png | Bin 0 -> 449 bytes .../miscutils/textures/items/MU-metaitem.01/133.png | Bin 0 -> 463 bytes .../miscutils/textures/items/MU-metaitem.01/134.png | Bin 0 -> 465 bytes .../miscutils/textures/items/MU-metaitem.01/135.png | Bin 0 -> 462 bytes .../miscutils/textures/items/MU-metaitem.01/136.png | Bin 0 -> 477 bytes .../miscutils/textures/items/MU-metaitem.01/137.png | Bin 0 -> 461 bytes .../miscutils/textures/items/MU-metaitem.01/138.png | Bin 0 -> 474 bytes .../miscutils/textures/items/MU-metaitem.01/139.png | Bin 0 -> 482 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png (limited to 'src/resources') 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png differ -- cgit