* 'master' of https://github.com/tildearrow/furnace:
dev92 - GUI: customizable channel collapsing!
GUI: more improvements to instrument loading
GUI: implement instrument load replace
NES: fix duty effect not working at all
GUI: part 2 of previous commit
GUI: only use edit color when pat view is focused
GUI: fix more issues
here's the new OPLL default instrument
OPL: fix channel muting - PLEASE READ!
OPLL: fix compatible drum mode
the final part of extra FM effects
implement extra FM effects (OPLL and OPL)
update to-do list
prepare for possible .ftm import
implement extra FM effects (OPN, OPM and OPZ)
# Conflicts:
# src/engine/engine.h
9109d2c64f