git: 935a195501a7 - main - audio/cardinal: Update 22.02 -> 22.05

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 21 May 2022 07:24:23 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=935a195501a766c32ea67afd44e3b4b387a170c6

commit 935a195501a766c32ea67afd44e3b4b387a170c6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-05-21 07:23:44 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-05-21 07:24:20 +0000

    audio/cardinal: Update 22.02 -> 22.05
---
 audio/cardinal/Makefile                            |   3 +-
 audio/cardinal/distinfo                            |   8 +-
 ...-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch |  52 --
 .../cardinal/files/patch-carla_source_Makefile.mk  |  11 +
 .../files/patch-carla_source_modules_AppConfig.h   |   6 +-
 audio/cardinal/files/patch-dpf_Makefile.base.mk    |  11 +
 audio/cardinal/files/patch-src_Makefile            |   6 +-
 audio/cardinal/files/patch-src_Rack_Makefile       |  11 +-
 audio/cardinal/files/patch-src_Rack_plugin.mk      |  11 +
 audio/cardinal/pkg-plist                           | 869 ++++++++++++++++++++-
 10 files changed, 919 insertions(+), 69 deletions(-)

diff --git a/audio/cardinal/Makefile b/audio/cardinal/Makefile
index 098bcc204ef3..0c2eef1fcbd9 100644
--- a/audio/cardinal/Makefile
+++ b/audio/cardinal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cardinal
-DISTVERSION=	22.02
+DISTVERSION=	22.05
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/DISTRHO/Cardinal/releases/download/${DISTVERSION}/
 
@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/include/FuzzySearchDatabase.hpp:textproc/fuzzysearchdatabase \
 		bash:shells/bash
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libfftw3f.so:math/fftw3-float \
 		libjansson.so:devel/jansson \
 		liblo.so:audio/liblo \
 		libpffft.so:math/pffft \
diff --git a/audio/cardinal/distinfo b/audio/cardinal/distinfo
index 8de1fac545b7..3826476cc6b7 100644
--- a/audio/cardinal/distinfo
+++ b/audio/cardinal/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644950602
-SHA256 (cardinal-22.02.tar.xz) = 21594044e14615f7d3114d343429afef8c350d16fb74d329db415e055a03add3
-SIZE (cardinal-22.02.tar.xz) = 190648308
-SHA256 (b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch) = 92473b9f734b5665a2e9a697da85513efa46c546a388447b20f533d4bf7b0a95
-SIZE (b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch) = 2545
+TIMESTAMP = 1653111028
+SHA256 (cardinal-22.05.tar.xz) = 25ed44e06bba3d96cc04abeec788eb615cf847a0428e5222d19864cacb74d3be
+SIZE (cardinal-22.05.tar.xz) = 273896508
diff --git a/audio/cardinal/files/patch-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch b/audio/cardinal/files/patch-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch
deleted file mode 100644
index 005a3e2a8b9e..000000000000
--- a/audio/cardinal/files/patch-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b7d4847e1920a3d9c22e97dcd901360188e4c5a8 Mon Sep 17 00:00:00 2001
-From: falkTX <falktx@falktx.com>
-Date: Tue, 15 Feb 2022 09:56:36 +0000
-Subject: [PATCH] Do not build VST3 for currently unsupported systems
-
----
- Makefile | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git Makefile Makefile
-index 4a911dc..c56fedb 100644
---- Makefile
-+++ Makefile
-@@ -32,6 +32,14 @@ else
- SYSDEPS ?= false
- endif
- 
-+ifeq ($(LINUX),true)
-+VST3_SUPPORTED = true
-+else ifeq ($(MACOS),true)
-+VST3_SUPPORTED = true
-+else ifeq ($(WINDOWS),true)
-+VST3_SUPPORTED = true
-+endif
-+
- # --------------------------------------------------------------
- # Carla config
- 
-@@ -249,9 +257,11 @@ install:
- 	install -d $(DESTDIR)$(PREFIX)/lib/lv2/CardinalSynth.lv2
- 	install -d $(DESTDIR)$(PREFIX)/lib/vst/CardinalFX.vst
- 	install -d $(DESTDIR)$(PREFIX)/lib/vst/CardinalSynth.vst
-+ifeq ($(VST3_SUPPORTED),true)
- 	install -d $(DESTDIR)$(PREFIX)/lib/vst3/Cardinal.vst3/Contents
- 	install -d $(DESTDIR)$(PREFIX)/lib/vst3/CardinalFX.vst3/Contents
- 	install -d $(DESTDIR)$(PREFIX)/lib/vst3/CardinalSynth.vst3/Contents
-+endif
- 	install -d $(DESTDIR)$(PREFIX)/share/cardinal
- 	install -d $(DESTDIR)$(PREFIX)/share/doc/cardinal/docs
- 
-@@ -262,9 +272,11 @@ install:
- 	install -m 644 bin/CardinalFX.vst/*.*    $(DESTDIR)$(PREFIX)/lib/vst/CardinalFX.vst/
- 	install -m 644 bin/CardinalSynth.vst/*.* $(DESTDIR)$(PREFIX)/lib/vst/CardinalSynth.vst/
- 
-+ifeq ($(VST3_SUPPORTED),true)
- 	cp -rL bin/Cardinal.vst3/Contents/*-*      $(DESTDIR)$(PREFIX)/lib/vst3/Cardinal.vst3/Contents/
- 	cp -rL bin/CardinalFX.vst3/Contents/*-*    $(DESTDIR)$(PREFIX)/lib/vst3/CardinalFX.vst3/Contents/
- 	cp -rL bin/CardinalSynth.vst3/Contents/*-* $(DESTDIR)$(PREFIX)/lib/vst3/CardinalSynth.vst3/Contents/
-+endif
- 
- 	install -m 755 bin/Cardinal$(APP_EXT) $(DESTDIR)$(PREFIX)/bin/
- 	cp -rL bin/Cardinal.lv2/resources/* $(DESTDIR)$(PREFIX)/share/cardinal/
diff --git a/audio/cardinal/files/patch-carla_source_Makefile.mk b/audio/cardinal/files/patch-carla_source_Makefile.mk
new file mode 100644
index 000000000000..8944c608eda8
--- /dev/null
+++ b/audio/cardinal/files/patch-carla_source_Makefile.mk
@@ -0,0 +1,11 @@
+--- carla/source/Makefile.mk.orig	2022-05-21 05:42:01 UTC
++++ carla/source/Makefile.mk
+@@ -86,7 +86,7 @@ endif
+ 
+ ifneq ($(MACOS),true)
+ ifneq ($(WIN32),true)
+-BASE_FLAGS += -fno-gnu-unique
++#BASE_FLAGS += -fno-gnu-unique
+ endif
+ endif
+ 
diff --git a/audio/cardinal/files/patch-carla_source_modules_AppConfig.h b/audio/cardinal/files/patch-carla_source_modules_AppConfig.h
index 50e1f191e41f..f8f42a016f99 100644
--- a/audio/cardinal/files/patch-carla_source_modules_AppConfig.h
+++ b/audio/cardinal/files/patch-carla_source_modules_AppConfig.h
@@ -1,6 +1,6 @@
 - for now treat FreeBSD as Linux for simplicity
 
---- carla/source/modules/AppConfig.h.orig	2022-01-30 04:43:57 UTC
+--- carla/source/modules/AppConfig.h.orig	2022-05-15 13:40:22 UTC
 +++ carla/source/modules/AppConfig.h
 @@ -27,7 +27,7 @@
  # define APPCONFIG_OS_WIN32
@@ -9,5 +9,5 @@
 -#elif defined(__linux__) || defined(__linux)
 +#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
  # define APPCONFIG_OS_LINUX
- #else
- # error Unsupported platform!
+ #elif defined(__FreeBSD__)
+ # define APPCONFIG_OS_FREEBSD
diff --git a/audio/cardinal/files/patch-dpf_Makefile.base.mk b/audio/cardinal/files/patch-dpf_Makefile.base.mk
new file mode 100644
index 000000000000..8a25a3ca2f50
--- /dev/null
+++ b/audio/cardinal/files/patch-dpf_Makefile.base.mk
@@ -0,0 +1,11 @@
+--- dpf/Makefile.base.mk.orig	2022-05-21 05:45:04 UTC
++++ dpf/Makefile.base.mk
+@@ -173,7 +173,7 @@ BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunctio
+ endif
+ 
+ ifneq ($(MACOS_OR_WINDOWS),true)
+-BASE_FLAGS += -fno-gnu-unique
++#BASE_FLAGS += -fno-gnu-unique
+ endif
+ 
+ ifeq ($(WINDOWS),true)
diff --git a/audio/cardinal/files/patch-src_Makefile b/audio/cardinal/files/patch-src_Makefile
index 25048a1b67a1..525c1d257518 100644
--- a/audio/cardinal/files/patch-src_Makefile
+++ b/audio/cardinal/files/patch-src_Makefile
@@ -1,8 +1,8 @@
 - use pffft from the package, see https://github.com/DISTRHO/Cardinal/issues/130
 
---- src/Makefile.orig	2022-02-06 00:30:19 UTC
+--- src/Makefile.orig	2022-05-15 13:39:19 UTC
 +++ src/Makefile
-@@ -50,7 +50,7 @@ BASE_FLAGS += -IRack/dep/glfw/include
+@@ -55,7 +55,7 @@ BASE_FLAGS += -IRack/dep/glfw/include
  BASE_FLAGS += -IRack/dep/nanosvg/src
  BASE_FLAGS += -IRack/dep/osdialog
  BASE_FLAGS += -IRack/dep/oui-blendish
@@ -11,7 +11,7 @@
  
  ifeq ($(DEBUG),true)
  BASE_FLAGS += -UDEBUG
-@@ -108,8 +108,8 @@ RACK_FILES += override/MenuBar.cpp
+@@ -122,8 +122,8 @@ RACK_FILES += override/MenuBar.cpp
  RACK_FILES += override/Model.cpp
  RACK_FILES += override/Scene.cpp
  
diff --git a/audio/cardinal/files/patch-src_Rack_Makefile b/audio/cardinal/files/patch-src_Rack_Makefile
index c23ed7898755..8e30cc75fee5 100644
--- a/audio/cardinal/files/patch-src_Rack_Makefile
+++ b/audio/cardinal/files/patch-src_Rack_Makefile
@@ -1,4 +1,4 @@
---- src/Rack/Makefile.orig	2022-02-06 00:28:59 UTC
+--- src/Rack/Makefile.orig	2022-05-15 13:41:31 UTC
 +++ src/Rack/Makefile
 @@ -12,7 +12,7 @@ include arch.mk
  SOURCES += dep/nanovg/src/nanovg.c
@@ -9,3 +9,12 @@
  SOURCES += $(wildcard src/*.c src/*/*.c)
  SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
  
