Ben Spiers 51c1bd4500 Merge branch 'master' into development		2014-04-14 17:07:36 +01:00
..
armor	Updated to new UE, not done with complete implementation	2013-07-26 18:16:21 -04:00
gui	Loads of work on Seismic Vibrator	2014-03-15 20:05:26 -04:00
infuse	Added clay recipe, thanks @VapourDrive!	2014-01-18 11:41:41 -05:00
lang	Merge branch 'master' into development	2014-04-14 17:07:36 +01:00
models	Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work.	2013-12-18 18:42:05 +00:00
render	Armored Jetpack…done. Also made Charcoal Blocks fuel sources	2014-02-10 21:10:30 -05:00
sound	Fixed recipes, added sounds	2014-02-21 17:30:40 -05:00
textures	Loads of work on Seismic Vibrator	2014-03-15 20:05:26 -04:00