Merge branch 'master' into newMC

microsoft · Jun 20, 2017 · 352c595 · 352c595
2 parents f5bcf6c + 3a26656
commit 352c595
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Minecraft/build.gradle b/Minecraft/build.gradle
@@ -35,7 +35,7 @@ minecraft {
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
     mappings = "snapshot_20161220"
-    //makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
 // Add the overclocking plugin to the manifest so that it is loaded when running in a non-dev environment (eg from the launcher)

diff --git a/doc/install_windows_manual.md b/doc/install_windows_manual.md
@@ -61,7 +61,7 @@ Check that `java -version` and `javac -version` and `set JAVA_HOME` all report t
 
 ### 6. Install the Microsoft Visual Studio 2013 redistributable: ###
 
-Visit: https://www.microsoft.com/en-us/download/details.aspx?id=40784
+Visit: https://support.microsoft.com/en-us/help/3179560/update-for-visual-c-2013-and-visual-c-redistributable-package
 
 Download `vcredist_x64.exe` and run.