+@@ -31,7 +31,7 @@ ifdef ARCH_LIN
+ 
+ 	# This prevents static variables in the DSO (dynamic shared object) from being preserved after dlclose().
+ 	# I don't really understand the side effects (see GCC manual), but so far tests are positive.
+-	FLAGS += -fno-gnu-unique
++	#FLAGS += -fno-gnu-unique
+ 
+ 	LDFLAGS += -Wl,--whole-archive
+ 	LDFLAGS += -static-libstdc++ -static-libgcc
diff --git a/audio/cardinal/files/patch-src_Rack_plugin.mk b/audio/cardinal/files/patch-src_Rack_plugin.mk
new file mode 100644
index 000000000000..d27b74425316
--- /dev/null
+++ b/audio/cardinal/files/patch-src_Rack_plugin.mk
@@ -0,0 +1,11 @@
+--- src/Rack/plugin.mk.orig	2022-05-21 05:37:01 UTC
++++ src/Rack/plugin.mk
+@@ -26,7 +26,7 @@ include $(RACK_DIR)/arch.mk
+ ifdef ARCH_LIN
+ 	TARGET := plugin.so
+ 	# This prevents static variables in the DSO (dynamic shared object) from being preserved after dlclose().
+-	FLAGS += -fno-gnu-unique
++	#FLAGS += -fno-gnu-unique
+ 	# When Rack loads a plugin, it symlinks /tmp/Rack2 to its system dir, so the plugin can link to libRack.
+ 	LDFLAGS += -Wl,-rpath=/tmp/Rack2
+ 	# Since the plugin's compiler could be a different version than Rack's compiler, link libstdc++ and libgcc statically to avoid ABI issues.
diff --git a/audio/cardinal/pkg-plist b/audio/cardinal/pkg-plist
index 685caa795a88..343ab4fdd29f 100644
--- a/audio/cardinal/pkg-plist
+++ b/audio/cardinal/pkg-plist
@@ -8,8 +8,8 @@ lib/lv2/CardinalFX.lv2/manifest.ttl
 lib/lv2/CardinalSynth.lv2/CardinalSynth.so
 lib/lv2/CardinalSynth.lv2/CardinalSynth.ttl
 lib/lv2/CardinalSynth.lv2/manifest.ttl
-lib/vst/CardinalFX.vst/CardinalFX.so
-lib/vst/CardinalSynth.vst/CardinalSynth.so
+lib/vst/Cardinal.vst/CardinalFX.so
+lib/vst/Cardinal.vst/CardinalSynth.so
 %%DATADIR%%/21kHz/res/Components/kHzButton_0.svg
 %%DATADIR%%/21kHz/res/Components/kHzButton_1.svg
 %%DATADIR%%/21kHz/res/Components/kHzKnob.svg
@@ -20,6 +20,26 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/21kHz/res/Panels/D_Inf.svg
 %%DATADIR%%/21kHz/res/Panels/PalmLoop.svg
 %%DATADIR%%/21kHz/res/Panels/TachyonEntangler.svg
+%%DATADIR%%/8Mode/res/8Mode_Knob1.svg
+%%DATADIR%%/8Mode/res/8Mode_ss_0.svg
+%%DATADIR%%/8Mode/res/8Mode_ss_1.svg
+%%DATADIR%%/8Mode/res/SNsoft_Panel.svg
+%%DATADIR%%/AaronStatic/res/ChordCV.svg
+%%DATADIR%%/AaronStatic/res/DiatonicCV.svg
+%%DATADIR%%/AaronStatic/res/RandomNoteCV.svg
+%%DATADIR%%/AaronStatic/res/ScaleCV.svg
+%%DATADIR%%/AaronStatic/res/fonts/PixelOperator.ttf
+%%DATADIR%%/Algoritmarte/res/Clockkky.svg
+%%DATADIR%%/Algoritmarte/res/CyclicCA.svg
+%%DATADIR%%/Algoritmarte/res/HoldMeTight.svg
+%%DATADIR%%/Algoritmarte/res/LEDSliderGreenHandle.svg
+%%DATADIR%%/Algoritmarte/res/LEDSliderLong.svg
+%%DATADIR%%/Algoritmarte/res/MusiFrog.svg
+%%DATADIR%%/Algoritmarte/res/MusiMath.svg
+%%DATADIR%%/Algoritmarte/res/Planetz.svg
+%%DATADIR%%/Algoritmarte/res/Zefiro.svg
+%%DATADIR%%/Algoritmarte/res/nunito/Nunito-Bold.ttf
+%%DATADIR%%/Algoritmarte/res/sudo/Sudo.ttf
 %%DATADIR%%/AmalgamatedHarmonics/res/Arp31c.svg
 %%DATADIR%%/AmalgamatedHarmonics/res/Arp32p.svg
 %%DATADIR%%/AmalgamatedHarmonics/res/Arpeggiator2.svg
