Oddly, when I updated, it seems like everything merged cleanly except for some of my fixture pallettes for the xspot. Seems like only a few random ones (that were written as "by fixture" and it was only beam elements (like frost, zoom and iris) yet focus, gobo, and other traits seemed fine. Not a big deal, I just updated them, but figured it may have been a bug.
Oddly, when I updated, it seems like everything merged cleanly except for some of my fixture pallettes for the xspot. Seems like only a few random ones (that were written as "by fixture" and it was only beam elements (like frost, zoom and iris) yet focus, gobo, and other traits seemed fine. Not a big deal, I just updated them, but figured it may have been a bug.
