Merge pull request #156 from draknyte1/Multiblock-Fix

Multiblock fix for #141, other misc. fixes & a few new additions.

22 files changed, 33 insertions, 63 deletions

diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index c2d177de48..962cce198b 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -1,3 +1,4 @@
+//Creative Tabs
 itemGroup.MiscUtilBlockTab=[GT++] Blocks
 itemGroup.MiscUtilMiscTab=[GT++] Items
 itemGroup.MiscUtilCombatTab=[GT++] Combat
@@ -5,77 +6,36 @@ itemGroup.MiscUtilToolsTab=[GT++] Tools
 itemGroup.MiscUtilMachineTab=[GT++] Machines
 itemGroup.MiscUtilOtherTab=[GT++] Items II
 
-item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV)
-
-item.itemPlateEnrichedSoularium.name=Enriched Soularium Plate
-
-item.itemHeliumBlob.name=Mysterious Hydrogen Substance
+//Debug
+item.AAA_Broken.name=[Non-existent Item] Report This Recipe On Github, Please.
+item.itemBedLocator_Base.name=Bed Locator [NBT Test]
+item.itemBaseItemWithCharge.name=Base Chargeable Item
+item.miscutils_itemDebugShapeSpawner.name=[Debug] Shapes
 
+//Alternative Materials
 item.itemPlateBatteryAlloy.name=Plate of Battery Alloy
 item.itemIngotBatteryAlloy.name=Ingot of Battery Alloy
-
 item.itemStickyRubber.name=Gumlet of Sticky Rubber
 
+//Unused Fuel rods
 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
 
+//Entities
+entity.miscutils.constructStaballoy.name=Staballoy Construct
 
-item.itemBedLocator_Base.name=Bed Locator [NBT Test]
-item.itemBaseItemWithCharge.name=Base Chargeable Item
-
-item.miscutils_itemDebugShapeSpawner.name=[Debug] Shapes
-
-tile.fluidJackDaniels.name=Jack Daniels
-tile.blockGriefSaver.name=Anti-Griefer [WIP]
-tile.helium_collector.name=Helium Collector
-tile.blockNuclearFueledHeliumGenerator.name=Nuclear Fueled Helium Generator [NFHG]
-tile.blockMachineCharger.name=Charging Machine
-container.Charger=Charging Machine
-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
-
-
+//Tile Entities
 tile.blockToolBuilder.name=GregTech Tool Constructor
+
+//Tools
 item.itemBufferCore.name=Buffer Core
 item.itemStaballoyPickaxe.name=Tunnel Digger
 item.itemStaballoyAxe.name=Tree Feller
 item.itemSandstoneHammer.name=Cobblestone Breaker
 