@@ -50,6 +70,26 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/AmalgamatedHarmonics/res/SLN.svg
 %%DATADIR%%/AmalgamatedHarmonics/res/ScaleQuantizer.svg
 %%DATADIR%%/AmalgamatedHarmonics/res/ScaleQuantizerMkII.svg
+%%DATADIR%%/AnimatedCircuits/res/FoldingLight.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_Black_Light_21.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_Blue_Light_42.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_Cap_Light_42_fg.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_Grey_Light_42.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_Ring_Light_42_bg.svg
+%%DATADIR%%/AnimatedCircuits/res/Knob_White_Light_42.svg
+%%DATADIR%%/AnimatedCircuits/res/LFoldLight.svg
+%%DATADIR%%/AnimatedCircuits/res/PlugLight.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Blue_LinExp_ExpOn_Light.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Blue_LinExp_LinOn_Light.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Blue_TriSine_SineOn_Light.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Blue_TriSine_TriOn_Light.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Grey_Bi_Off.svg
+%%DATADIR%%/AnimatedCircuits/res/Switch_Grey_Bi_On.svg
+%%DATADIR%%/ArableInstruments/res/CKSS_rot_0.svg
+%%DATADIR%%/ArableInstruments/res/CKSS_rot_1.svg
+%%DATADIR%%/ArableInstruments/res/Joni.png
+%%DATADIR%%/ArableInstruments/res/Joni.svg
+%%DATADIR%%/ArableInstruments/res/Neil.svg
 %%DATADIR%%/AriaModules/res/components/fortune-off.svg
 %%DATADIR%%/AriaModules/res/components/fortune-on.svg
 %%DATADIR%%/AriaModules/res/components/grabby-bg.svg
@@ -365,6 +405,12 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/Autinn/res/VibratoModule.svg
 %%DATADIR%%/Autinn/res/VxyModule.svg
 %%DATADIR%%/Autinn/res/ZodModule.svg
+%%DATADIR%%/Axioma/res/AxiomaKnob.svg
+%%DATADIR%%/Axioma/res/AxiomaPort.svg
+%%DATADIR%%/Axioma/res/Ikeda.svg
+%%DATADIR%%/Axioma/res/Rhodonea.svg
+%%DATADIR%%/Axioma/res/Tesseract.svg
+%%DATADIR%%/Axioma/res/TheBifurcator.svg
 %%DATADIR%%/BaconPlugs/res/1f60d.svg
 %%DATADIR%%/BaconPlugs/res/1f953.svg
 %%DATADIR%%/BaconPlugs/res/BaconSliderHandle.svg
@@ -433,6 +479,57 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/BaconPlugs/res/midi/goldberg/988-v30.mid
 %%DATADIR%%/BaconPlugs/res/sabrog-25-down.svg
 %%DATADIR%%/BaconPlugs/res/sabrog-25-up.svg
+%%DATADIR%%/Befaco/res/components/BananutBlack.svg
+%%DATADIR%%/Befaco/res/components/BananutRed.svg
+%%DATADIR%%/Befaco/res/components/BefacoButton_0.svg
+%%DATADIR%%/Befaco/res/components/BefacoButton_1.svg
+%%DATADIR%%/Befaco/res/components/BefacoSlidePotHandleSmall.svg
+%%DATADIR%%/Befaco/res/components/BefacoSlidePotSmall.svg
+%%DATADIR%%/Befaco/res/components/BefacoSwitchHoriz_0.svg
+%%DATADIR%%/Befaco/res/components/BefacoSwitchHoriz_1.svg
+%%DATADIR%%/Befaco/res/components/BefacoSwitchHoriz_2.svg
+%%DATADIR%%/Befaco/res/components/BefacoTinyKnobBlack_bg.svg
+%%DATADIR%%/Befaco/res/components/BefacoTinyKnobDarkGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/BefacoTinyKnobLightGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/BefacoTinyKnobRed_bg.svg
+%%DATADIR%%/Befaco/res/components/BefacoTinyPointWhite.svg
+%%DATADIR%%/Befaco/res/components/CrossfaderBackground.svg
+%%DATADIR%%/Befaco/res/components/CrossfaderHandle.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hBlack.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hDarkGrey.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hDarkGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLargeGrey.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLargeGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLargeLightGrey.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLargeLightGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLightGrey.svg
+%%DATADIR%%/Befaco/res/components/Davies1900hLightGrey_bg.svg
+%%DATADIR%%/Befaco/res/components/Knurlie.svg
+%%DATADIR%%/Befaco/res/components/SwitchNarrowHoriz_0.svg
+%%DATADIR%%/Befaco/res/components/SwitchNarrowHoriz_1.svg
+%%DATADIR%%/Befaco/res/components/SwitchNarrow_0.svg
+%%DATADIR%%/Befaco/res/components/SwitchNarrow_1.svg
+%%DATADIR%%/Befaco/res/components/SwitchNarrow_2.svg
+%%DATADIR%%/Befaco/res/fonts/Segment7Standard.otf
+%%DATADIR%%/Befaco/res/panels/ABC.svg
+%%DATADIR%%/Befaco/res/panels/ADSR.svg
+%%DATADIR%%/Befaco/res/panels/ChoppingKinky.svg
+%%DATADIR%%/Befaco/res/panels/DualAtenuverter.svg
+%%DATADIR%%/Befaco/res/panels/EvenVCO.svg
+%%DATADIR%%/Befaco/res/panels/HexmixVCA.svg
+%%DATADIR%%/Befaco/res/panels/Kickall.svg
+%%DATADIR%%/Befaco/res/panels/Mex.svg
+%%DATADIR%%/Befaco/res/panels/Mixer.svg
+%%DATADIR%%/Befaco/res/panels/Morphader.svg
+%%DATADIR%%/Befaco/res/panels/Muxlicer.svg
+%%DATADIR%%/Befaco/res/panels/NoisePlethora.svg
+%%DATADIR%%/Befaco/res/panels/Percall.svg
+%%DATADIR%%/Befaco/res/panels/Rampage.svg
+%%DATADIR%%/Befaco/res/panels/STMix.svg
+%%DATADIR%%/Befaco/res/panels/SamplingModulator.svg
+%%DATADIR%%/Befaco/res/panels/SlewLimiter.svg
+%%DATADIR%%/Befaco/res/panels/SpringReverb.svg
+%%DATADIR%%/Befaco/res/panels/StereoStrip.svg
 %%DATADIR%%/Bidoo/res/ACNE.svg
 %%DATADIR%%/Bidoo/res/ANTN.svg
 %%DATADIR%%/Bidoo/res/BAFIS.svg
@@ -567,6 +664,7 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/Bidoo/res/VOID.svg
 %%DATADIR%%/Bidoo/res/ZINC.svg
 %%DATADIR%%/Bidoo/res/ZOUMAI.svg
+%%DATADIR%%/Bidoo/res/ZOUMAIExpander.svg
 %%DATADIR%%/BogaudioModules/res/AD-dark.svg
 %%DATADIR%%/BogaudioModules/res/AD-lowcontrast.svg
 %%DATADIR%%/BogaudioModules/res/AD.svg
@@ -973,6 +1071,7 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/BogaudioModules/res/slider_switch_2_14px_0.svg
 %%DATADIR%%/BogaudioModules/res/slider_switch_2_14px_1.svg
 %%DATADIR%%/Cardinal/res/AudioFile.svg
+%%DATADIR%%/Cardinal/res/AudioToCVPitch.svg
 %%DATADIR%%/Cardinal/res/Blank.svg
 %%DATADIR%%/Cardinal/res/Carla.svg
 %%DATADIR%%/Cardinal/res/ExpanderMIDI.svg
@@ -988,6 +1087,63 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/Cardinal/res/MPV.svg
 %%DATADIR%%/Cardinal/res/Miku/Miku.png
 %%DATADIR%%/Cardinal/res/glBars.svg
