Update 1.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.pa.killerkiwijuice.bettercommboxing/modinfo.json