Merge lp://staging/~teemperor/minecraft/fix-desktop-and-warnings into lp://staging/minecraft
| Status: | Merged |
|---|---|
| Merged at revision: | 10 |
| Proposed branch: | lp://staging/~teemperor/minecraft/fix-desktop-and-warnings |
| Merge into: | lp://staging/minecraft |
| Diff against target: |
35 lines (+7/-7) 1 file modified
minecraft.desktop (+7/-7) |
| To merge this branch: | bzr merge lp://staging/~teemperor/minecraft/fix-desktop-and-warnings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Minecraft Installer Peeps | Pending | ||
|
Review via email:
|
|||
Commit message
* The startup command is now just "java -jar minecraft.jar" as this is the default command to start a jar and the actual JVM settings are now handled by the launcher
* Icons are no longer executable, fixes lintian warnings
* Rename Textures to Resources
Description of the change
Fixes the same as the branches from cassidy, but i can't access them as they belong to cassidy (which seems to be busy in RL at the moment), so i just put them in one new branch.
It fixes:
* The startup command is now just "java -jar minecraft.jar" as this is the default command to start a jar and the actual JVM settings are now handled by the launcher.
* Lintian warnings as the icons were executable.
* There are no texture-packs anymore, there are called resource packs. Changed the name of the quicklist item and the target-folder.