+%%DATADIR%%/CatroModulo/res/CM-1.svg
+%%DATADIR%%/CatroModulo/res/CM-10.svg
+%%DATADIR%%/CatroModulo/res/CM-2.svg
+%%DATADIR%%/CatroModulo/res/CM-3.svg
+%%DATADIR%%/CatroModulo/res/CM-4.svg
+%%DATADIR%%/CatroModulo/res/CM-5.svg
+%%DATADIR%%/CatroModulo/res/CM-6.svg
+%%DATADIR%%/CatroModulo/res/CM-7.svg
+%%DATADIR%%/CatroModulo/res/CM-8.svg
+%%DATADIR%%/CatroModulo/res/CM-9.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_small_0.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_small_1.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_small_3_0.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_small_3_1.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_small_3_2.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_smallh_0.svg
+%%DATADIR%%/CatroModulo/res/CM-TS_smallh_1.svg
+%%DATADIR%%/CatroModulo/res/CM-button_small_red.svg
+%%DATADIR%%/CatroModulo/res/CM-button_small_red_dn.svg
+%%DATADIR%%/CatroModulo/res/CM-indicator_bigeye.svg
+%%DATADIR%%/CatroModulo/res/CM-input_bpm.svg
+%%DATADIR%%/CatroModulo/res/CM-input_def.svg
+%%DATADIR%%/CatroModulo/res/CM-input_def_tinybuttonL.svg
+%%DATADIR%%/CatroModulo/res/CM-input_def_tinybuttonL_dn.svg
+%%DATADIR%%/CatroModulo/res/CM-input_def_tinybuttonR.svg
+%%DATADIR%%/CatroModulo/res/CM-input_def_tinybuttonR_dn.svg
+%%DATADIR%%/CatroModulo/res/CM-input_ext.svg
+%%DATADIR%%/CatroModulo/res/CM-input_small.svg
+%%DATADIR%%/CatroModulo/res/CM-input_small_tinybuttonL.svg
+%%DATADIR%%/CatroModulo/res/CM-input_small_tinybuttonL_dn.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_big_attn.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_big_def.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_big_offset.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_big_red.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_bigeye.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_huge_red.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_small_def.svg
+%%DATADIR%%/CatroModulo/res/CM-knob_small_red.svg
+%%DATADIR%%/CatroModulo/res/CM-ledbutton_mini_0.svg
+%%DATADIR%%/CatroModulo/res/CM-ledbutton_mini_1.svg
+%%DATADIR%%/CatroModulo/res/CM-output_bpm.svg
+%%DATADIR%%/CatroModulo/res/CM-output_def.svg
+%%DATADIR%%/CatroModulo/res/CM-output_def_dark.svg
+%%DATADIR%%/CatroModulo/res/CM-output_small.svg
+%%DATADIR%%/CatroModulo/res/CM-pot1_big.svg
+%%DATADIR%%/CatroModulo/res/CM-pot1_huge.svg
+%%DATADIR%%/CatroModulo/res/CM-pot1_small.svg
+%%DATADIR%%/CatroModulo/res/CM-recbutton.svg
+%%DATADIR%%/CatroModulo/res/CM-recbutton_dn.svg
+%%DATADIR%%/CatroModulo/res/CM-slider_big_red.svg
+%%DATADIR%%/CatroModulo/res/CM-slider_big_red_bg.svg
+%%DATADIR%%/CatroModulo/res/CM-tryme_button.svg
+%%DATADIR%%/CatroModulo/res/CM-tryme_button_dn.svg
+%%DATADIR%%/CatroModulo/res/CM8_normoff.svg
+%%DATADIR%%/CatroModulo/res/CM8_normon.svg
+%%DATADIR%%/CatroModulo/res/CM9_ledinc.svg
+%%DATADIR%%/CatroModulo/res/Segment7Standard.ttf
 %%DATADIR%%/ChowDSP/res/ChowChorus.svg
 %%DATADIR%%/ChowDSP/res/ChowDer.svg
 %%DATADIR%%/ChowDSP/res/ChowFDN.svg
@@ -1330,6 +1486,96 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/FehlerFabrik/res/Planck.svg
 %%DATADIR%%/FehlerFabrik/res/Rasoir.svg
 %%DATADIR%%/FehlerFabrik/res/Sigma.svg
+%%DATADIR%%/Fundamental/presets/Quantizer/00_Ionian (Major).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/01_Dorian.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/02_Phrygian.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/03_Lydian.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/04_Mixolydian.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/05_Aeolian (Minor).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/06_Locrian.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/07_Aeolian 7 (Harmonic Minor).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/08_Locrian 6.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/09_Ionian #5.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/10_Dorian #4.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/11_Phrygian 3.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/12_Lydian #2.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/13_Locrian b4 bb7.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/14_Aeolian 6 7 (Melodic Minor).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/15_Phrygian 6.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/16_Lydian #5.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/17_Lydian b7.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/18_Aeolian 3.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/19_Locrian 2.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/20_Locrian b4.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/21_Bebop Dominant.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/22_Bebop Major.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/23_Bebop Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/24_Bebop Melodic Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/25_Blues Major.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/26_Blues Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/27_Blues Diminished.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/28_Blues Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/29_Blues Rock'n'Roll.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/30_Byzantine.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/31_Hungarian Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/32_Hungarian Gypsy.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/33_Spanish Gypsy.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/34_Major Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/35_Neutral Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/36_Rock Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/37_Scottish Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/38_Minor Pentatonic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/39_Whole.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/40_Whole-Half.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/41_Half-Whole.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/42_Augmented.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/43_Byzantine.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/44_Chromatic.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/45_Enigmatic (Ascending).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/46_Enigmatic (Descending).vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/47_Hungarian Major.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/48_Hungarian Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/49_Neapolitan Major.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/50_Neapolitan Minor.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/51_Overtone.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/52_Prometheus.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/53_Prometheus Neapolitan.vcvm
+%%DATADIR%%/Fundamental/presets/Quantizer/54_Spanish 8 Tone.vcvm
+%%DATADIR%%/Fundamental/res/8vert.svg
+%%DATADIR%%/Fundamental/res/ADSR.svg
+%%DATADIR%%/Fundamental/res/Delay.svg
+%%DATADIR%%/Fundamental/res/LFO.svg
+%%DATADIR%%/Fundamental/res/Merge.svg
+%%DATADIR%%/Fundamental/res/MidSide.svg
+%%DATADIR%%/Fundamental/res/Mixer.svg
+%%DATADIR%%/Fundamental/res/Mutes.svg
+%%DATADIR%%/Fundamental/res/Noise.svg
+%%DATADIR%%/Fundamental/res/Octave.svg
+%%DATADIR%%/Fundamental/res/Pulses.svg
+%%DATADIR%%/Fundamental/res/Quantizer.svg
+%%DATADIR%%/Fundamental/res/Random.svg
+%%DATADIR%%/Fundamental/res/SEQ3.svg
+%%DATADIR%%/Fundamental/res/Scope.svg
+%%DATADIR%%/Fundamental/res/SequentialSwitch1.svg
+%%DATADIR%%/Fundamental/res/SequentialSwitch2.svg
+%%DATADIR%%/Fundamental/res/Split.svg
+%%DATADIR%%/Fundamental/res/Sum.svg
+%%DATADIR%%/Fundamental/res/VCA-1.svg
+%%DATADIR%%/Fundamental/res/VCA.svg
+%%DATADIR%%/Fundamental/res/VCF.svg
+%%DATADIR%%/Fundamental/res/VCMixer.svg
+%%DATADIR%%/Fundamental/res/VCO.svg
+%%DATADIR%%/Fundamental/res/WTLFO.svg
+%%DATADIR%%/Fundamental/res/WTVCO.svg
+%%DATADIR%%/Fundamental/res/components/ADSR-bg.svg
+%%DATADIR%%/Fundamental/res/components/Scope-bg.svg
+%%DATADIR%%/Fundamental/res/components/button-off.svg
+%%DATADIR%%/Fundamental/res/components/button-on.svg
+%%DATADIR%%/Fundamental/res/components/knob-marker-small.svg
+%%DATADIR%%/Fundamental/res/components/knob-marker.svg
+%%DATADIR%%/Fundamental/res/components/knob-small.svg
+%%DATADIR%%/Fundamental/res/components/knob.svg
+%%DATADIR%%/Fundamental/res/components/port.svg
 %%DATADIR%%/GlueTheGiant/res/BusDepot.svg
 %%DATADIR%%/GlueTheGiant/res/BusDepot_Night.svg
 %%DATADIR%%/GlueTheGiant/res/BusRoute.svg
