Merge branch 'master' into development

Conflicts: src/main/resources/assets/mekanism/sounds/Elementizer.ogg
2015-03-11 11:00:32 -05:00 · 2015-03-11 11:00:32 -05:00 · 8da23839f3
commit 8da23839f3
parent c394c7c9bb 7cfc0c5c3f
23 changed files with 0 additions and 0 deletions
--- a/src/main/resources/assets/mekanism/sounds/BioGenerator.ogg
+++ b/src/main/resources/assets/mekanism/sounds/BioGenerator.ogg
--- a/src/main/resources/assets/mekanism/sounds/Chargepad.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Chargepad.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalCrystallizer.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalCrystallizer.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalDissolutionChamber.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalDissolutionChamber.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalInfuser.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalInfuser.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalInjectionChamber.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalInjectionChamber.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalOxidizer.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalOxidizer.ogg
--- a/src/main/resources/assets/mekanism/sounds/ChemicalWasher.ogg
+++ b/src/main/resources/assets/mekanism/sounds/ChemicalWasher.ogg
--- a/src/main/resources/assets/mekanism/sounds/Combiner.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Combiner.ogg
--- a/src/main/resources/assets/mekanism/sounds/Compressor.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Compressor.ogg
--- a/src/main/resources/assets/mekanism/sounds/Crusher.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Crusher.ogg
--- a/src/main/resources/assets/mekanism/sounds/EnrichmentChamber.ogg
+++ b/src/main/resources/assets/mekanism/sounds/EnrichmentChamber.ogg
--- a/src/main/resources/assets/mekanism/sounds/GasGenerator.ogg
+++ b/src/main/resources/assets/mekanism/sounds/GasGenerator.ogg
--- a/src/main/resources/assets/mekanism/sounds/GasMask.ogg
+++ b/src/main/resources/assets/mekanism/sounds/GasMask.ogg
--- a/src/main/resources/assets/mekanism/sounds/HeatGenerator.ogg
+++ b/src/main/resources/assets/mekanism/sounds/HeatGenerator.ogg
--- a/src/main/resources/assets/mekanism/sounds/Jetpack.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Jetpack.ogg
--- a/src/main/resources/assets/mekanism/sounds/MetallurgicInfuser.ogg
+++ b/src/main/resources/assets/mekanism/sounds/MetallurgicInfuser.ogg
--- a/src/main/resources/assets/mekanism/sounds/PrecisionSawmill.ogg
+++ b/src/main/resources/assets/mekanism/sounds/PrecisionSawmill.ogg
--- a/src/main/resources/assets/mekanism/sounds/PressurizedReactionChamber.ogg
+++ b/src/main/resources/assets/mekanism/sounds/PressurizedReactionChamber.ogg
--- a/src/main/resources/assets/mekanism/sounds/PurificationChamber.ogg
+++ b/src/main/resources/assets/mekanism/sounds/PurificationChamber.ogg
--- a/src/main/resources/assets/mekanism/sounds/Smelter.ogg
+++ b/src/main/resources/assets/mekanism/sounds/Smelter.ogg
--- a/src/main/resources/assets/mekanism/sounds/SolarGenerator.ogg
+++ b/src/main/resources/assets/mekanism/sounds/SolarGenerator.ogg
--- a/src/main/resources/assets/mekanism/sounds/WindTurbine.ogg
+++ b/src/main/resources/assets/mekanism/sounds/WindTurbine.ogg