Merge pull request #4 from Blood-Asp/experimental

Update changes

6 files changed, 415 insertions, 58 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 6d330cf4b6..1b839e42f1 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -220,7 +220,7 @@ achievement.unitool=Universal Tool
 achievement.unitool.desc=Craft a Universal Spade
 achievement.recycling=Recycling
 achievement.recycling.desc=Craft an Arc Furnace
-achievement.crushed=Crushed 
+achievement.crushed=Crushed
 achievement.crushed.desc=Crush Ores with a Hammer
 achievement.cleandust=Clean
 achievement.cleandust.desc=Clean a dust in a cauldron
@@ -247,7 +247,7 @@ achievement.macerator.desc=Craft a Steam Macerator
 achievement.extract=Extract
 achievement.extract.desc=Craft a Steam Extractor
 achievement.smallparts=Small Parts
-achievement.smallparts.desc=Craft NAND Chips 
+achievement.smallparts.desc=Craft NAND Chips
 achievement.bettercircuits=Better Circuits
 achievement.bettercircuits.desc=Get Good Circuits
 achievement.stepforward=Step forward
@@ -324,6 +324,8 @@ achievement.upgradeebf=Upgrade your EBF
 achievement.upgradeebf.desc=Craft a MV Energy Hatch
 achievement.maintainance=Maintenance
 achievement.maintainance.desc=Fix all Maintenance Problems in a Machine
+achievement.upgrade=Upgrade your Coils (level I)
+achievement.upgrade.desc=Craft a Kanthal Heating Coil
 achievement.titan=Titanium
 achievement.titan.desc=Produce a Titanium Ingot
 achievement.magic=Magic?
@@ -336,10 +338,12 @@ achievement.muchsteam=So much Steam
 achievement.muchsteam.desc=Start up a Large Turbine
 achievement.efficientsteam=Efficient Steam
 achievement.efficientsteam.desc=Use Superheated Steam in a Large Turbine
-achievement.upgrade=Upgrade your Coils
-achievement.upgrade.desc=Craft a Kanthal Heating Coil
+achievement.upgrade2=Upgrade your Coils (level II)
+achievement.upgrade2.desc=Craft a Nichrome Heating Coil
 achievement.tungsten=Tungsten
 achievement.tungsten.desc=Cool down a Hot Tungsten Ingot
+achievement.osmium=Osmium
+achievement.osmium.desc=Cool down a Hot Osmium Ingot
 achievement.hightech=Hightech
 achievement.hightech.desc=Craft a LV Field Generator
 achievement.amplifier=Amplifier
@@ -352,10 +356,16 @@ achievement.universal=Universal
 achievement.universal.desc=Craft a Mass Fab
 achievement.replication=Replication
 achievement.replication.desc=Craft a Replicator
-achievement.upgrade2=Upgrade your Coils (again)
-achievement.upgrade2.desc=Craft a Nichrome Heating Coil
 achievement.tungstensteel=Tungstensteel
 achievement.tungstensteel.desc=Cool down a Hot Tungstensteel Ingot
+achievement.upgrade3=Upgrade your Coils (level III)
+achievement.upgrade3.desc=Craft a Tungstensteel Heating Coil
+achievement.hssg=HSS-G
+achievement.hssg.desc=Cool down a Hot HSS-G Ingot
+achievement.upgrade4=Upgrade your Coils (level IV)
+achievement.upgrade4.desc=Craft a HSS-G Heating Coil
+achievement.stargatematerial=Stargate material
+achievement.stargatematerial.desc=Cool down a Hot Naquadah Ingot
 achievement.conducting=Conducting
 achievement.conducting.desc=Craft a Superconducting Coil
 achievement.fusion=Fusion
@@ -364,12 +374,22 @@ achievement.higherefficency=Higher efficiency
 achievement.higherefficency.desc=Produce Nitrogen Plasma
 achievement.advancing=Advancing
 achievement.advancing.desc=Produce Europium
+achievement.stargateliquid=Liquid Stargate material
+achievement.stargateliquid.desc=Produce Naquadah
 achievement.tothelimit=Going for the Limit
 achievement.tothelimit.desc=Produce Americium