@@ -1384,6 +1630,28 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/GlueTheGiant/res/components/ScrewUp_Night.svg
 %%DATADIR%%/GlueTheGiant/res/fonts/DSEG7-Classic-MINI/DSEG7ClassicMini-Bold.ttf
 %%DATADIR%%/GlueTheGiant/res/fonts/DSEG7-Classic-MINI/DSEG7ClassicMini-Regular.ttf
+%%DATADIR%%/GoodSheperd/res/Holzschnabel.svg
+%%DATADIR%%/GoodSheperd/res/Hurdle.svg
+%%DATADIR%%/GoodSheperd/res/SEQ3st.svg
+%%DATADIR%%/GoodSheperd/res/Seqtrol.svg
+%%DATADIR%%/GoodSheperd/res/Stable16.svg
+%%DATADIR%%/GoodSheperd/res/Stall.svg
+%%DATADIR%%/GoodSheperd/res/Switch1.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowDown_0.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowDown_1.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowLeft_0.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowLeft_1.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowRight_0.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowRight_1.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowUp_0.svg
+%%DATADIR%%/GoodSheperd/res/components/ArrowUp_1.svg
+%%DATADIR%%/GoodSheperd/res/components/SquareSwitch_0.svg
+%%DATADIR%%/GoodSheperd/res/components/SquareSwitch_1.svg
+%%DATADIR%%/GrandeModular/presets/LFO4/01_Golden_ratio-1.618x.vcvm
+%%DATADIR%%/GrandeModular/presets/LFO4/02_Silver_ratio-2.414x.vcvm
+%%DATADIR%%/GrandeModular/presets/LFO4/03_Bronze_ratio-3.303x.vcvm
+%%DATADIR%%/GrandeModular/presets/LFO4/04_Copper_ratio-4.236x.vcvm
+%%DATADIR%%/GrandeModular/presets/LFO4/05_Nickel_ratio-5.193x.vcvm
 %%DATADIR%%/GrandeModular/presets/Quant/01_Chromatic.vcvm
 %%DATADIR%%/GrandeModular/presets/Quant/02_Major.vcvm
 %%DATADIR%%/GrandeModular/presets/Quant/03_Dorian.vcvm
@@ -1416,39 +1684,55 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/GrandeModular/res/BlackButton1.svg
 %%DATADIR%%/GrandeModular/res/Clip.svg
 %%DATADIR%%/GrandeModular/res/LFO3.svg
+%%DATADIR%%/GrandeModular/res/LFO4.svg
+%%DATADIR%%/GrandeModular/res/Logic.svg
 %%DATADIR%%/GrandeModular/res/MediumLightFlat.svg
 %%DATADIR%%/GrandeModular/res/Merge8.svg
 %%DATADIR%%/GrandeModular/res/MergeSplit4.svg
 %%DATADIR%%/GrandeModular/res/MicrotonalChords.svg
 %%DATADIR%%/GrandeModular/res/MicrotonalNotes.svg
 %%DATADIR%%/GrandeModular/res/NoteMT.svg
+%%DATADIR%%/GrandeModular/res/Peak.svg
 %%DATADIR%%/GrandeModular/res/PetiteLight.svg
 %%DATADIR%%/GrandeModular/res/PetiteLightBot.svg
 %%DATADIR%%/GrandeModular/res/PetiteLightFlat.svg
 %%DATADIR%%/GrandeModular/res/PetiteLightTop.svg
 %%DATADIR%%/GrandeModular/res/PolyMergeResplit.svg
 %%DATADIR%%/GrandeModular/res/PolySplit.svg
+%%DATADIR%%/GrandeModular/res/Push.svg
 %%DATADIR%%/GrandeModular/res/Quant.svg
 %%DATADIR%%/GrandeModular/res/QuantIntervals.svg
 %%DATADIR%%/GrandeModular/res/QuantMT.svg
 %%DATADIR%%/GrandeModular/res/RectButton0.svg
 %%DATADIR%%/GrandeModular/res/RectButton1.svg
+%%DATADIR%%/GrandeModular/res/RectButton1dim.svg
 %%DATADIR%%/GrandeModular/res/SampleDelays.svg
 %%DATADIR%%/GrandeModular/res/Scale.svg
 %%DATADIR%%/GrandeModular/res/SmallLEDButton0.svg
 %%DATADIR%%/GrandeModular/res/SmallLEDButton1.svg
 %%DATADIR%%/GrandeModular/res/SmallLightBot.svg
+%%DATADIR%%/GrandeModular/res/SmallLightFlat.svg
 %%DATADIR%%/GrandeModular/res/SmallLightTop.svg
 %%DATADIR%%/GrandeModular/res/Split8.svg
+%%DATADIR%%/GrandeModular/res/SquareButton0.svg
+%%DATADIR%%/GrandeModular/res/SquareButton1.svg
+%%DATADIR%%/GrandeModular/res/SquareButton1dim.svg
 %%DATADIR%%/GrandeModular/res/Tails.svg
 %%DATADIR%%/GrandeModular/res/TinyLightFlat.svg
 %%DATADIR%%/GrandeModular/res/TriangleLEDButton0.svg
 %%DATADIR%%/GrandeModular/res/TriangleLEDButton1.svg
 %%DATADIR%%/GrandeModular/res/TriangleLightFlat.svg
 %%DATADIR%%/GrandeModular/res/VCA3.svg
+%%DATADIR%%/GrandeModular/res/VCA4.svg
 %%DATADIR%%/GrandeModular/res/VarSampleDelays.svg
 %%DATADIR%%/GrandeModular/res/WhiteButton0.svg
 %%DATADIR%%/GrandeModular/res/WhiteButton1.svg
+%%DATADIR%%/HamptonHarmonics/res/Arp.svg
+%%DATADIR%%/HamptonHarmonics/res/PixelOperator.ttf
+%%DATADIR%%/HamptonHarmonics/res/Progress.svg
+%%DATADIR%%/HamptonHarmonics/res/davies_gray_medium.svg
+%%DATADIR%%/HamptonHarmonics/res/davies_maroon_large.svg
+%%DATADIR%%/HamptonHarmonics/res/davies_maroon_medium.svg
 %%DATADIR%%/HetrickCV/res/1OpChaos.svg
 %%DATADIR%%/HetrickCV/res/2OpChaos.svg
 %%DATADIR%%/HetrickCV/res/2To4.svg
@@ -1534,10 +1818,12 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/ImpromptuModular/res/panels/PhraseSeqExpander.svg
 %%DATADIR%%/ImpromptuModular/res/panels/ProbKey.svg
 %%DATADIR%%/ImpromptuModular/res/panels/SemiModular.svg
+%%DATADIR%%/ImpromptuModular/res/panels/Sygen.svg
 %%DATADIR%%/ImpromptuModular/res/panels/Tact.svg
 %%DATADIR%%/ImpromptuModular/res/panels/Tact1.svg
 %%DATADIR%%/ImpromptuModular/res/panels/TactG.svg
 %%DATADIR%%/ImpromptuModular/res/panels/TwelveKey.svg
+%%DATADIR%%/ImpromptuModular/res/panels/Variations.svg
 %%DATADIR%%/ImpromptuModular/res/panels/WriteSeq32.svg
 %%DATADIR%%/ImpromptuModular/res/panels/WriteSeq64.svg
 %%DATADIR%%/JW-Modules/res/Add5.svg
