diff --git a/CMakeLists.txt b/CMakeLists.txt
index 752c1164c..f1941a02b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1077,6 +1077,7 @@ if (NOT ANDROID OR TERMUX)
set(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist)
set(CPACK_BUNDLE_ICON ${CMAKE_SOURCE_DIR}/res/icon.icns)
set(CPACK_BUNDLE_STARTUP_COMMAND "furnace")
+ set(CPACK_BUNDLE_APPLE_CERT_APP "-")
endif()
include(CPack)
diff --git a/demos/virtualboy/God_Rest_Ye_Deadly_Gentlemen.fur b/demos/virtualboy/God_Rest_Ye_Deadly_Gentlemen.fur
new file mode 100644
index 000000000..e629b49b5
Binary files /dev/null and b/demos/virtualboy/God_Rest_Ye_Deadly_Gentlemen.fur differ
diff --git a/demos/virtualboy/eek.fur b/demos/virtualboy/eek.fur
new file mode 100644
index 000000000..bef297b6d
Binary files /dev/null and b/demos/virtualboy/eek.fur differ
diff --git a/demos/virtualboy/ghx_melodic.fur b/demos/virtualboy/ghx_melodic.fur
new file mode 100644
index 000000000..3df3fe4cd
Binary files /dev/null and b/demos/virtualboy/ghx_melodic.fur differ
diff --git a/demos/virtualboy/redshift.fur b/demos/virtualboy/redshift.fur
new file mode 100644
index 000000000..fdeb1c981
Binary files /dev/null and b/demos/virtualboy/redshift.fur differ
diff --git a/demos/virtualboy/virtual_namachuukei_pendant_race.fur b/demos/virtualboy/virtual_namachuukei_pendant_race.fur
new file mode 100644
index 000000000..4abb90f26
Binary files /dev/null and b/demos/virtualboy/virtual_namachuukei_pendant_race.fur differ
diff --git a/doc/1-intro/concepts.md b/doc/1-intro/concepts.md
index 43361d49b..b1ab44304 100644
--- a/doc/1-intro/concepts.md
+++ b/doc/1-intro/concepts.md
@@ -23,7 +23,7 @@ the **order list** is a smaller spreadsheet showing the overall song structure.
- patterns may be used multiple times in the order list. changing a pattern's data in one order will affect the same pattern used in other orders.
- each pattern is made of the same number of rows as seen in the tracker view.
- during playback, the **playhead** moves down as described previously. when it reaches the end of the pattern view, it will go to the next order.
-- if the last order is reached and the playhear reaches the end of the pattern view, it will go back to the beginning of the song.
+- if the last order is reached and the playhead reaches the end of the pattern view, it will go back to the beginning of the song.
## time
diff --git a/doc/8-advanced/chanosc.md b/doc/8-advanced/chanosc.md
index 8521c099f..720b550fe 100644
--- a/doc/8-advanced/chanosc.md
+++ b/doc/8-advanced/chanosc.md
@@ -1,6 +1,6 @@
# oscilloscope (per-channel)
-the "Oscilloscope (per-channel)" windows displays several oscilloscope views (one per channel).
+the "Oscilloscope (per-channel)" window displays several oscilloscope views (one per channel).

diff --git a/instruments/OPZ/Synth Bass.fui b/instruments/OPZ/Synth Bass.fui
new file mode 100644
index 000000000..e78046ddf
Binary files /dev/null and b/instruments/OPZ/Synth Bass.fui differ
diff --git a/res/Info.plist b/res/Info.plist
index 3eeb8ae02..7895024da 100644
--- a/res/Info.plist
+++ b/res/Info.plist
@@ -5,7 +5,7 @@
CFBundleDevelopmentRegion
English
CFBundleExecutable
- furnace
+ Furnace
CFBundleGetInfoString
CFBundleIconFile
diff --git a/src/engine/platform/vb.cpp b/src/engine/platform/vb.cpp
index 3e0055e1e..94f353f59 100644
--- a/src/engine/platform/vb.cpp
+++ b/src/engine/platform/vb.cpp
@@ -414,8 +414,12 @@ void DivPlatformVB::forceIns() {
chan[i].insChanged=true;
chan[i].freqChanged=true;
updateWave(i);
+ if (romMode) {
+ chWrite(i,0x06,chan[i].wave);
+ }
chWrite(i,0x01,isMuted[i]?0:chan[i].pan);
}
+ writeEnv(5,true);
}
void* DivPlatformVB::getChanState(int ch) {
diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 8418b0168..3cb9b7548 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -115,6 +115,7 @@ const char* aboutLine[]={
"Lunathir",
"LVintageNerd",
"Mahbod Karamoozian",
+ "Marisa Kirisame [DJ MasterSpark]",
"Martin Demsky",
"masicbemester",
"MelonadeM",
@@ -123,14 +124,17 @@ const char* aboutLine[]={
"nicco1690",
"niffuM",
"",
+ "Notakin",
"NyaongI",
"Pale Moon",
+ "PeyPey",
"PichuMario",
"potatoTeto",
"psxdominator",
"Raijin",
"railzen7",
"RevvoBolt",
+ "scooblee",
"sillygoose",
"SnugglyBun",
"SuperJet Spade",