a
Merge branch 'master' of https://github.com/hamko/padtool
Merge branch 'master' of https://github.com/hamko/padtool
Merge branch 'master' of https://github.com/hamko/padtool

Conflicts:
	inv_pad_damage.cpp
Merge branch 'master' of https://github.com/hamko/padtool
Merge branch 'master' of https://github.com/hamko/padtool
Merge branch 'master' of https://github.com/hamko/padtool
lambda