-achievement.denseaspossible=As Dense As Possible
-achievement.denseaspossible.desc=Produce Neutronium
 achievement.fullefficiency=Full Efficiency
 achievement.fullefficiency.desc=Craft a Plasma Generator III
+achievement.upgrade5=Upgrade your Coils (level V)
+achievement.upgrade5.desc=Craft a Naquadah Heating Coil
+achievement.alienmetallurgy=Alien Metallurgy
+achievement.alienmetallurgy.desc=Cool down a Hot Naquadah Alloy Ingot
+achievement.over9000=Over 9000!
+achievement.over9000.desc=Craft a Naquadah Alloy Heating Coil
+achievement.finalpreparations=Final Preparations
+achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot
+achievement.denseaspossible=As Dense As Possible
+achievement.denseaspossible.desc=Produce Neutronium
 achievement.whatnow=What now?
 achievement.whatnow.desc=Craft a Ultimate Battery
 
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSG.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSG.png
new file mode 100644
index 0000000000..5ce1f16883
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSG.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAH.png
new file mode 100644
index 0000000000..f64a6adf43
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAH.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAHALLOY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAHALLOY.png
new file mode 100644
index 0000000000..7bc9110719
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_NAQUADAHALLOY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TUNGSTENSTEEL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TUNGSTENSTEEL.png
new file mode 100644
index 0000000000..c7b20b162c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TUNGSTENSTEEL.png
diff --git a/src/main/resources/assets/ic2/sounds.json b/src/main/resources/assets/ic2/sounds.json
index d525428fbe..7f89c0458b 100644
--- a/src/main/resources/assets/ic2/sounds.json
+++ b/src/main/resources/assets/ic2/sounds.json
@@ -1,52 +1,389 @@
 {
-"machines.ExtractorOp":{"category":"master", "sounds":[{"name":"ExtractorOp", "stream":false}]},
-"machines.CompressorOp":{"category":"master", "sounds":[{"name":"CompressorOp", "stream":false}]},
-"machines.ElectroFurnaceLoop":{"category":"master", "sounds":[{"name":"ElectroFurnaceLoop", "stream":false}]},
-"machines.InductionLoop":{"category":"master", "sounds":[{"name":"InductionLoop", "stream":false}]},
-"machines.InterruptOne":{"category":"master", "sounds":[{"name":"InterruptOne", "stream":false}]},
-"machines.IronFurnaceOp":{"category":"master", "sounds":[{"name":"IronFurnaceOp", "stream":false}]},
-"machines.KaChing":{"category":"master", "sounds":[{"name":"KaChing", "stream":false}]},
-"machines.MaceratorOp":{"category":"master", "sounds":[{"name":"MaceratorOp", "stream":false}]},
-"machines.MachineOverload":{"category":"master", "sounds":[{"name":"MachineOverload", "stream":false}]},
-"machines.MagnetizerLoop":{"category":"master", "sounds":[{"name":"MagnetizerLoop", "stream":false}]},
-"machines.MinerOp":{"category":"master", "sounds":[{"name":"MinerOp", "stream":false}]},
-"machines.PumpOp":{"category":"master", "sounds":[{"name":"PumpOp", "stream":false}]},
-"machines.RecyclerOp":{"category":"master", "sounds":[{"name":"RecyclerOp", "stream":false}]},
-
-"tools.BatteryUse":{"category":"master", "sounds":[{"name":"BatteryUse", "stream":false}]},
-"tools.Dynamiteomote":{"category":"master", "sounds":[{"name":"Dynamiteomote", "stream":false}]},
-"tools.InsulationCutters":{"category":"master", "sounds":[{"name":"InsulationCutters", "stream":false}]},
-"tools.NukeExplosion":{"category":"master", "sounds":[{"name":"NukeExplosion", "stream":false}]},
-"tools.ODScanner":{"category":"master", "sounds":[{"name":"ODScanner", "stream":false}]},
-"tools.Painter":{"category":"master", "sounds":[{"name":"Painter", "stream":false}]},
-"tools.RubberTrampoline":{"category":"master", "sounds":[{"name":"RubberTrampoline", "stream":false}]},
-"tools.Treetap":{"category":"master", "sounds":[{"name":"Treetap", "stream":false}]},
-"tools.Wrench":{"category":"master", "sounds":[{"name":"Wrench", "stream":false}]},
-
-"tools.chainsaw.ChainsawIdle":{"category":"master", "sounds":[{"name":"ChainsawIdle", "stream":false}]},
-"tools.chainsaw.ChainsawStop":{"category":"master", "sounds":[{"name":"ChainsawStop", "stream":false}]},
-"tools.chainsaw.ChainsawUseOne":{"category":"master", "sounds":[{"name":"ChainsawUseOne", "stream":false}]},
-"tools.chainsaw.ChainsawUseTwo":{"category":"master", "sounds":[{"name":"ChainsawUseTwo", "stream":false}]},
-
-"tools.drill.DrillHard":{"category":"master", "sounds":[{"name":"DrillHard", "stream":false}]},
-"tools.drill.DrillSoft":{"category":"master", "sounds":[{"name":"DrillSoft", "stream":false}]},
-"tools.drill.DrillUseLoop":{"category":"master", "sounds":[{"name":"DrillUseLoop", "stream":false}]},
-
-"tools.jetpack.JetpackFire":{"category":"master", "sounds":[{"name":"JetpackFire", "stream":false}]},
-"tools.jetpack.JetpackLoop":{"category":"master", "sounds":[{"name":"JetpackLoop", "stream":false}]},
-
-"tools.mininglaser.MiningLaser":{"category":"master", "sounds":[{"name":"MiningLaser", "stream":false}]},
-"tools.mininglaser.MiningLaserExplosive":{"category":"master", "sounds":[{"name":"MiningLaserExplosive", "stream":false}]},
-"tools.mininglaser.MiningLaserLongRange":{"category":"master", "sounds":[{"name":"MiningLaserLongRange", "stream":false}]},
-"tools.mininglaser.MiningLaserLowFocus":{"category":"master", "sounds":[{"name":"MiningLaserLowFocus", "stream":false}]},
-"tools.mininglaser.MiningLaserScatter":{"category":"master", "sounds":[{"name":"MiningLaserScatter", "stream":false}]},
-
-"tools.nanosabre.NanosabreIdle":{"category":"master", "sounds":[{"name":"NanosabreIdle", "stream":false}]},
-"tools.nanosabre.NanosabrePowerup":{"category":"master", "sounds":[{"name":"NanosabrePowerup", "stream":false}]},
-"tools.nanosabre.NanosabreSwing1":{"category":"master", "sounds":[{"name":"NanosabreSwing1", "stream":false}]},
-"tools.nanosabre.NanosabreSwing2":{"category":"master", "sounds":[{"name":"NanosabreSwing2", "stream":false}]},
-"tools.nanosabre.NanosabreSwing3":{"category":"master", "sounds":[{"name":"NanosabreSwing3", "stream":false}]},
-
-"tools.quantumsuit.HelmetLoop":{"category":"master", "sounds":[{"name":"HelmetLoop", "stream":false}]},
-"tools.quantumsuit.QuantumsuitBoots":{"category":"master", "sounds":[{"name":"QuantumsuitBoots", "stream":false}]}
+  "machines.ExtractorOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "ExtractorOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.CompressorOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "CompressorOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.ElectroFurnaceLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "ElectroFurnaceLoop",
+        "stream": false
+      }
+    ]
+  },
+  "machines.InductionLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "InductionLoop",
+        "stream": false
+      }
+    ]
+  },
+  "machines.InterruptOne": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "InterruptOne",
+        "stream": false
+      }
+    ]
+  },
+  "machines.IronFurnaceOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "IronFurnaceOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.KaChing": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "KaChing",
+        "stream": false
+      }
+    ]
+  },
+  "machines.MaceratorOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MaceratorOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.MachineOverload": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MachineOverload",
+        "stream": false
+      }
+    ]
+  },
+  "machines.MagnetizerLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MagnetizerLoop",
+        "stream": false
+      }
+    ]
+  },
+  "machines.MinerOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "MinerOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.PumpOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "PumpOp",
+        "stream": false
+      }
+    ]
+  },
+  "machines.RecyclerOp": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "RecyclerOp",
+        "stream": false
+      }
+    ]
+  },
+  "tools.BatteryUse": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "BatteryUse",
+        "stream": false
+      }
+    ]
+  },
+  "tools.Dynamiteomote": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "Dynamiteomote",
+        "stream": false
+      }
+    ]
+  },
+  "tools.InsulationCutters": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "InsulationCutters",
+        "stream": false
+      }
+    ]
+  },
+  "tools.NukeExplosion": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "NukeExplosion",
+        "stream": false
+      }
+    ]
+  },
+  "tools.ODScanner": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "ODScanner",
+        "stream": false
+      }
+    ]
+  },
+  "tools.Painter": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "Painter",
+        "stream": false
+      }
+    ]
+  },
+  "tools.RubberTrampoline": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "RubberTrampoline",
+        "stream": false
+      }
+    ]
+  },
+  "tools.Treetap": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "Treetap",
+        "stream": false
+      }
+    ]
+  },
+  "tools.Wrench": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "Wrench",
+        "stream": false
+      }
+    ]
+  },
+  "tools.chainsaw.ChainsawIdle": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "ChainsawIdle",
+        "stream": false
+      }
+    ]
+  },
+  "tools.chainsaw.ChainsawStop": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "ChainsawStop",
+        "stream": false
+      }
+    ]
+  },
+  "tools.chainsaw.ChainsawUseOne": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "ChainsawUseOne",
+        "stream": false
+      }
+    ]
+  },
+  "tools.chainsaw.ChainsawUseTwo": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "ChainsawUseTwo",
+        "stream": false
+      }
+    ]
+  },
+  "tools.drill.DrillHard": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "DrillHard",
+        "stream": false
+      }
+    ]
+  },
+  "tools.drill.DrillSoft": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "DrillSoft",
+        "stream": false
+      }
+    ]
+  },
+  "tools.drill.DrillUseLoop": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "DrillUseLoop",
+        "stream": false
+      }
+    ]
+  },
+  "tools.jetpack.JetpackFire": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "JetpackFire",
+        "stream": false
+      }
+    ]
+  },
+  "tools.jetpack.JetpackLoop": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "JetpackLoop",
+        "stream": false
+      }
+    ]
+  },
+  "tools.mininglaser.MiningLaser": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "MiningLaser",
+        "stream": false
+      }
+    ]
+  },
+  "tools.mininglaser.MiningLaserExplosive": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "MiningLaserExplosive",
+        "stream": false
+      }
+    ]
+  },
+  "tools.mininglaser.MiningLaserLongRange": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "MiningLaserLongRange",
+        "stream": false
+      }
+    ]
+  },
+  "tools.mininglaser.MiningLaserLowFocus": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "MiningLaserLowFocus",
+        "stream": false
+      }
+    ]
+  },
+  "tools.mininglaser.MiningLaserScatter": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "MiningLaserScatter",
+        "stream": false
+      }
+    ]
+  },
+  "tools.nanosabre.NanosabreIdle": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "NanosabreIdle",
+        "stream": false
+      }
+    ]
+  },
+  "tools.nanosabre.NanosabrePowerup": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "NanosabrePowerup",
+        "stream": false
+      }
+    ]
+  },
+  "tools.nanosabre.NanosabreSwing1": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "NanosabreSwing1",
+        "stream": false
+      }
+    ]
+  },
+  "tools.nanosabre.NanosabreSwing2": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "NanosabreSwing2",
+        "stream": false
+      }
+    ]
+  },
+  "tools.nanosabre.NanosabreSwing3": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "NanosabreSwing3",
+        "stream": false
+      }
+    ]
+  },
+  "tools.quantumsuit.HelmetLoop": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "HelmetLoop",
+        "stream": false
+      }
+    ]
+  },
+  "tools.quantumsuit.QuantumsuitBoots": {
+    "category": "player",
+    "sounds": [
+      {
+        "name": "QuantumsuitBoots",
+        "stream": false
+      }
+    ]
+  }
 }
\ No newline at end of file