@@ -1629,6 +1915,15 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/LifeFormModular/res/QuadUtility.svg
 %%DATADIR%%/LifeFormModular/res/SequenceModeler.svg
 %%DATADIR%%/LifeFormModular/res/TimeDiktat.svg
+%%DATADIR%%/LilacLoop/res/LargeWarmButton_0.svg
+%%DATADIR%%/LilacLoop/res/LargeWarmButton_1.svg
+%%DATADIR%%/LilacLoop/res/Looper.svg
+%%DATADIR%%/LilacLoop/res/LooperTwo.svg
+%%DATADIR%%/LilacLoop/res/Port.svg
+%%DATADIR%%/LilacLoop/res/WarmButton_0.svg
+%%DATADIR%%/LilacLoop/res/WarmButton_1.svg
+%%DATADIR%%/LilacLoop/res/WarmKnob.svg
+%%DATADIR%%/LilacLoop/res/WarmLEDButton.svg
 %%DATADIR%%/LittleUtils/res/Bias_Semitone.svg
 %%DATADIR%%/LittleUtils/res/ButtonModule.svg
 %%DATADIR%%/LittleUtils/res/Button_button_0.svg
@@ -1661,6 +1956,7 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/LyraeModules/presets/Vega/30bpm.vcvm
 %%DATADIR%%/LyraeModules/presets/Vega/60bpm.vcvm
 %%DATADIR%%/LyraeModules/res/BD383238.svg
+%%DATADIR%%/LyraeModules/res/BD383238gen.svg
 %%DATADIR%%/LyraeModules/res/Bolt.svg
 %%DATADIR%%/LyraeModules/res/Gamma.svg
 %%DATADIR%%/LyraeModules/res/HexKnob.svg
@@ -1671,13 +1967,16 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/LyraeModules/res/Sulafat.svg
 %%DATADIR%%/LyraeModules/res/Vega.svg
 %%DATADIR%%/LyraeModules/res/VegaOld.svg
+%%DATADIR%%/LyraeModules/res/Vegagen.svg
 %%DATADIR%%/LyraeModules/res/Vegarawtxt.svg
+%%DATADIR%%/LyraeModules/res/Vegatest.svg
 %%DATADIR%%/LyraeModules/res/Zeta.svg
 %%DATADIR%%/LyraeModules/res/ZetaAlt.svg
 %%DATADIR%%/LyraeModules/res/Zetab.svg
 %%DATADIR%%/LyraeModules/res/ZetabAlt.svg
 %%DATADIR%%/LyraeModules/res/Zetac.svg
 %%DATADIR%%/LyraeModules/res/ZetacAlt.svg
+%%DATADIR%%/LyraeModules/res/Zetal.svg
 %%DATADIR%%/LyraeModules/res/button18_0.svg
 %%DATADIR%%/LyraeModules/res/button18_1.svg
 %%DATADIR%%/LyraeModules/res/button18_2.svg
@@ -1685,8 +1984,209 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/LyraeModules/res/button9_1.svg
 %%DATADIR%%/LyraeModules/res/button9_2.svg
 %%DATADIR%%/LyraeModules/res/delta1.svg
-%%DATADIR%%/LyraeModules/res/drawing.svg
 %%DATADIR%%/LyraeModules/res/lyrae.svg
