merge main

.gitmodules

@@ -153,7 +153,7 @@
 	url = https://github.com/martin-lueders/ML_modules.git
 [submodule "plugins/Orbits"]
 	path = plugins/Orbits
-	url = git@github.com:RareBreeds/Orbits.git
+	url = https://github.com/RareBreeds/Orbits.git
 [submodule "plugins/stocaudio"]
 	path = plugins/stocaudio
 	url = https://github.com/aptrn/stocaudio-modules.git
@@ -172,6 +172,18 @@
 [submodule "plugins/Dintree"]
 	path = plugins/Dintree
 	url = https://github.com/hires/Dintree-Virtual.git
+[submodule "plugins/Algoritmarte"]
+	path = plugins/Algoritmarte
+	url = https://github.com/algoritmarte/AlgoritmarteVCVPlugin.git
+[submodule "plugins/AaronStatic"]
+	path = plugins/AaronStatic
+	url = https://github.com/aaronstatic/AaronStatic_modules.git
+[submodule "plugins/MSM"]
+	path = plugins/MSM
+	url = https://github.com/netboy3/MSM-vcvrack-plugin.git
+[submodule "plugins/nonlinearcircuits"]
+	path = plugins/nonlinearcircuits
+	url = https://github.com/mhetrick/nonlinearcircuits.git
 [submodule "plugins/StarlingVia"]
 	path = plugins/StarlingVia
 	url = https://github.com/starlingcode/Via-for-Rack.git

README.md

@@ -104,6 +104,8 @@ At the moment the following 3rd-party modules are provided:
 
 - 21kHz
 - 8Mode
+- Aaron Static
+- AlgoritmArte
 - Amalgamated Harmonics
 - Animated Circuits
 - Aria Salvatrice
@@ -142,6 +144,8 @@ At the moment the following 3rd-party modules are provided:
 - Mockba Modular
 - Mog
 - mscHack
+- MSM
+- Nonlinear Circuits
 - Orbits
 - Path Set
 - Prism

docs/LICENSES.md

@@ -15,6 +15,8 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
 | Rack                    | GPL-3.0-or-later         | The actual Rack code, internal dependencies are compatible with GPLv3+ |
 | 21kHz                   | MIT                      | |
 | 8Mode                   | BSD-3-Clause             | |
+| Aaron Static            | MIT                      | |
+| AlgoritmArte            | GPL-3.0-or-later         | |
 | Amalgamated Harmonics   | BSD-3-Clause             | |
 | Animated Circuits       | GPL-3.0-or-later         | |
 | Aria Salvatrice         | GPL-3.0-or-later         | |
@@ -53,6 +55,8 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
 | Mockba Modular          | MIT                      | |
 | Mog                     | CC0-1.0                  | |
 | mscHack                 | BSD-3-Clause             | |
+| MSM                     | MIT                      | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information |
+| Nonlinear Circuits      | CC0-1.0                  | |
 | Orbits                  | GPL-3.0-or-later         | |
 | Path Set                | GPL-3.0-or-later         | |
 | Prism                   | BSD-3-Clause             | |
@@ -84,6 +88,10 @@ Below is a list of artwork licenses from plugins
 |-----------------------------------------|------------------|------------------|
 | 21kHz                                   | MIT              | No artwork specific license provided |
 | 8Mode                                   | BSD-3-Clause     | No artwork specific license provided |
