Merge lp:~cassidyjames/minecraft/fix-1335191 into lp:minecraft

[Cassidy James Blaede]

Fix bug 1335191 by updating .desktop file to have "Resource Packs" instead of "Texture Packs".

[Cody Garver (codygarver)]

Approve but it's dependent on merge of lp:~cassidyjames/minecraft/fix-1335190

review: Approve

Unmerged revisions

11. By Cassidy James Blaede on 2014-06-27

Fix bug 1335191 by changing references to texturepacks to resourcepacks in the launcher.

10. By Cassidy James Blaede on 2014-06-27

Fix bug 1335190 by removing RAM XMODIFIERS from launcher.

=== modified file 'minecraft.desktop'
--- minecraft.desktop	2014-06-27 17:09:55 +0000
+++ minecraft.desktop	2014-06-27 17:09:55 +0000
@@ -7,15 +7,15 @@
 Icon=minecraft
 Categories=Game
 StartupNotify=true
-Actions=Screenshots;Textures;Wiki
+Actions=Screenshots;Resources;Wiki
 
 [Desktop Action Screenshots]
 Name=_Screenshots
 Exec=xdg-open .minecraft/screenshots/
 
-[Desktop Action Textures]
-Name=_Texture Packs
-Exec=xdg-open .minecraft/texturepacks/
+[Desktop Action Resources]
+Name=_Resource Packs
+Exec=xdg-open .minecraft/resourcepacks/
 
 
 [Desktop Action Wiki]