import files from 'shockwave'
set glow version
import abstractmove from '
shockwave'
import config.ini from 'shockwave'
Merge branch 'master' of https://github.com/voxelinc/voxellancer into damage_and_impulse_energy_fix

Conflicts:
	src/world/handler/damageimpactgenerator.cpp
removed unused method WorldLogic::addDamageImpact
merge with master
Merge branch 'damage_and_impulse_energy_fix' of github.com:voxelinc/voxellancer into damage_and_impulse_energy_fix
Merge pull request #602 from voxelinc/damage_and_impulse_energy_fix

DamageImpact and Impulse energy fix