Made-with: Cursor

# Conflicts:
#	ocgcore

# Conflicts:
#	gframe/data_manager.cpp
#	gframe/deck_con.cpp

This reverts commit 60bb189e.

This reverts commit 383238e4.