+| AaronStatic/*                           | MIT              | No artwork specific license provided |
+| AaronStatic/fonts/PixelOperator.ttf     | CC0-1.0          | |
+| Algoritmarte/*                          | GPL-3.0-or-later | No artwork specific license provided |
+| Algoritmarte/LEDSliderGreenHandle.svg   | CC-BY-NC-4.0     | |
 | AmalgamatedHarmonics/*                  | BSD-3-Clause     | No artwork specific license provided |
 | AmalgamatedHarmonics/DSEG*.ttf          | OFL-1.1-RFN      | |
 | AmalgamatedHarmonics/Roboto*.ttf        | Apache-2.0       | |
@@ -158,6 +166,12 @@ Below is a list of artwork licenses from plugins
 | Mog/components/*                        | CC-BY-NC-4.0     | |
 | Mog/Exo2-BoldItalic.ttf                 | OFL-1.1-RFN      | |
 | mscHack/*                               | BSD-3-Clause     | No artwork specific license provided, see [mschack#108](https://github.com/mschack/VCV-Rack-Plugins/issues/108) |
+| MSM/*                                   | MIT              | No artwork specific license provided |
+| MSM/Fonts/DejaVuSansMono.ttf            | Bitstream-Vera   | |
+| MSM/Fonts/Segment7Standard.ttf          | OFL-1.1-RFN      | |
+| MSM/Fonts/Sudo.ttf                      | OFL-1.1-no-RFN   | |
+| nonlinearcircuits/*                     | CC0-1.0          | No artwork specific license provided |
+| nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN      | |
 | Orbits/*                                | CC-BY-NC-ND-4.0  | |
 | Orbits/fonts/ShareTechMono-Regular.ttf  | OFL-1.1-RFN      | |
 | PathSet/*                               | GPL-3.0-or-later | No artwork specific license provided |

plugins/Makefile

@@ -231,7 +231,20 @@ PLUGIN_FILES += $(filter-out 21kHz/src/21kHz.cpp,$(wildcard 21kHz/src/*.cpp))
 # --------------------------------------------------------------
 # 8Mode
 
-PLUGIN_FILES += $(wildcard 8Mode/src/*.cpp)
+PLUGIN_FILES += $(filter-out 8Mode/src/plugin.cpp,$(wildcard 8Mode/src/*.cpp))
+
+# --------------------------------------------------------------
+# AlgoritmArte
+
+PLUGIN_FILES += $(filter-out Algoritmarte/src/plugin.cpp,$(wildcard Algoritmarte/src/*.cpp))
+
+# --------------------------------------------------------------
+# Aaron Static
+
+PLUGIN_FILES += $(wildcard AaronStatic/src/*.cpp)
+
+# modules/types which are present in other plugins
+AARONSTATIC_CUSTOM = RefreshCounter
 
 # --------------------------------------------------------------
 # AmalgamatedHarmonics
@@ -378,7 +391,7 @@ AUTINN_CUSTOM = Chord Vibrato
 # --------------------------------------------------------------
 # Axioma
 
-PLUGIN_FILES += $(wildcard Axioma/src/*.cpp)
+PLUGIN_FILES += $(filter-out Axioma/src/plugin.cpp,$(wildcard Axioma/src/*.cpp))
 
 # --------------------------------------------------------------
 # BaconPlugs
@@ -668,6 +681,19 @@ PLUGIN_FILES += $(wildcard mscHack/src/*.cpp)
 # modules/types which are present in other plugins
 MSCHACK_CUSTOM_PER_FILE = MAIN_SYNC_CLOCK FILTER_STRUCT FILTER_PARAM_STRUCT OSC_PARAM_STRUCT PHRASE_CHANGE_STRUCT
 
+# --------------------------------------------------------------
+# MSM
+
+PLUGIN_FILES += $(filter-out MSM/src/MSM.cpp,$(wildcard MSM/src/*.cpp))
+
+# modules/types which are present in other plugins
+MSM_CUSTOM = ADSR BlankPanel Delay LFO LowFrequencyOscillator Mult Noise OP VCA VCO sawTable triTable
+
+# --------------------------------------------------------------
+# Nonlinear Circuits
+
+PLUGIN_FILES += $(filter-out nonlinearcircuits/src/NLC.cpp,$(wildcard nonlinearcircuits/src/*.cpp))
+
 # --------------------------------------------------------------
 # Orbits
 
@@ -946,7 +972,20 @@ else
 PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json))
 endif
 
-UNWANTED_FILES = HetrickCV/res/illustrator - deprecated/MyModule.svg
+UNWANTED_FILES  = HetrickCV/res/illustrator - deprecated/MyModule.svg
+UNWANTED_FILES += nonlinearcircuits/res/NLC - 1050 MIXER SEQUENCER.svg
+UNWANTED_FILES += 1050 MIXER SEQUENCER.svg
+UNWANTED_FILES += 32to1.svg
+UNWANTED_FILES += 4seq.svg
+UNWANTED_FILES += 8 BIT CIPHER.svg
+UNWANTED_FILES += DIVIDE & CONQUER.svg
+UNWANTED_FILES += DIVINE CMOS.svg
+UNWANTED_FILES += GENiE.svg
+UNWANTED_FILES += NEURON.svg
+UNWANTED_FILES += NUMBERWANG.svg
+UNWANTED_FILES += ROUTER.svg
+UNWANTED_FILES += SEGUE.svg
+UNWANTED_FILES += STATUES.svg
 
 RESOURCE_FILES = \
 	$(filter-out $(UNWANTED_FILES), \
@@ -969,6 +1008,7 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityPresets
 RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityShapes
 RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldPresets
 RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes
+RESOURCE_FILES += nonlinearcircuits/res
 
 # MOD builds only have LV2 FX variant for now
 ifeq ($(MOD_BUILD),true)
@@ -1156,6 +1196,21 @@ $(BUILD_DIR)/8Mode/%.cpp.o: 8Mode/%.cpp
 		$(foreach m,$(8MODE_CUSTOM),$(call custom_module_names,$(m),8Mode)) \
 		-DpluginInstance=pluginInstance__8Mode
 
+$(BUILD_DIR)/AaronStatic/%.cpp.o: AaronStatic/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(AARONSTATIC_CUSTOM),$(call custom_module_names,$(m),AaronStatic)) \
+		-DpluginInstance=pluginInstance__AaronStatic \
+		-Dinit=init__AaronStatic
+
+$(BUILD_DIR)/Algoritmarte/%.cpp.o: Algoritmarte/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(ALGORITMARTE_CUSTOM),$(call custom_module_names,$(m),Algoritmarte)) \
+		-DpluginInstance=pluginInstance__Algoritmarte
+
 $(BUILD_DIR)/AmalgamatedHarmonics/%.cpp.o: AmalgamatedHarmonics/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -1293,7 +1348,8 @@ $(BUILD_DIR)/Dintree/%.cpp.o: Dintree/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(DINTREE_CUSTOM),$(call custom_module_names,$(m),Dintree)) \
-		-DpluginInstance=pluginInstance__Dintree
+		-DpluginInstance=pluginInstance__Dintree \
+		-DSKIP_MINGW_FORMAT
 
 $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -1546,6 +1602,21 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
 		-Wno-non-c-typedef-for-linkage \
 		-Wno-unused-but-set-variable
 
+$(BUILD_DIR)/MSM/%.cpp.o: MSM/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(MSM_CUSTOM),$(call custom_module_names,$(m),MSM)) \
+		-DpluginInstance=pluginInstance__MSM \
+		-DDARKTHEME
+
+$(BUILD_DIR)/nonlinearcircuits/%.cpp.o: nonlinearcircuits/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(NONLINEARCIRCUITS_CUSTOM),$(call custom_module_names,$(m),nonlinearcircuits)) \
+		-DpluginInstance=pluginInstance__nonlinearcircuits
+
 $(BUILD_DIR)/Orbits/%.cpp.o: Orbits/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"