summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-08-15 00:02:44 +0200
committerPetr Mrázek <peterix@gmail.com>2014-08-15 00:02:44 +0200
commit7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0 (patch)
treee47a186bb32cf7bd5720c96f06d1ecfb881a4892
parentd172daf3a9719929ed095c76d822bab3bfa4bcbe (diff)
downloadMultiMC-7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0.tar
MultiMC-7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0.tar.gz
MultiMC-7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0.tar.lz
MultiMC-7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0.tar.xz
MultiMC-7d8c5ac9b5d171492abe4ecca18c7ca8c250e4c0.zip
Revert "Do not include jutils in LWJGL versions."
This reverts commit 376467740b7aa5eed371f6dde8d720f950a3187c.
-rw-r--r--logic/VersionFilterData.cpp4
-rw-r--r--resources/versions/LWJGL/2.9.0.json3
-rw-r--r--resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json3
-rw-r--r--resources/versions/LWJGL/2.9.1.json3
4 files changed, 11 insertions, 2 deletions
diff --git a/logic/VersionFilterData.cpp b/logic/VersionFilterData.cpp
index 6ef9247d..866d4947 100644
--- a/logic/VersionFilterData.cpp
+++ b/logic/VersionFilterData.cpp
@@ -67,6 +67,6 @@ VersionFilterData::VersionFilterData()
legacyCutoffDate = timeFromS3Time("2013-06-25T15:08:56+02:00");
lwjglWhitelist =
QSet<QString>{"net.java.jinput:jinput", "net.java.jinput:jinput-platform",
- "org.lwjgl.lwjgl:lwjgl", "org.lwjgl.lwjgl:lwjgl_util",
- "org.lwjgl.lwjgl:lwjgl-platform"};
+ "net.java.jutils:jutils", "org.lwjgl.lwjgl:lwjgl",
+ "org.lwjgl.lwjgl:lwjgl_util", "org.lwjgl.lwjgl:lwjgl-platform"};
}
diff --git a/resources/versions/LWJGL/2.9.0.json b/resources/versions/LWJGL/2.9.0.json
index afa0a378..5dbd624e 100644
--- a/resources/versions/LWJGL/2.9.0.json
+++ b/resources/versions/LWJGL/2.9.0.json
@@ -20,6 +20,9 @@
}
},
{
+ "name": "net.java.jutils:jutils:1.0.0"
+ },
+ {
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
},
{
diff --git a/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json b/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
index 40fb18ac..7265b3b0 100644
--- a/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
+++ b/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
@@ -20,6 +20,9 @@
}
},
{
+ "name": "net.java.jutils:jutils:1.0.0"
+ },
+ {
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3"
},
{
diff --git a/resources/versions/LWJGL/2.9.1.json b/resources/versions/LWJGL/2.9.1.json
index cb70d726..e7f5e947 100644
--- a/resources/versions/LWJGL/2.9.1.json
+++ b/resources/versions/LWJGL/2.9.1.json
@@ -20,6 +20,9 @@
}
},
{
+ "name": "net.java.jutils:jutils:1.0.0"
+ },
+ {
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{