+%%DATADIR%%/ML_modules/res/Arpeggiator.svg
+%%DATADIR%%/ML_modules/res/Arpeggiator_orig.svg
+%%DATADIR%%/ML_modules/res/BPMdetect.svg
+%%DATADIR%%/ML_modules/res/BPMdetect_orig.svg
+%%DATADIR%%/ML_modules/res/CKSS_0.svg
+%%DATADIR%%/ML_modules/res/CKSS_1.svg
+%%DATADIR%%/ML_modules/res/Cloner.svg
+%%DATADIR%%/ML_modules/res/Cloner_orig.svg
+%%DATADIR%%/ML_modules/res/Constants.svg
+%%DATADIR%%/ML_modules/res/Constants_orig.svg
+%%DATADIR%%/ML_modules/res/Counter.svg
+%%DATADIR%%/ML_modules/res/Counter_orig.svg
+%%DATADIR%%/ML_modules/res/DejaVuSansMono.ttf
+%%DATADIR%%/ML_modules/res/FreeVerb.svg
+%%DATADIR%%/ML_modules/res/FreeVerb_orig.svg
+%%DATADIR%%/ML_modules/res/Jack.svg
+%%DATADIR%%/ML_modules/res/Jack_out.svg
+%%DATADIR%%/ML_modules/res/LEDButton.svg
+%%DATADIR%%/ML_modules/res/LEDButton_medium.svg
+%%DATADIR%%/ML_modules/res/LEDButton_small.svg
+%%DATADIR%%/ML_modules/res/MLButton_0.svg
+%%DATADIR%%/ML_modules/res/MLButton_1.svg
+%%DATADIR%%/ML_modules/res/MLScrew.svg
+%%DATADIR%%/ML_modules/res/NewKnob_28.svg
+%%DATADIR%%/ML_modules/res/NewKnob_28_bg.svg
+%%DATADIR%%/ML_modules/res/NewKnob_36.svg
+%%DATADIR%%/ML_modules/res/NewKnob_36_bg.svg
+%%DATADIR%%/ML_modules/res/NewRedKnob_28.svg
+%%DATADIR%%/ML_modules/res/NewRedKnob_36.svg
+%%DATADIR%%/ML_modules/res/OctaFlop.svg
+%%DATADIR%%/ML_modules/res/OctaFlop_orig.svg
+%%DATADIR%%/ML_modules/res/OctaPlus.svg
+%%DATADIR%%/ML_modules/res/OctaPlus_orig.svg
+%%DATADIR%%/ML_modules/res/OctaSwitch.svg
+%%DATADIR%%/ML_modules/res/OctaSwitch_orig.svg
+%%DATADIR%%/ML_modules/res/OctaTimes.svg
+%%DATADIR%%/ML_modules/res/OctaTimes_orig.svg
+%%DATADIR%%/ML_modules/res/OctaTrig.svg
+%%DATADIR%%/ML_modules/res/OctaTrig_orig.svg
+%%DATADIR%%/ML_modules/res/PolySplitter.svg
+%%DATADIR%%/ML_modules/res/PolySplitter_orig.svg
+%%DATADIR%%/ML_modules/res/Quantizer.svg
+%%DATADIR%%/ML_modules/res/Quantizer_orig.svg
+%%DATADIR%%/ML_modules/res/Quantum.svg
+%%DATADIR%%/ML_modules/res/Quantum_orig.svg
+%%DATADIR%%/ML_modules/res/SH8.svg
+%%DATADIR%%/ML_modules/res/SH8_orig.svg
+%%DATADIR%%/ML_modules/res/Segment7Standard.ttf
+%%DATADIR%%/ML_modules/res/SeqSwitch.svg
+%%DATADIR%%/ML_modules/res/SeqSwitch2.svg
+%%DATADIR%%/ML_modules/res/SeqSwitch2_orig.svg
+%%DATADIR%%/ML_modules/res/SeqSwitch_orig.svg
+%%DATADIR%%/ML_modules/res/ShiftReg.svg
+%%DATADIR%%/ML_modules/res/ShiftReg2.svg
+%%DATADIR%%/ML_modules/res/ShiftReg2_orig.svg
+%%DATADIR%%/ML_modules/res/ShiftReg_orig.svg
+%%DATADIR%%/ML_modules/res/Slider_3_Horiz_0.svg
+%%DATADIR%%/ML_modules/res/Slider_3_Horiz_1.svg
+%%DATADIR%%/ML_modules/res/Slider_3_Horiz_2.svg
+%%DATADIR%%/ML_modules/res/SmallButton_0.svg
+%%DATADIR%%/ML_modules/res/SmallButton_1.svg
+%%DATADIR%%/ML_modules/res/SmallButton_Dn_0.svg
+%%DATADIR%%/ML_modules/res/SmallButton_Dn_1.svg
+%%DATADIR%%/ML_modules/res/SmallButton_Up_0.svg
+%%DATADIR%%/ML_modules/res/SmallButton_Up_1.svg
+%%DATADIR%%/ML_modules/res/Sum8.svg
+%%DATADIR%%/ML_modules/res/Sum8_orig.svg
+%%DATADIR%%/ML_modules/res/Sum8mk2.svg
+%%DATADIR%%/ML_modules/res/Sum8mk2_orig.svg
+%%DATADIR%%/ML_modules/res/Sum8mk3.svg
+%%DATADIR%%/ML_modules/res/Sum8mk3_orig.svg
+%%DATADIR%%/ML_modules/res/TrigBuf.svg
+%%DATADIR%%/ML_modules/res/TrigBuf_orig.svg
+%%DATADIR%%/ML_modules/res/TrigDelay.svg
+%%DATADIR%%/ML_modules/res/TrigDelay_orig.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch2.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch2_orig.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch3.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch3_2.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch3_2_orig.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch3_orig.svg
+%%DATADIR%%/ML_modules/res/TrigSwitch_orig.svg
+%%DATADIR%%/ML_modules/res/VoltMeter.svg
+%%DATADIR%%/ML_modules/res/VoltMeter_orig.svg
+%%DATADIR%%/MSM/res/Button/ButtonGreen0.svg
+%%DATADIR%%/MSM/res/Button/ButtonGreen1.svg
+%%DATADIR%%/MSM/res/Button/ColorButton0.svg
+%%DATADIR%%/MSM/res/Button/ColorButton1.svg
+%%DATADIR%%/MSM/res/Button/ColorButton2.svg
+%%DATADIR%%/MSM/res/Button/ColorButton3.svg
+%%DATADIR%%/MSM/res/Button/ColorButton4.svg
+%%DATADIR%%/MSM/res/Button/ColorButton5.svg
+%%DATADIR%%/MSM/res/Button/Easteregg_0.svg
+%%DATADIR%%/MSM/res/Button/Easteregg_1.svg
+%%DATADIR%%/MSM/res/Button/GreyRoundToggle_0.svg
+%%DATADIR%%/MSM/res/Button/GreyRoundToggle_1.svg
+%%DATADIR%%/MSM/res/Fonts/DejaVuSansMono.ttf
+%%DATADIR%%/MSM/res/Fonts/Segment7Standard.ttf
+%%DATADIR%%/MSM/res/Fonts/Sudo.ttf
+%%DATADIR%%/MSM/res/Knobs/BlueLargeKnob.svg
+%%DATADIR%%/MSM/res/Knobs/BlueSmallKnob.svg
+%%DATADIR%%/MSM/res/Knobs/GreenLargeKnob.svg
+%%DATADIR%%/MSM/res/Knobs/GreenSmallKnob.svg
+%%DATADIR%%/MSM/res/Knobs/GreenTinyKnob.svg
+%%DATADIR%%/MSM/res/Knobs/GreyLargeKnob.svg
+%%DATADIR%%/MSM/res/Knobs/GreySmallKnob.svg
+%%DATADIR%%/MSM/res/Knobs/RedLargeKnob.svg
+%%DATADIR%%/MSM/res/Knobs/RedLargeKnob3d.svg
+%%DATADIR%%/MSM/res/Knobs/RedSmallKnob.svg
+%%DATADIR%%/MSM/res/Knobs/VioLargeKnob.svg
+%%DATADIR%%/MSM/res/Knobs/YellowSmallKnob.svg
+%%DATADIR%%/MSM/res/Lights/BlueLight_0.svg
+%%DATADIR%%/MSM/res/Lights/BlueLight_1.svg
+%%DATADIR%%/MSM/res/Panels/ADSR-Dark.svg
+%%DATADIR%%/MSM/res/Panels/ADSR.svg
+%%DATADIR%%/MSM/res/Panels/BVCO-Dark.svg
+%%DATADIR%%/MSM/res/Panels/BVCO.svg
+%%DATADIR%%/MSM/res/Panels/Bitcrusher-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Bitcrusher.svg
+%%DATADIR%%/MSM/res/Panels/BlankPanelDark.svg
+%%DATADIR%%/MSM/res/Panels/BlankPanelLight.svg
+%%DATADIR%%/MSM/res/Panels/CrazyMult-Dark.svg
+%%DATADIR%%/MSM/res/Panels/CrazyMult.svg
+%%DATADIR%%/MSM/res/Panels/Delay-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Delay.svg
+%%DATADIR%%/MSM/res/Panels/Fade-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Fade.svg
+%%DATADIR%%/MSM/res/Panels/MLFO-Dark.svg
+%%DATADIR%%/MSM/res/Panels/MLFO.svg
+%%DATADIR%%/MSM/res/Panels/MSVCO-Dark.svg
+%%DATADIR%%/MSM/res/Panels/MSVCO-Espen-Front.svg
+%%DATADIR%%/MSM/res/Panels/MSVCO-Omri-Front.svg
+%%DATADIR%%/MSM/res/Panels/MSVCO.svg
+%%DATADIR%%/MSM/res/Panels/Morpher-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Morpher.svg
+%%DATADIR%%/MSM/res/Panels/Mult-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Mult.svg
+%%DATADIR%%/MSM/res/Panels/Noise-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Noise.svg
+%%DATADIR%%/MSM/res/Panels/Phaser-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Phaser.svg
+%%DATADIR%%/MSM/res/Panels/RandomSource-Dark.svg
+%%DATADIR%%/MSM/res/Panels/RandomSource.svg
+%%DATADIR%%/MSM/res/Panels/RingMod-Dark.svg
+%%DATADIR%%/MSM/res/Panels/RingMod.svg
+%%DATADIR%%/MSM/res/Panels/SimpleSlider-Dark.svg
+%%DATADIR%%/MSM/res/Panels/SimpleSlider.svg
+%%DATADIR%%/MSM/res/Panels/TVCF-Dark.svg
+%%DATADIR%%/MSM/res/Panels/TVCF.svg
+%%DATADIR%%/MSM/res/Panels/TriVCO-Dark.svg
+%%DATADIR%%/MSM/res/Panels/TriVCO.svg
+%%DATADIR%%/MSM/res/Panels/VCA-Dark.svg
+%%DATADIR%%/MSM/res/Panels/VCA.svg
+%%DATADIR%%/MSM/res/Panels/VCO-Dark.svg
+%%DATADIR%%/MSM/res/Panels/VCO.svg
+%%DATADIR%%/MSM/res/Panels/WaveShaper-Dark.svg
+%%DATADIR%%/MSM/res/Panels/WaveShaper.svg
+%%DATADIR%%/MSM/res/Panels/Wavefolder-Dark.svg
+%%DATADIR%%/MSM/res/Panels/Wavefolder.svg
+%%DATADIR%%/MSM/res/Panels/XSEQ-Dark.svg
+%%DATADIR%%/MSM/res/Panels/XSEQ-Expension-Dark.svg
+%%DATADIR%%/MSM/res/Panels/XSEQ-Expension.svg
+%%DATADIR%%/MSM/res/Panels/XSEQ.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPort.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPortA.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPortB.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPortC.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPortD.svg
+%%DATADIR%%/MSM/res/Port/SilverSixPortE.svg
+%%DATADIR%%/MSM/res/Screws/MScrewA.svg
+%%DATADIR%%/MSM/res/Screws/MScrewB.svg
+%%DATADIR%%/MSM/res/Screws/MScrewC.svg
+%%DATADIR%%/MSM/res/Screws/MScrewD.svg
+%%DATADIR%%/MSM/res/Slider/SlidePot.svg
+%%DATADIR%%/MSM/res/Slider/SlidePotHandle.svg
+%%DATADIR%%/MSM/res/Slider/slider.svg
+%%DATADIR%%/MSM/res/Slider/sliderhandle.svg
+%%DATADIR%%/MSM/res/Switch/CKSSThree_0.svg
+%%DATADIR%%/MSM/res/Switch/CKSSThree_1.svg
+%%DATADIR%%/MSM/res/Switch/CKSSThree_2.svg
+%%DATADIR%%/MSM/res/Switch/FMSM_0.svg
+%%DATADIR%%/MSM/res/Switch/FMSM_1.svg
+%%DATADIR%%/MSM/res/Switch/FMSM_2.svg
+%%DATADIR%%/MSM/res/Switch/FMSM_3.svg
+%%DATADIR%%/MSM/res/Switch/VioMSwitchVert_0.svg
+%%DATADIR%%/MSM/res/Switch/VioMSwitchVert_1.svg
+%%DATADIR%%/MSM/res/Switch/VioMSwitch_0.svg
+%%DATADIR%%/MSM/res/Switch/VioMSwitch_1.svg
+%%DATADIR%%/Meander/res/Bravura.otf
+%%DATADIR%%/Meander/res/DejaVu-LICENSE.txt
+%%DATADIR%%/Meander/res/DejaVuSansMono.ttf
+%%DATADIR%%/Meander/res/Meander-Demo-Patch.png
+%%DATADIR%%/Meander/res/Meander-dark.png
+%%DATADIR%%/Meander/res/Meander-dark.svg
+%%DATADIR%%/Meander/res/Meander-light.png
+%%DATADIR%%/Meander/res/Meander-light.svg
+%%DATADIR%%/Meander/res/Meander.png
+%%DATADIR%%/Meander/res/Meander.svg
+%%DATADIR%%/Meander/res/OFL.txt
+%%DATADIR%%/Meander/res/TinyPJ301M.svg
+%%DATADIR%%/Meander/res/Ubuntu Condensed 400.ttf
 %%DATADIR%%/MindMeldModular/res/ShapeMaster/CommunityPresets/Circadian Sound/Creative/Pluck Swell (Warped).smpr
 %%DATADIR%%/MindMeldModular/res/ShapeMaster/CommunityPresets/Circadian Sound/Creative/Pluck(Ping)-Swell(Pong).smpr
 %%DATADIR%%/MindMeldModular/res/ShapeMaster/CommunityPresets/Circadian Sound/Creative/Ramp (Riser).smpr
