From 5d331723a5f6eb55c660fc1b18694ebdcd49878c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 16 Jun 2022 18:11:35 -0500 Subject: [PATCH] Update links --- .github/workflows/main.yml | 4 ++-- BUILD.md | 12 ++++++------ README.md | 4 ++-- notsecrets/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 920383a6..50a976b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ develop ] + branches: [ main ] pull_request: - branches: [ develop ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/BUILD.md b/BUILD.md index f945de1f..2059f3f9 100644 --- a/BUILD.md +++ b/BUILD.md @@ -15,12 +15,12 @@ MultiMC is a portable application and is not supposed to be installed into any s That would be anything outside your home folder. Before running `make install`, make sure you set the install path to something you have write access to. Never build this under an administrator/root level account. Don't use `sudo`. It won't work and it's not supposed to work. -Also note that this guide is for development purposes only. +Also note that this guide is for development purposes only. **No support is given for building your own fork or special build for any reason whatsoever**. # Branding, identifying marks and API keys -The logo and related assets are All Rights Reserved and may only be used in official builds of MultiMC hosted on multimc.org, and as such, are not, and will not be included in this repository. The source is only provided for the purpose of collaboration. +The logo and related assets are All Rights Reserved and may only be used in official builds of MultiMC hosted on multimc.org, and as such, are not, and will not be included in this repository. The source is only provided for the purpose of collaboration. API keys are necessary for Microsoft account functionality. More info in [(Not) Secrets](https://github.com/MultiMC/Launcher/tree/develop/notsecrets) @@ -29,7 +29,7 @@ API keys are necessary for Microsoft account functionality. More info in [(Not) Clone the source code using git and grab all the submodules: ``` -git clone https://github.com/AfoninZ/MultiMC5-Cracked.git +git clone https://github.com/UltimMC/Launcher.git git submodule init git submodule update ``` @@ -57,7 +57,7 @@ mkdir ~/MultiMC && cd ~/MultiMC mkdir build mkdir install # clone the complete source -git clone --recursive https://github.com/AfoninZ/UltimMC.git src +git clone --recursive https://github.com/UltimMC/Launcher.git src # configure the project cd build cmake -DCMAKE_INSTALL_PREFIX=../install ../src @@ -169,7 +169,7 @@ zlib1.dll ### Compile from command line on Windows 1. If you installed Qt with the web installer, there should be a shortcut called `Qt 5.4 for Desktop (MinGW 4.9 32-bit)` in the Start menu on Windows 7 and 10. Best way to find it is to search for it. Do note you cannot just use cmd.exe, you have to use the shortcut, otherwise the proper MinGW software will not be on the PATH. -2. Once that is open, change into your user directory, and clone MultiMC by doing `git clone --recursive https://github.com/AfoninZ/MultiMC5-Cracked.git`, and change directory to the folder you cloned to. +2. Once that is open, change into your user directory, and clone MultiMC by doing `git clone --recursive https://github.com/UltimMC/Launcher.git`, and change directory to the folder you cloned to. 3. Make a build directory, and change directory to the directory and do `cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=C:\Path\that\makes\sense\for\you`. By default, it will install to C:\Program Files (x86), which you might not want, if you want a local installation. If you want to install it to that directory, make sure to run the command window as administrator. 3. Do `mingw32-make -jX`, where X is the number of cores your CPU has plus one. 4. Now to wait for it to compile. This could take some time. Hopefully it compiles properly. @@ -197,7 +197,7 @@ xcode-select --install Pick an installation path - this is where the final `.app` will be constructed when you run `make install`. Supply it as the `CMAKE_INSTALL_PREFIX` argument during CMake configuration. ``` -git clone --recursive https://github.com/AfoninZ/MultiMC5-Cracked.git +git clone --recursive https://github.com/UltimMC/Launcher.git cd MultiMC5-Cracked mkdir build cd build diff --git a/README.md b/README.md index ce7af56c..8aae8bf6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## This software is not related to MultiMC developers and provided without any warranty. Please don't bomb MultiMC developers if something gets wrong using this launcher. ## Pre-built binaries: -- Windows / Linux / MacOS: https://nightly.link/AfoninZ/UltimMC/workflows/main/develop +- Windows / Linux / MacOS: https://nightly.link/UltimMC/Launcher/workflows/main/main To update the launcher replace all replaceable files and folders with the newer one from the above link. Do not use the inbuilt option, as that downloads the MultiMC launcher instead (this will be fixed in a future version). @@ -18,7 +18,7 @@ To update the launcher replace all replaceable files and folders with the newer In case if you are using MacOS/Linux then additional step is to make a script `UltimMC` executable by using the command `chmod +x UltimMC` in the terminal -To remove the "localhost:nnnn" or "ElyBy" in the minecraft main menu and F3, add `-Dauthlibinjector.noShowServerName` to the java arguments in UltimMC settings. +To remove the "localhost:nnnn" or "Ely.by" in the minecraft main menu and F3, add `-Dauthlibinjector.noShowServerName` to the java arguments in UltimMC settings. # Details about the ORIGINAL launcher below: diff --git a/notsecrets/CMakeLists.txt b/notsecrets/CMakeLists.txt index 7f44f1f1..e245ca06 100644 --- a/notsecrets/CMakeLists.txt +++ b/notsecrets/CMakeLists.txt @@ -11,7 +11,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE) set(Launcher_ConfigFile "ultimmc.cfg" PARENT_SCOPE) -set(Launcher_Git "https://github.com/AfoninZ/UltimMC" PARENT_SCOPE) +set(Launcher_Git "https://github.com/UltimMC/Launcher" PARENT_SCOPE) set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE)