From debd440fc675aeb10e3bed58c5bf46d17dea6e00 Mon Sep 17 00:00:00 2001 From: Atillart-One Date: Wed, 8 Dec 2021 01:57:14 +0530 Subject: [PATCH 1/2] update 1.2.3.2 --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index e5e8017..9160021 100644 --- a/main.py +++ b/main.py @@ -39,7 +39,6 @@ Path to resources used. """ - def resource_path(relative_path): """ Get absolute path to resource, works for dev and for PyInstaller """ try: @@ -335,12 +334,12 @@ def update(): def git_connect(): try: + repo = git.Repo(moddir + "/Ashes") repo.git.fetch('--depth=1') repo.git.merge('-X', 'theirs', '--allow-unrelated-histories', '--no-commit', 'origin/master') canvas.itemconfig(progress, text="") canvas.itemconfig('progress', state='hidden') canvas.itemconfig('proglines', state='hidden') - launch() except Exception: state = messagebox.askretrycancel('AshesLauncher', "There was an error updating. Retry?") if state is True: @@ -349,6 +348,7 @@ def git_connect(): messagebox.showerror('AshesLauncher', "Error for troubleshooting:\n" + traceback.format_exc()) git_connect() + launch() installing = 0 canvas.itemconfig(play_button, state='normal') From 6f2361b1f99068d205ac1880b68658e7a46553c1 Mon Sep 17 00:00:00 2001 From: Atillart-One <90020333+Atillart-One@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:33:24 +0530 Subject: [PATCH 2/2] Update README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index eb7785d..c7abbb8 100644 --- a/README.md +++ b/README.md @@ -3,22 +3,22 @@ A launcher for the Dark Souls III mod Champion's Ashes, made by atillart#4807. ## Instructions -To use, simply extract into a folder and run AshesLauncher4.exe. +To use, simply extract into a folder and run AshesLauncher4.exe. +If you have an older non-launcher manual install, delete the Ashes folder inside the AshesLauncher folder from your Game folder. -If you have an older non-launcher manual install, delete the Ashes folder inside the AshesLauncher folder from your Game folder. - -To utilize other mods when not playing Champion's Ashes, simply put the mods in the folder called 'mods' in the launcher folder. -The folder containing the mods can be changed by clicking browse Mods Path. -The mod folders should contain all the dll, ini, txt etc. files and folders needed. The mods can then be chosen in the MODS tab in the launcher. +## Using Other Mods +To utilize other mods when not playing Champion's Ashes, simply put the mods in their own folders inside the AshesLauncher folder (can be changed by selecting mods path in MODS tab.) +The mod folders should contain all the dll, ini, txt etc. files and folders needed. The mods can then be chosen in the MODS tab in the launcher. Convergence example: ![image](https://github.com/Atillart-One/AshesLauncher/blob/main/scrn.png) These files are all present in a folder named "The Convergence" (can be named anything) inside the mods folder. -## IMPORTANT NOTE -This mod WILL ban you if you have it enabled and launch the game. -Make sure it's disabled before using an account that you don't want banned. +## Additional Notes +The Champion's Ashes mod WILL ban you if you have it enabled and launch the game. Make sure it's disabled before using an account that you don't want banned. +If you need to disable installing/updating Champion's Ashes, simply delete the Git folder in the files folder present in the launcher folder. +Storing mods outside the Game folder requires the launcher to be run with Administrator privileges. Simply right click AshesLauncher4.exe and select run as admin. ## Links Changelog: https://docs.google.com/document/d/1j4UVY_1E6jqCX-sthQ467BGq67YmGrjx1I5huEmtciA