-
-item.bucket.fluid.grc.jackDanielsWhiskey0.name=Jack Daniels (0)
-item.bucket.fluid.grc.jackDanielsWhiskey1.name=Jack Daniels (1)
-item.bucket.fluid.grc.jackDanielsWhiskey2.name=Jack Daniels (2)
-item.bucket.fluid.grc.jackDanielsWhiskey3.name=Jack Daniels (3)
-item.bucket.fluid.grc.jackDanielsWhiskey4.name=Jack Daniels (4)
-fluid.grc.jackDanielsWhiskey=Jack Daniels
-fluid.grc.jackDanielsWhiskey0=Jack Daniels (0)
-fluid.grc.jackDanielsWhiskey1=Jack Daniels (1)
-fluid.grc.jackDanielsWhiskey2=Jack Daniels (2)
-fluid.grc.jackDanielsWhiskey3=Jack Daniels (3)
-fluid.grc.jackDanielsWhiskey4=Jack Daniels (4)
-fluid.fluidJackDaniels=Jack Daniels
-fluid.grc.jackDanielsWhiskey0.Modifier=Jack Daniels (0)
-fluid.grc.jackDanielsWhiskey1.Modifier=Jack Daniels (1)
-fluid.grc.jackDanielsWhiskey2.Modifier=Jack Daniels (2)
-fluid.grc.jackDanielsWhiskey3.Modifier=Jack Daniels (3)
-fluid.grc.jackDanielsWhiskey4.Modifier=Jack Daniels (4)
-tile.fluidBlockJackDaniels.name=Jack Daniels
-tile.fluid.grc.jackDanielsWhiskey0.name=Jack Daniels (0)
-tile.fluid.grc.jackDanielsWhiskey1.name=Jack Daniels (1)
-tile.fluid.grc.jackDanielsWhiskey2.name=Jack Daniels (2)
-tile.fluid.grc.jackDanielsWhiskey3.name=Jack Daniels (3)
-tile.fluid.grc.jackDanielsWhiskey4.name=Jack Daniels (4)
-fluid.psc_JD.ferment.2=Fermenting Jack Daniels
-fluid.psc_JD.dmature=D Matured Jack Daniels
-fluid.psc_JD.mature=Jack Daniels
-fluid.psc_JD.distill=Jack Daniels Wash
-fluid.psc_JD.name=Jack Daniels
-fluid.psc_JD=Jack Daniels
-
+//Thermal Foundation Stuff
 item.MiscUtils.bucket.bucketPyrotheum.name=Blazing Pyrotheum Bucket
 item.MiscUtils.bucket.bucketCryotheum.name=Gelid Cryotheum Bucket
 item.MiscUtils.bucket.bucketEnder.name=Resonant Ender Bucket
@@ -85,11 +45,9 @@ item.MiscUtils.material.rodBlizz.name=Blizz Rod
 item.MiscUtils.material.dustBlizz.name=Blizz Powder
 tile.MiscUtils.fluid.pyrotheum.name=Blazing Pyrotheum
 tile.MiscUtils.fluid.cryotheum.name=Gelid Cryotheum
-
-tile.miscutils.fluid.cryotheum.name=Gelid Cryotheum
-tile.miscutils.fluid.pyrotheum.name=Blazing Pyrotheum
 tile.miscutils.fluid.ender.name=Resonant Ender
 
+//Forestry Stuff
 item.frameAccelerated.name=Accelerated Frame
 item.frameVoid.name=Void Frame
 item.frameMutagenic.name=Mutagenic Frame
@@ -100,22 +58,34 @@ item.frameSoul.name=Soul Frame
 item.frameHealing.name=Healing Frame
 item.frameNova.name=Nova Frame
 
+//IC2 stuff
 item.itemEnergeticRotorBlade.name=Energetic Alloy Rotor Blade
 item.itemTungstenSteelRotorBlade.name=TungstenSteel Rotor Blade
 item.itemVibrantRotorBlade.name=Vibrant Alloy Rotor Blade
 item.itemIridiumRotorBlade.name=Iridium Rotor Blade
-
 item.itemEnergeticShaft.name=Energetic Alloy Shaft
 item.itemTungstenSteelShaft.name=TungstenSteel Shaft
 item.itemVibrantShaft.name=Vibrant Alloy Shaft
 item.itemIridiumShaft.name=Iridium Shaft
-
 item.itemMagnaliumRotorBlade.name=Magnalium Rotor Blade
 item.itemUltimetRotorBlade.name=Ultimet Blade
 item.itemMagnaliumShaft.name=Magnalium Shaft
 item.itemUltimetShaft.name=Ultimet Shaft
 
-item.itemHotIngotRaisinBread.name= Hot Loaf of Raisin Bread
-item.AAA_Broken.name=[Non-existent Item] Report This Recipe On Github, Please.
+
+//Misc Items
+item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV)
+item.itemPlateEnrichedSoularium.name=Enriched Soularium Plate
+item.itemHeliumBlob.name=Mysterious Hydrogen Substance
 item.itemAlkalusDisk.name=Alkalus Disk
