Merge tag '1.08'

Author: Inq8

mods/ca/mod.yaml

@@ -12,39 +12,31 @@ FileSystem: ContentInstallerFileSystem
 		^EngineDir
 		$ca: ca
 		^EngineDir|mods/common: common
-		~^SupportDir|Content/ca
-		~^SupportDir|Content/ca/expand
-		~^SupportDir|Content/ca/ra
-		~^SupportDir|Content/ca/cnc
-		~^SupportDir|Content/ca/ts
-		~^SupportDir|Content/ca/firestorm
-		~^SupportDir|Content/ca/ra2
-		~^SupportDir|Content/ca/movies
-		~^SupportDir|Content/ca/music
+		~^SupportDir|Content/ca: content
 		ca|scripts
 		ca|uibits
 	ContentPackages:
-		~main.mix
-		~conquer.mix
-		~lores.mix: lores
-		~hires.mix
-		~local.mix
-		~sounds.mix
-		~speech.mix
-		~allies.mix
-		~russian.mix
-		~temperat.mix
-		~snow.mix
-		~interior.mix
-		~./cnc/scores.mix
-		~./ra/scores.mix
-		~./ts/scores.mix
-		~./ts/scores01.mix
-		~./ra2/theme.mix
-		~./ra2/thememd.mix
-		~expand2.mix
-		~hires1.mix
-		~desert.mix
+		content|allies.mix
+		content|conquer.mix
+		content|lores.mix: lores
+		content|hires.mix
+		content|interior.mix
+		content|local.mix
+		content|russian.mix
+		content|snow.mix
+		content|sounds.mix
+		content|speech.mix
+		content|temperat.mix
+		content|cnc/desert.mix
+		content|expand/expand2.mix
+		content|expand/lores1.mix
+		content|expand/hires1.mix
+		~content|cnc/scores.mix
+		~content|ra/scores.mix
+		~content|ts/scores.mix
+		~content|ts/scores01.mix
+		~content|ra2/theme.mix
+		~content|ra2/thememd.mix
 		ca|bits
 		ca|bits/desert
 		ca|bits/jungle
@@ -59,6 +51,30 @@ FileSystem: ContentInstallerFileSystem
 		ca|bits/scrin/audio
 		ca|bits/scrin/terrain
 	RequiredContentFiles:
+		content|expand/chrotnk1.aud
+		content|expand/fixit1.aud
+		content|expand/jburn1.aud
+		content|expand/jchrge1.aud
+		content|expand/jcrisp1.aud
+		content|expand/jdance1.aud
+		content|expand/jjuice1.aud
+		content|expand/jjump1.aud
+		content|expand/jlight1.aud
+		content|expand/jpower1.aud
+		content|expand/jshock1.aud
+		content|expand/jyes1.aud
+		content|expand/madchrg2.aud
+		content|expand/madexplo.aud
+		content|expand/mboss1.aud
+		content|expand/mhear1.aud
+		content|expand/mhotdig1.aud
+		content|expand/mhowdy1.aud
+		content|expand/mhuh1.aud
+		content|expand/mlaff1.aud
+		content|expand/mrise1.aud
+		content|expand/mwrench1.aud
+		content|expand/myeehaw1.aud
+		content|expand/myes1.aud
 	ContentInstallerMod: ca-content
 
 MapFolders: