* 'master' of https://github.com/tildearrow/furnace: (70 commits)
whoops
GUI: AY8930 credits
GUI: fix inability to close subsongs
BANK
OPN: wire up ExtCh system
fix build failure
dev95 - multiple songs in a single file (READ)
DO NOT USE - THIS FAILS - WORK IN PROGRESS
enforce asset limits
old .dmf loading improvements
add AICA and YMZ ADPCM formats
allocate ID for YMZ280B
harden .fur file saver
Fix AY VGM output, Fix presets
preparations for UI improvements
GUI: add more presets
prepare for ExtCh OPN/OPNA
GUI: clarify that lock layout doesn't work yet
GUI: remember last state of order edit mode
GUI: store edit/followOrders/followPattern state
...
# Conflicts:
# src/engine/fileOps.cpp
# src/engine/platform/ym2610.cpp
# src/engine/platform/ym2610b.cpp
# src/engine/sample.cpp
# src/engine/sample.h
# src/engine/sysDef.cpp
# src/gui/doAction.cpp
# src/gui/sysConf.cpp
* 'master' of https://github.com/tildearrow/furnace:
YM2610: optimize oscilloscope fetch CPU usage
GUI: add audio load meter to statistics
GUI: put "OK" and "Cancel" buttons in the bottom
better FM chip names
sysDef refactor, part 3 - PLEASE READ
NO
Reduce unnecessary line
Debug improvements
AY8930: Fix VGM output.
# Conflicts:
# .gitignore
# src/engine/playback.cpp
# src/gui/debugWindow.cpp