-item.itemIngotRaisinBread.name=§5ImQ009's §fRaisin Bread
\ No newline at end of file
+item.itemHotIngotRaisinBread.name= Hot Loaf of Raisin Bread
+item.itemIngotRaisinBread.name=§5ImQ009's §fRaisin Bread
+
+//Misc Blocks
+tile.blockCompressedObsidian.0.name=Compressed Obsidian (9)
+tile.blockCompressedObsidian.1.name=Double Compressed Obsidian (81)
+tile.blockCompressedObsidian.2.name=Triple Compressed Obsidian (729)
+tile.blockCompressedObsidian.3.name=Quadruple Compressed Obsidian (6561)
+tile.blockCompressedObsidian.4.name=Quintuple Compressed Obsidian (59049)
+tile.blockCompressedObsidian.5.name=Inverted Obsidian
+tile.blockNet.name=Net
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/DevCapeHD.png b/src/resources/assets/miscutils/textures/DevCapeHD.png
new file mode 100644
index 0000000000..e979848c69
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/DevCapeHD.png
diff --git a/src/resources/assets/miscutils/textures/FancyCapeHD.png b/src/resources/assets/miscutils/textures/FancyCapeHD.png
new file mode 100644
index 0000000000..d8da3ba76d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/FancyCapeHD.png
diff --git a/src/resources/assets/miscutils/textures/OrangeHD.png b/src/resources/assets/miscutils/textures/OrangeHD.png
new file mode 100644
index 0000000000..b7dfa6d79a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/OrangeHD.png
diff --git a/src/resources/assets/miscutils/textures/TesterCapeHD.png b/src/resources/assets/miscutils/textures/TesterCapeHD.png
new file mode 100644
index 0000000000..274ba1bd44
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/TesterCapeHD.png
diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlGray.png b/src/resources/assets/miscutils/textures/blocks/SwirlGray.png
new file mode 100644
index 0000000000..337d5fd1bc
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/SwirlGray.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png
new file mode 100644
index 0000000000..05c8741fa7
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png
new file mode 100644
index 0000000000..4f7290c571
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png
new file mode 100644
index 0000000000..386f3c8e67
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png
new file mode 100644
index 0000000000..26b3b1e4c1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png
new file mode 100644
index 0000000000..0970b27745
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png
new file mode 100644
index 0000000000..6cf79c75c4
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png
new file mode 100644
index 0000000000..1241b24fad
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png
new file mode 100644
index 0000000000..3d07d55d0c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png
new file mode 100644
index 0000000000..5f83804605
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png
diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png
new file mode 100644
index 0000000000..8c55fdddd3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png
diff --git a/src/resources/assets/miscutils/textures/blocks/net.png b/src/resources/assets/miscutils/textures/blocks/net.png
new file mode 100644
index 0000000000..e885ed12db
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/net.png
diff --git a/src/resources/assets/miscutils/textures/gui/itemGrindle.png b/src/resources/assets/miscutils/textures/gui/itemGrindle.png
new file mode 100644
index 0000000000..cdc5de7715
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/itemGrindle.png
diff --git a/src/resources/assets/miscutils/textures/items/itemFiber.png b/src/resources/assets/miscutils/textures/items/itemFiber.png
new file mode 100644
index 0000000000..c2eb959c6c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemFiber.png
diff --git a/src/resources/assets/miscutils/textures/items/itemRope.png b/src/resources/assets/miscutils/textures/items/itemRope.png
new file mode 100644
index 0000000000..061938234d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemRope.png
diff --git a/src/resources/assets/miscutils/textures/items/itemTablet.png b/src/resources/assets/miscutils/textures/items/itemTablet.png
new file mode 100644
index 0000000000..8e10b0529a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemTablet.png
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 04d58d5491..9f12b3fae0 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
   "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
   "credits": "",
   "logoFile": "",
-  "version": "1.6.70-release",
+  "version": "1.6.97-release",
   "mcversion": "1.7.10",
   "url": "https://github.com/draknyte1/GTplusplus/wiki",
   "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",