Merge branch 'develop' of https://github.com/PolyMC/PolyMC into rebase
This commit is contained in:
Fintan Martin
@@ -6,7 +6,7 @@
|
||||
</provides>
|
||||
<launchable type="desktop-id">org.polymc.PolyMC.desktop</launchable>
|
||||
<name>PolyMC</name>
|
||||
<developer_name>PolyMC Team</developer_name>
|
||||
<developer_name>PolyMC</developer_name>
|
||||
<summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>GPL-3.0-only</project_license>
|
||||
@@ -16,39 +16,43 @@
|
||||
<p>PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
|
||||
<p>Features:</p>
|
||||
<ul>
|
||||
<li>Easily install game modifications, such as Fabric or Forge</li>
|
||||
<li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
|
||||
<li>Control your java settings</li>
|
||||
<li>Manage worlds and resource packs from the launcher</li>
|
||||
<li>See logs and other details easily</li>
|
||||
<li>Kill Minecraft in case of a crash/freeze</li>
|
||||
<li>Isolate minecraft instances to keep everything clean</li>
|
||||
<li>Install mods directly from the launcher</li>
|
||||
<li>Install and update mods directly from the launcher</li>
|
||||
</ul>
|
||||
</description>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<caption>The main PolyMC window</caption>
|
||||
<image type="source" width="931" height="759">https://polymc.org/img/screenshots/LauncherDark.png</image>
|
||||
<image type="source" width="578" height="452">https://polymc.org/img/screenshots/LauncherDark.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Modpack installation</caption>
|
||||
<image type="source" width="860" height="848">https://polymc.org/img/screenshots/ModpackInstallDark.png</image>
|
||||
<image type="source" width="523" height="452">https://polymc.org/img/screenshots/ModpackInstallDark.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Mod installation</caption>
|
||||
<image type="source" width="1018" height="858">https://polymc.org/img/screenshots/ModInstallDark.png</image>
|
||||
<image type="source" width="654" height="452">https://polymc.org/img/screenshots/ModInstallDark.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Mod updating</caption>
|
||||
<image type="source" width="490" height="452">https://polymc.org/img/screenshots/ModUpdateDark.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Instance management</caption>
|
||||
<image type="source" width="777" height="693">https://polymc.org/img/screenshots/PropertiesDark.png</image>
|
||||
<image type="source" width="667" height="452">https://polymc.org/img/screenshots/PropertiesDark.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<caption>Cat :)</caption>
|
||||
<image type="source" width="931" height="759">https://polymc.org/img/screenshots/LauncherCatDark.png</image>
|
||||
<image type="source" width="555" height="452">https://polymc.org/img/screenshots/LauncherCatDark.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<releases>
|
||||
<release version="@Launcher_RELEASE_VERSION_NAME@" date="@Launcher_RELEASE_TIMESTAMP@"></release>
|
||||
<release version="@Launcher_VERSION_NAME@" date="@Launcher_BUILD_TIMESTAMP@"></release>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1">
|
||||
<content_attribute id="violence-fantasy">moderate</content_attribute>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||
<assemblyIdentity name="PolyMC.Application.1" type="win32" version="@Launcher_RELEASE_VERSION_NAME4@" />
|
||||
<assemblyIdentity name="PolyMC.Application.1" type="win32" version="@Launcher_VERSION_NAME4@" />
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
|
||||
@@ -7,7 +7,7 @@ IDI_ICON1 ICON DISCARDABLE "polymc.ico"
|
||||
1 RT_MANIFEST "polymc.manifest"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @Launcher_RELEASE_VERSION_NAME4_COMMA@
|
||||
FILEVERSION @Launcher_VERSION_NAME4_COMMA@
|
||||
FILEOS VOS_NT_WINDOWS32
|
||||
FILETYPE VFT_APP
|
||||
BEGIN
|
||||
@@ -17,9 +17,9 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "MultiMC & PolyMC Contributors"
|
||||
VALUE "FileDescription", "PolyMC"
|
||||
VALUE "FileVersion", "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VALUE "FileVersion", "@Launcher_VERSION_NAME4@"
|
||||
VALUE "ProductName", "PolyMC"
|
||||
VALUE "ProductVersion", "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VALUE "ProductVersion", "@Launcher_VERSION_NAME4@"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -102,13 +102,13 @@ OutFile "../@Launcher_CommonName@-Setup.exe"
|
||||
;--------------------------------
|
||||
|
||||
; Version info
|
||||
VIProductVersion "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VIFileVersion "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VIProductVersion "@Launcher_VERSION_NAME4@"
|
||||
VIFileVersion "@Launcher_VERSION_NAME4@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "@Launcher_CommonName@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "@Launcher_CommonName@ Installer"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "@Launcher_Copyright@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@Launcher_VERSION_NAME4@"
|
||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@"
|
||||
|
||||
;--------------------------------
|
||||
|
||||
@@ -145,8 +145,8 @@ Section "@Launcher_CommonName@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "@Launcher_CommonName@ Contributors"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "Version" "@Launcher_RELEASE_VERSION_NAME4@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "@Launcher_RELEASE_VERSION_NAME@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "Version" "@Launcher_VERSION_NAME4@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "@Launcher_VERSION_NAME@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "VersionMajor" "@Launcher_VERSION_MAJOR@"
|
||||
WriteRegStr HKCU "${UNINST_KEY}" "VersionMinor" "@Launcher_VERSION_MINOR@"
|
||||
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
|
||||
|
||||
Reference in New Issue
Block a user