Aidan C. Brady d63628bebc Merge branch 'master' into development ... Conflicts: common/mekanism/client/ClientProxy.java common/mekanism/client/HolidayManager.java common/mekanism/client/sound/SoundHandler.java common/mekanism/client/sound/TileSound.java		2013-12-24 14:44:17 -05:00
..
cj	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
etc	Kill induction module and start on balloons :)	2013-12-20 01:05:41 -05:00
holiday	Christmas fun :)	2013-12-24 14:38:12 -05:00
BioGenerator.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Chamber.ogg	New Enrichment Chamber sound :)	2013-10-19 12:34:04 -04:00
Chargepad.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Combiner.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Compressor.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Crusher.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Elementizer.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
GasMask.ogg	Work on jetpacks/scuba stuff	2013-12-15 16:07:30 -05:00
HeatGenerator.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
HydrogenGenerator.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Jetpack.ogg	Work on jetpacks - specifically networking fixes and sounds!	2013-12-04 16:53:58 -05:00
MetallurgicInfuser.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
PurificationChamber.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Smelter.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SolarGenerator.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
WindTurbine.ogg	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00