makedeb
Minecraft launcher with ability to manage multiple instances.
Click here to go back to the commit logs for polymc.
Hash: 775884b072827e99bfa855aaed608c5d422ab940
Message: Remove conflict
diff --git a/.SRCINFO b/.SRCINFO
index b4263ec..4a4da13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,6 @@ pkgbase = polymc
optdepends = java-runtime=8: support for Minecraft versions < 1.17
optdepends = java-runtime=17: support for Minecraft versions >= 1.17
provides = polymc
- conflicts = multimc
conflicts = polymc
source = git+https://github.com/PolyMC/PolyMC#tag=1.1.0
source = git+https://github.com/MultiMC/libnbtplusplus
diff --git a/PKGBUILD b/PKGBUILD
index 3a4d708..b9b95c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://github.com/PolyMC/PolyMC"
license=('GPL3')
depends=('libqt5core5a' 'libqt5network5' 'libqt5gui5')
provides=('polymc')
-conflicts=('multimc' 'polymc')
+conflicts=('polymc')
makedepends=('cmake' 'git' 'openjdk-17-jdk' 'zlib1g-dev' 'libgl1-mesa-dev' 'qtbase5-dev' 'qtchooser' 'qt5-qmake' 'qtbase5-dev-tools')
optdepends=('java-runtime=8: support for Minecraft versions < 1.17'
'java-runtime=17: support for Minecraft versions >= 1.17')