Triggers added
Merge branch 'newgen' of https://github.com/d3scomp/JDEECo into newgen