From dbc09ddf54d81cdb57bbcc93b73425699e7bb019 Mon Sep 17 00:00:00 2001 From: acerrrr12 <92349182+acerrrr12@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:09:19 -0400 Subject: [PATCH 1/4] Update mods.json --- data/mods.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/mods.json b/data/mods.json index 5041fe9c..e4982d6e 100644 --- a/data/mods.json +++ b/data/mods.json @@ -347,5 +347,16 @@ "size": 1649025, "url": "https://github.com/chaosvolt/cdda-arcana-mod/archive/master.zip", "homepage": "https://github.com/chaosvolt/cdda-arcana-mod" - } + }, + { + "type": "direct_download", + "mod_type": "SUPPLEMENTAL", + "ident": "MST_Extra", + "name": "MST_Extra_Mod for Cataclysm: Dark Days Ahead", + "description": "the official followup to the now-obsolete More Survival Tools mod, Adds assorted additional content and changes that improve quality of life when playing innawoods", + "author": "chaosvolt", + "size": 527112 + "url": "https://github.com/chaosvolt/MST_Extra_Mod/archive/refs/heads/master.zip", + "homepage": "https://github.com/chaosvolt/MST_Extra_Mod" + }, ] From 518c8708df709a862e2525cc2e80b824d161d2f1 Mon Sep 17 00:00:00 2001 From: Gonzalo Lopez Date: Tue, 18 Oct 2022 17:44:40 -0300 Subject: [PATCH 2/4] Tweaked building readme --- BUILDING.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 34da6614..422d6e5f 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -6,8 +6,6 @@ SPDX-License-Identifier: MIT # Building guide -> This guide is **outdated**. A updated version should soon be added to replace this one. - CDDA Game Launcher is developed using Python. In order to run or build the launcher, you will need to download a recent version of Python and install all the requirements. ## Requirements @@ -35,7 +33,7 @@ The resulting launcher installer should be in the `dist\innosetup` directory. 1. Download and install Python 3.9 from [python.org](https://www.python.org/downloads/release/python-3910/). The rest of this guide will assume that you are using the 64-bit (x64) version of Python 3.9. 1. **_Optional but thoroughly recommended_**: Setup a [virtual environment](https://docs.python.org/3.9/library/venv.html). It will make your development experience immensely easier. -2. Install most requirements by typing the following `pip` command in your command line window: `pip install SQLAlchemy alembic PyQt5 PyInstaller html5lib cssselect arrow rarfile Babel pypiwin32 pywinutils Markdown Werkzeug` and press `↵ Enter`. +2. Install most requirements by typing the following `pip` command in your command line window: `pip install SQLAlchemy alembic PyQt5 PyInstaller html5lib cssselect arrow rarfile Babel pypiwin32 pywinutils Markdown Werkzeug httpx` and press `↵ Enter`. 3. Install the `pylzma` package from [Christoph Gohlke's Unofficial Windows Binaries](http://www.lfd.uci.edu/~gohlke/pythonlibs/). `cp39` means CPython 3.9 and `amd64` means 64-bit and in Christoph Gohlke's packages naming convention. The package name you are looking for should be similar to `pylzma-0.5.0-cp39-cp39-win_amd64.whl`. To install `.whl` packages from Christoph Gohlke's Unofficial Windows Binaries page, you can use pip. In your command line window, type: `pip install [path to .whl]` and press `↵ Enter`. 1. A local copy of a usable pylzma package can be found in `./third-party/pylzma/pylzma-0.5.0-cp39-cp39-win_amd64.whl`, so you can go ahead and `pip install` that one if you have Python 3.9 and a 64-bit Windows installation. 4. Download the CDDA Game Launcher source code. If you have git installed, you can type the following command in your command line window: `git clone https://github.com/DazedNConfused-/CDDA-Game-Launcher.git`. You can also download the source code from [https://github.com/DazedNConfused-/CDDA-Game-Launcher/archive/master.zip](https://github.com/DazedNConfused-/CDDA-Game-Launcher/archive/master.zip). Make sure to extract the zip file somewhere before trying to run the code. From 15f1e2998b342b1901df6bc9acf7cf4e8d170cf0 Mon Sep 17 00:00:00 2001 From: Gonzalo Lopez Date: Tue, 18 Oct 2022 17:52:28 -0300 Subject: [PATCH 3/4] Prepare for v.1.6.8 release --- cddagl/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddagl/VERSION b/cddagl/VERSION index 60fdb8d5..cfe11fd6 100644 --- a/cddagl/VERSION +++ b/cddagl/VERSION @@ -1 +1 @@ -1.6.7 \ No newline at end of file +1.6.8 \ No newline at end of file From 9668eacb7bf3282c4f46364b0ef271bbf1d88691 Mon Sep 17 00:00:00 2001 From: Gonzalo Lopez Date: Tue, 18 Oct 2022 17:55:09 -0300 Subject: [PATCH 4/4] Further tweaks to building readme --- BUILDING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index 422d6e5f..9a2453e0 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -33,7 +33,8 @@ The resulting launcher installer should be in the `dist\innosetup` directory. 1. Download and install Python 3.9 from [python.org](https://www.python.org/downloads/release/python-3910/). The rest of this guide will assume that you are using the 64-bit (x64) version of Python 3.9. 1. **_Optional but thoroughly recommended_**: Setup a [virtual environment](https://docs.python.org/3.9/library/venv.html). It will make your development experience immensely easier. -2. Install most requirements by typing the following `pip` command in your command line window: `pip install SQLAlchemy alembic PyQt5 PyInstaller html5lib cssselect arrow rarfile Babel pypiwin32 pywinutils Markdown Werkzeug httpx` and press `↵ Enter`. +2. Install most requirements by typing the following `pip` command in your command line window: `pip install SQLAlchemy alembic PyQt5 PyInstaller html5lib cssselect arrow rarfile Babel pypiwin32 pywinutils Markdown Werkzeug httpx markdown2 requests` and press `↵ Enter`. + 3. Alternatively, install all the dependencies specified in `requirements.txt`. 3. Install the `pylzma` package from [Christoph Gohlke's Unofficial Windows Binaries](http://www.lfd.uci.edu/~gohlke/pythonlibs/). `cp39` means CPython 3.9 and `amd64` means 64-bit and in Christoph Gohlke's packages naming convention. The package name you are looking for should be similar to `pylzma-0.5.0-cp39-cp39-win_amd64.whl`. To install `.whl` packages from Christoph Gohlke's Unofficial Windows Binaries page, you can use pip. In your command line window, type: `pip install [path to .whl]` and press `↵ Enter`. 1. A local copy of a usable pylzma package can be found in `./third-party/pylzma/pylzma-0.5.0-cp39-cp39-win_amd64.whl`, so you can go ahead and `pip install` that one if you have Python 3.9 and a 64-bit Windows installation. 4. Download the CDDA Game Launcher source code. If you have git installed, you can type the following command in your command line window: `git clone https://github.com/DazedNConfused-/CDDA-Game-Launcher.git`. You can also download the source code from [https://github.com/DazedNConfused-/CDDA-Game-Launcher/archive/master.zip](https://github.com/DazedNConfused-/CDDA-Game-Launcher/archive/master.zip). Make sure to extract the zip file somewhere before trying to run the code.