Merge branch 'master' into divVerent/newboxparticles

diff --cc cl_main.c
Simple merge

diff --cc cl_particles.c
Simple merge

diff --cc client.h
Simple merge

diff --cc clvm_cmds.c
Simple merge

diff --cc prvm_offsets.h
Simple merge