From 51d5db94cfafac652a05f6f121ec2521d62aaf5c Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 16 Jun 2016 03:59:47 +1000 Subject: Done a lot of work on the NFHG. Also did some more refactoring beforehand. --- src/resources/assets/miscutils/lang/en_US.lang | 15 +++++++++++---- .../blocks/blockNuclearFueledHeliumGenerator.png | Bin 0 -> 3224 bytes .../miscutils/textures/gui/helium_collector_gui.png | Bin 1851 -> 199683 bytes .../miscutils/textures/items/itemFuelRod_Empty.png | Bin 0 -> 2937 bytes .../textures/items/itemFuelRod_Plutonium.png | Bin 0 -> 367 bytes .../textures/items/itemFuelRod_Thorium.png | Bin 0 -> 2989 bytes .../textures/items/itemFuelRod_Uranium.png | Bin 0 -> 528 bytes 7 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png create mode 100644 src/resources/assets/miscutils/textures/items/itemFuelRod_Empty.png create mode 100644 src/resources/assets/miscutils/textures/items/itemFuelRod_Plutonium.png create mode 100644 src/resources/assets/miscutils/textures/items/itemFuelRod_Thorium.png create mode 100644 src/resources/assets/miscutils/textures/items/itemFuelRod_Uranium.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 5f113eb493..a47a3658f9 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2,7 +2,7 @@ itemGroup.MiscUtilBlockTab=Misc. Utils Blocks itemGroup.MiscUtilMiscTab=Misc. Utils Items itemGroup.MiscUtilCombatTab=Misc. Utils Combat itemGroup.MiscUtilToolsTab=Misc. Utils Tools -itemGroup.MiscUtilMachinesTab=Misc. Utils Machines +itemGroup.MiscUtilMachineTab=Misc. Utils Machines @@ -30,14 +30,21 @@ item.itemPlateBloodSteel.name=Blood Steel Plate item.itemIngotStaballoy.name=Staballoy Ingot item.itemPlateStaballoy.name=Staballoy Plate item.itemHeliumBlob.name=Blob of solid Helium -item.itemPlateBatteryAlloy=Plate of Battery Alloy -item.itemIngotBatteryAlloy=Ingot of Battery Alloy -item.itemStickyRubber=Gumlet of Sticky Rubber +item.itemPlateBatteryAlloy.name=Plate of Battery Alloy +item.itemIngotBatteryAlloy.name=Ingot of Battery Alloy +item.itemStickyRubber.name=Gumlet of Sticky Rubber +item.itemFuelRod_Empty.name=Empty Fuel Rod +item.itemFuelRod_Thorium.name=Thorium Fuel Rod +item.itemFuelRod_Uranium.name=Uranium Fuel Rod +item.itemFuelRod_Plutonium.name=Plutonium Fuel Rod item.miscutils_itemDebugShapeSpawner.name=[Debug] Shapes tile.yourFluid.name=Jack Daniels tile.blockGriefSaver.name=Anti-Griefer [WIP] tile.helium_collector.name=Helium Collector +tile.blockNuclearFueledHeliumGenerator.name=Nuclear Fueled Helium Generator [NFHG] +container.NHG=Nuclear Fueled Helium Generator +container.helium_collector.name=Helium Collector tile.blockStaballoy.name=Block of Staballoy tile.blockBloodSteel.name=Block of Blood Steel diff --git a/src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png b/src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png new file mode 100644 index 0000000000..8ec28aeb6c Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png differ diff --git a/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png b/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png index 445fa3209f..4fe6ad461c 100644 Binary files a/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png and b/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png differ diff --git a/src/resources/assets/miscutils/textures/items/itemFuelRod_Empty.png b/src/resources/assets/miscutils/textures/items/itemFuelRod_Empty.png new file mode 100644 index 0000000000..517ef4b74b Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemFuelRod_Empty.png differ diff --git a/src/resources/assets/miscutils/textures/items/itemFuelRod_Plutonium.png b/src/resources/assets/miscutils/textures/items/itemFuelRod_Plutonium.png new file mode 100644 index 0000000000..849673016f Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemFuelRod_Plutonium.png differ diff --git a/src/resources/assets/miscutils/textures/items/itemFuelRod_Thorium.png b/src/resources/assets/miscutils/textures/items/itemFuelRod_Thorium.png new file mode 100644 index 0000000000..e8e8631806 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemFuelRod_Thorium.png differ diff --git a/src/resources/assets/miscutils/textures/items/itemFuelRod_Uranium.png b/src/resources/assets/miscutils/textures/items/itemFuelRod_Uranium.png new file mode 100644 index 0000000000..b2a9614b62 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/itemFuelRod_Uranium.png differ -- cgit