Move a bunch of resources into the resources folder.
Also, cat is no longer mysterious. It's just FLUFFY!
This commit is contained in:
		| @@ -528,7 +528,7 @@ resources/instances/instances.qrc | ||||
|  | ||||
| ######## Windows resource files ######## | ||||
| IF(WIN32) | ||||
| SET(MULTIMC_RCS multimc.rc) | ||||
| SET(MULTIMC_RCS resources/multimc.rc) | ||||
| ENDIF() | ||||
|  | ||||
| ####### X11 Stuff ####### | ||||
| @@ -670,7 +670,7 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") | ||||
|  | ||||
| # ICNS file for OS X | ||||
| IF(APPLE) | ||||
| 	INSTALL(FILES MultiMC.icns DESTINATION MultiMC.app/Contents/Resources) | ||||
| 	INSTALL(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources) | ||||
| ENDIF() | ||||
|  | ||||
| CONFIGURE_FILE( | ||||
|   | ||||
| @@ -469,7 +469,7 @@ | ||||
|     <string>Meow</string> | ||||
|    </property> | ||||
|    <property name="toolTip"> | ||||
|     <string><html><head/><body><p align="center"><span style=" font-weight:600; color:#ff0004;">Catnarok!</span></p><p align="center">Or just a cat with a ball of yarn?</p><p align="center"><span style=" font-style:italic;">WHO KNOWS?!</span></p><p align="center"><img src=":/icons/instances/tnt"/></p></body></html></string> | ||||
|     <string><html><head/><body><p align="center">It's a fluffy kitty :3</p></body></html></string> | ||||
|    </property> | ||||
|   </action> | ||||
|   <action name="actionCopyInstance"> | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| #endif | ||||
| #include <windows.h> | ||||
| 
 | ||||
| IDI_ICON1               ICON    DISCARDABLE     "resources/icons/MultiMC.ico" | ||||
| IDI_ICON1               ICON    DISCARDABLE     "MultiMC.ico" | ||||
| 1 RT_MANIFEST "MultiMC.manifest" | ||||
| 
 | ||||
| VS_VERSION_INFO VERSIONINFO | ||||
		Reference in New Issue
	
	Block a user