@@ -2596,8 +3096,60 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/MindMeldModular/res/dark/unmeld-9-16.svg
 %%DATADIR%%/MindMeldModular/res/dark/unmeld-grp-aux.svg
 %%DATADIR%%/MindMeldModular/res/fonts/RobotoCondensed-Regular.ttf
+%%DATADIR%%/MockbaModular/res/Blank.svg
+%%DATADIR%%/MockbaModular/res/CZDblSine.svg
+%%DATADIR%%/MockbaModular/res/CZOsc.svg
+%%DATADIR%%/MockbaModular/res/CZPulse.svg
+%%DATADIR%%/MockbaModular/res/CZReso1.svg
+%%DATADIR%%/MockbaModular/res/CZReso2.svg
+%%DATADIR%%/MockbaModular/res/CZReso3.svg
+%%DATADIR%%/MockbaModular/res/CZSaw.svg
+%%DATADIR%%/MockbaModular/res/CZSawPulse.svg
+%%DATADIR%%/MockbaModular/res/CZSquare.svg
+%%DATADIR%%/MockbaModular/res/Comparator.svg
+%%DATADIR%%/MockbaModular/res/Countah.svg
+%%DATADIR%%/MockbaModular/res/Dividah.svg
+%%DATADIR%%/MockbaModular/res/DualAND.svg
+%%DATADIR%%/MockbaModular/res/DualBUFFER.svg
+%%DATADIR%%/MockbaModular/res/DualNAND.svg
+%%DATADIR%%/MockbaModular/res/DualNOR.svg
+%%DATADIR%%/MockbaModular/res/DualNOT.svg
+%%DATADIR%%/MockbaModular/res/DualOR.svg
+%%DATADIR%%/MockbaModular/res/DualXNOR.svg
+%%DATADIR%%/MockbaModular/res/DualXOR.svg
+%%DATADIR%%/MockbaModular/res/Empty_dark.svg
+%%DATADIR%%/MockbaModular/res/Empty_gray.svg
+%%DATADIR%%/MockbaModular/res/Empty_light.svg
+%%DATADIR%%/MockbaModular/res/Feidah.svg
+%%DATADIR%%/MockbaModular/res/FeidahS.svg
+%%DATADIR%%/MockbaModular/res/Filtah.svg
+%%DATADIR%%/MockbaModular/res/HSW_0.svg
+%%DATADIR%%/MockbaModular/res/HSW_1.svg
+%%DATADIR%%/MockbaModular/res/HSW_2.svg
+%%DATADIR%%/MockbaModular/res/Holdah.svg
+%%DATADIR%%/MockbaModular/res/MaugOsc.svg
+%%DATADIR%%/MockbaModular/res/MaugSaw.svg
+%%DATADIR%%/MockbaModular/res/MaugSaw2.svg
+%%DATADIR%%/MockbaModular/res/MaugShark.svg
+%%DATADIR%%/MockbaModular/res/MaugSquare.svg
+%%DATADIR%%/MockbaModular/res/MaugSquare2.svg
+%%DATADIR%%/MockbaModular/res/MaugSquare3.svg
+%%DATADIR%%/MockbaModular/res/MaugTriangle.svg
+%%DATADIR%%/MockbaModular/res/Mixah.svg
+%%DATADIR%%/MockbaModular/res/Mixah3.svg
+%%DATADIR%%/MockbaModular/res/PSelectah.svg
+%%DATADIR%%/MockbaModular/res/Pannah.svg
+%%DATADIR%%/MockbaModular/res/ReVoltah.svg
+%%DATADIR%%/MockbaModular/res/Selectah.svg
+%%DATADIR%%/MockbaModular/res/Shapah.svg
+%%DATADIR%%/MockbaModular/res/UDPClockMaster.svg
+%%DATADIR%%/MockbaModular/res/UDPClockSlave.svg
+%%DATADIR%%/MockbaModular/res/knob.svg
+%%DATADIR%%/MockbaModular/res/port.svg
+%%DATADIR%%/MockbaModular/res/screw.svg
+%%DATADIR%%/MockbaModular/res/selector.svg
 %%DATADIR%%/Mog/res/Exo2-BoldItalic.ttf
-%%DATADIR%%/Mog/res/MogLogo.svg
+%%DATADIR%%/Mog/res/Mog Logo.svg
 %%DATADIR%%/Mog/res/Network.svg
 %%DATADIR%%/Mog/res/Nexus.svg
 %%DATADIR%%/Mog/res/Quantizer.svg
@@ -2615,42 +3167,188 @@ lib/vst/CardinalSynth.vst/CardinalSynth.so
 %%DATADIR%%/Mog/res/components/rocker_v_on.svg
 %%DATADIR%%/Mog/res/components/socket_round_dark.svg
 %%DATADIR%%/Mog/res/components/socket_round_dark_ring.svg
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Agsag-Samai.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/AkaPygmies.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Aksak.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Bendir.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/BossaNova.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/CentralAfricanRepublic.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Cinquillo.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Cueca.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Cumbia.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Fandango.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/GhanaClap.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Khafif-e-ramal.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Money.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Mpre.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Nawakhat.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Ngbaka-Maibo.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/OutsideNow.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/PicturesAtAnExhibition.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/RomanianFoldDance.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Ruchenitza.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Samba.vcvm
+%%DATADIR%%/Orbits/presets/RareBreeds_Orbits_Eugene/Sangha.vcvm
*** 359 LINES SKIPPED ***