Commit Graph

3362 Commits

Author SHA1 Message Date
Jamie Mansfield
b0f5f4cb13 GH-3095 New FTB platform support
Models are based on the models from my go-modpacksch library.

License:
========
The MIT License (MIT)

Copyright (c) Jamie Mansfield <https://www.jamiemansfield.me/>
Copyright (c) contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
2020-08-21 02:24:29 +02:00
Qaz
f6097ef2b7 Update iron.png 2020-08-19 17:45:59 +02:00
Qaz
bb88697354 Update gold.png 2020-08-19 17:45:57 +02:00
Qaz
762a019a49 Update diamond.png 2020-08-19 17:45:53 +02:00
Qaz
f44bab0e0c Update brick.png 2020-08-19 17:45:50 +02:00
Qaz
883dbe2933 Update stone.png 2020-08-19 17:42:16 +02:00
Qaz
6753e217a9 Update planks.png
Replace it with the new plank texture
2020-08-19 17:40:01 +02:00
Petr Mrázek
e7f373496e GH-3234 Add support for custom meta URLs at build time
This is not particularly interesting for non-developers.
Also includes some internal restructuring of URL constants in general.
2020-07-18 16:22:05 +02:00
Petr Mrázek
3158082b16
Merge pull request #3239 from haykam821/intermediary-errors
Fix Fabric loader error messages being reused for intermediary mappings
2020-07-18 12:31:45 +02:00
Petr Mrázek
814407ccec
Merge pull request #3241 from Bowser65/feature/render-overlay
Minor: Render the skin overlay in SkinUtils
2020-07-18 12:31:14 +02:00
Bowser65
155f4f7471
NOISSUE render the skin overlay in SkinUtils 2020-07-12 19:36:40 +02:00
haykam821
90d45d2abf
Fix Fabric loader error messages being reused for intermediary mappings 2020-07-09 12:17:59 -04:00
Petr Mrázek
cd57e354fe NOISSUE fix a bunch of valgrind errors 2020-06-28 13:25:53 +02:00
Petr Mrázek
a0ef20a264 NOISSUE rename ComponentList to PackProfile
It's not just components, so the naming needed cleaning up.
2020-06-27 12:02:31 +02:00
Petr Mrázek
4ca62916f5 GH-3189 update the nbt library 2020-06-07 21:32:42 +02:00
Petr Mrázek
41590f2e50 NOISSUE Switch twitch modpack page to use a QListView
This makes the lazy loading of the paginated search results
actually work.
2020-06-07 11:15:17 +02:00
Petr Mrázek
03dc8ddf81
Merge pull request #3169 from kb-1000/fix-accessibility-2
Allow compiling MultiMC using Qt builds without accessibility again
2020-05-30 15:34:18 +02:00
kb1000
79208a7383
Allow compiling MultiMC using Qt builds without accessibility again 2020-05-30 15:32:38 +02:00
Petr Mrázek
3680f1e599
Merge pull request #2864 from Hubcapp/patch-1
Update BUILD.md
2020-05-29 01:56:53 +02:00
Petr Mrázek
c4779e5a35
Merge pull request #3127 from OverMighty/develop
fix: add support for args with spaces to MultiMC::messageReceived()
2020-05-29 01:55:27 +02:00
Petr Mrázek
aad34f3679
Merge pull request #3165 from kvverti/wsl-messages
Clarify WSL error messages
2020-05-29 00:59:28 +02:00
Thalia Nero
0047ca454f Clarify WSL error messages 2020-05-28 17:59:54 -04:00
Petr Mrázek
07a1052c69 Fix. 2020-05-28 23:31:50 +02:00
Petr Mrázek
ba6a97557a NOISSUE prevent evil from winning 2020-05-28 23:17:50 +02:00
Petr Mrázek
e7f79c9076 Remove some old forge hacks
Forge apparently removed all `.pack.xz` files without warning.
It broke a bunch of stuff, as always. But it also means we don't need some ugly code anymore.

This is removed:

- Support for 'forge-pack-xz' and the forge-specific file download compression.
- The pack200 library we no longer need.

This stays:

- The LZMA decompression library - we may still want to use it.
2020-05-19 15:13:16 +02:00
Petr Mrázek
9eaa636908 GH-2802 remove extra remapping of indexes in VersionPage model 2020-05-17 19:56:59 +02:00
Petr Mrázek
997c25620a GH-3131 fix not working with proxy ports > 32767 2020-05-17 13:59:30 +02:00
OverMighty
bbcacec6ec fix: add support for args with spaces to MultiMC::messageReceived()
Previously, when the main instance of MultiMC would receive an `import`
or `launch` message from another instance, it would split the message on
each space, and only read the first word of the argument (zip path/URL
or instance ID). This commit fixes that problem by sectioning the
message string instead.
2020-05-04 11:37:02 +02:00
OverMighty
313a6574c1 chore: pull changes from upstream 2020-05-04 11:36:41 +02:00
Petr Mrázek
5ca5661c23 NOISSUE expose twitch pack url, description and author list 2020-04-29 21:17:51 +02:00
Petr Mrázek
cb0887ffa8 Merge branch 'develop' of https://github.com/Moresteck/MultiMC5 into develop 2020-04-29 20:32:47 +02:00
Moresteck
1f9378af9f NOISSUE Fixed online saving in early Classic versions 2020-04-19 20:31:04 +01:00
John C. Allwein
5c921589f1
NOISSUE fix compiling of api/logic/Version.cpp
-Wrange-loop-construct triggers this error in clang
2020-04-19 14:36:42 -04:00
Petr Mrázek
130e1263b6
Merge pull request #3046 from Ghalid/mac-build-instructions
Fix macOS build instructions so that git submodule commands succeed
2020-04-11 02:33:02 +02:00
Petr Mrázek
296ff6de96 NOISSUE Add pagination support to twitch pack search
Try searching for 'craft'. Now it gives ALL the results, not just
the first page of 25.
2020-04-01 02:08:11 +02:00
Petr Mrázek
5e951299b2 NOISSUE fix build 2020-04-01 00:59:18 +02:00
Petr Mrázek
3ff93a4216 NOISSUE Bare-bones twitch pack browser 2020-04-01 00:44:24 +02:00
Petr Mrázek
21ac860e27 Bump dev version to 0.6.12 2020-03-29 04:03:04 +02:00
Petr Mrázek
3ad9ea507e NOISSUE update version number, changelog and credits in about dialog 2020-03-29 03:12:57 +02:00
Petr Mrázek
c9e851f12f GH-2544 enable Forge install button for >= 1.13 2020-03-28 15:55:12 +01:00
Petr Mrázek
0281845fc8 GH-2544 allow adding files to libraries without affecting classpath
This is done by adding library-like objects into the `mavenFiles`
list in version JSONs.
2020-03-27 02:23:15 +01:00
Petr Mrázek
e6cc65cf69 NOISSUE no means no, #2 2020-03-26 10:38:13 +01:00
Petr Mrázek
ebb17cb5f8 NOISSUE no means no. 2020-03-26 03:51:14 +01:00
Ghalid
164bb6c78c
NOISSUE change directory before running git submodule commands in mac instructions 2020-03-22 12:17:56 -04:00
Petr Mrázek
69490535d0
Merge pull request #2979 from Brottweiler/desktop-entry-tweak
Tweak GenericName for Linux desktop entry
2020-02-25 18:02:09 +01:00
Brottweiler
95a09ba099 GH-2979 Tweak GenericName 2020-02-24 19:39:22 +01:00
Petr Mrázek
6cb956b45b NOISSUE Nice. 2020-02-24 18:59:36 +01:00
OverMighty
47fa7b3f8c GH-2988 add --import command-line option
When specified, opens the "Import from zip" dialog as soon as the main
window is shown, with the URL field prefilled with the argument given to
the option.

Closes #2998
2020-02-24 18:52:26 +01:00
OverMighty
381c12547f feat: allow telling the main process to import a zip
This commit enhances the IPC message system and adds a new IPC command
in order to allow secondary MultiMC processes that were started by
executing MultiMC with the `--import` command-line option to tell the
main MutliMC process to open the "Import from zip" dialog window and
prefill the URL field with the specified URL.
2020-02-09 16:17:41 +01:00
OverMighty
060d6955e1 style: follow upstream code style 2020-02-09 15:45:31 +01:00