Fixing conflicts

src/Client/InternalClient.js

@@ -969,7 +969,7 @@ export default class InternalClient {
 
 	//def updateDetails
 	updateDetails(data) {
-		if(!this.email) {
+		if(!this.email && !data.email) {
 			throw new Error("Can't use updateDetails because only a token has been used for login!");
 		}
 		return this.apiRequest("patch", Endpoints.ME, true, {
@@ -1086,6 +1086,7 @@ export default class InternalClient {
 					token: self.token,
 					v: 3,
 					compress: self.client.options.compress,
+					large_threshold : 250,
 					properties: {
 						"$os": "discord.js",
 						"$browser": "discord.js",

src/Structures/Role.js

@@ -125,7 +125,7 @@ export default class Role {
 	}
 
 	colorAsHex(){
-		var val = this.color.toString();
+		var val = this.color.toString(16);
 		while(val.length < 6){
 			val = "0" + val;
 		}

src/Voice/AudioEncoder.js

@@ -67,6 +67,7 @@ export default class AudioEncoder {
 				'-i', '-',
 				'-f', 's16le',
 				'-ar', '48000',
+				'-ss', (options.seek || 0),
 				'-ac', 2,
 				'pipe:1'
 			], {stdio: ['pipe', 'pipe', 'ignore']});
@@ -102,6 +103,7 @@ export default class AudioEncoder {
 				'-i', file,
 				'-f', 's16le',
 				'-ar', '48000',
+				'-ss', (options.seek || 0),
 				'-ac', 2,
 				'pipe:1'
 			], {stdio: ['pipe', 'pipe', 'ignore']});