Update to 0.6.13 in stable branch

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,51 @@
+<!--
+Before submitting this issue, please make sure you have:
+
+ 1. Filled out this form completely, the only optional field is "additional info".
+    - Use as many details as possible and state the problem clearly.
+ 2. Proof-read your ENTIRE issue report.
+    - Grammar and spelling mistakes make issue reports harder to understand.
+ 3. Made sure your problem is not caused by an issue in your own modpack.
+    - We provide support for MultiMC, not your modpack. Problems with your modpack will be ignored.
+ 4. Given the issue a descriptive title.
+    - A good title includes a brief summary of the issue and avoids things such as "Help" and "What?!".
+      Use of UPPERCASE is discouraged, as it reads like someone is screaming.
+ 5. Place all information below the ---- of lines.
+    - It makes the issue look pretty
+
+If you believe your issue to be a bug, please make sure you check the wiki page: https://github.com/Ponywka/MultiMC5-with-offline/wiki/Report-a-Bug
+-->
+
+System Information
+-----------------------------
+MultiMC version:
+
+Operating System:
+
+Summary of the issue or suggestion:
+----------------------------------------------
+
+
+What should happen:
+------------------------------
+
+
+Steps to reproduce the issue (Add more if needed):
+-------------------------------------------------------------
+1.
+
+2.
+
+3.
+
+Suspected cause:
+---------------------------
+
+
+Logs/Screenshots:
+----------------------------
+[//]: # (Please refer to https://github.com/Ponywka/MultiMC5-with-offline/wiki/Log-Upload for instructions on how to attach your logs.)
+
+
+Additional Info:
+---------------------------

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,6 @@
 name: Bug Report
 description: File a bug report
 labels: [bug, needs-triage]
-issue_body: false
 body:
 - type: markdown
   attributes:

.github/ISSUE_TEMPLATE/suggestion.yml

@@ -1,7 +1,6 @@
 name: Suggestion
 description: Make a suggestion
 labels: [idea, needs-triage]
-issue_body: true
 body:
 - type: markdown
   attributes:
@@ -34,8 +33,6 @@ body:
     options:
     - label: I have searched the issue tracker and did not find an issue describing my suggestion, especially not one that has been rejected.
       required: true      
-- type: markdown
+- type: textarea
   attributes:
-    value: |
-      ### You may use the editor below to elaborate further.
-# The issue_body: true up there makes the standard WYSIWYG editor for issues show up down here.
+    label: You may use the editor below to elaborate further.

.github/workflows/lin64.yml

@@ -0,0 +1,30 @@
+name: lin64
+
+on: [push, pull_request]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: jurplel/install-qt-action@v2
+      with:
+        version: 5.11.3
+
+    - name: Sub projects
+      run: git submodule init && git submodule update
+
+    - name: CMake
+      run: cmake -DCMAKE_INSTALL_PREFIX=./install .
+
+    - name: Build
+      run: mkdir install && make -j8 install
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: lin64
+        path: install/

.gitignore

@@ -16,6 +16,7 @@ CMakeLists.txt.user.*
 /.settings
 /.idea
 cmake-build-*/
+Debug
 
 # Build dirs
 build
@@ -29,3 +30,6 @@ tags
 
 #OSX Stuff
 .DS_Store
+
+branding
+secrets

BUILD.md

@@ -12,7 +12,7 @@ Build Instructions
 # Note
 
 MultiMC is a portable application and is not supposed to be installed into any system folders.
-That would be anything outside your home folder. Before runing `make install`, make sure
+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.
 
@@ -22,7 +22,7 @@ an administrator/root level account. Don't use `sudo`. It won't work and it's no
 Clone the source code using git and grab all the submodules:
 
 ```
-git clone [email protected]:MultiMC/MultiMC5.git
+git clone [email protected]:Ponywka/MultiMC5-with-offline.git
 git submodule init
 git submodule update
 ```
@@ -50,7 +50,7 @@ mkdir ~/MultiMC && cd ~/MultiMC
 mkdir build
 mkdir install
 # clone the complete source
-git clone --recursive https://github.com/MultiMC/MultiMC5.git src
+git clone --recursive https://github.com/Ponywka/MultiMC5-with-offline.git src
 # configure the project
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=../install ../src
@@ -165,7 +165,7 @@ zlib1.dll
 **These build instructions worked for me (Drayshak) on a fresh Windows 8 x64 Professional install. If they don't work for you, let us know on IRC ([Esper/#MultiMC](http://webchat.esper.net/?nick=&channels=MultiMC))!**
 ### 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/MultiMC/MultiMC5.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/Ponywka/MultiMC5-with-offline.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.
@@ -185,7 +185,10 @@ zlib1.dll
 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/MultiMC/MultiMC5.git
+git clone https://github.com/Ponywka/MultiMC5-with-offline.git
+cd MultiMC5
+git submodule init
+git submodule update
 cd MultiMC5
 mkdir build
 cd build

CMakeLists.txt

@@ -55,7 +55,7 @@ set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetc
 ######## Set version numbers ########
 set(MultiMC_VERSION_MAJOR    0)
 set(MultiMC_VERSION_MINOR    6)
-set(MultiMC_VERSION_HOTFIX   12)
+set(MultiMC_VERSION_HOTFIX   13)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -64,7 +64,7 @@ set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.
 set(MultiMC_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used by the notification system and to display in the about dialog.")
 
 # Channel list URL
-set(MultiMC_CHANLIST_URL "" CACHE STRING "URL for the channel list.")
+set(MultiMC_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
 
 # Notification URL
 set(MultiMC_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.")
@@ -75,9 +75,24 @@ set(MultiMC_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch M
 # paste.ee API key
 set(MultiMC_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE STRING "API key you can get from paste.ee when you register an account")
 
+# Imgur API Client ID
+set(MultiMC_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
+
 # Google analytics ID
 set(MultiMC_ANALYTICS_ID "UA-87731965-2" CACHE STRING "ID you can get from Google analytics")
 
+# Bug tracker URL
+set(MultiMC_BUG_TRACKER_URL "" CACHE STRING "URL for the bug tracker.")
+
+# Discord URL
+set(MultiMC_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
+
+# Subreddit URL
+set(MultiMC_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
+
+
+option(MultiMC_EMBED_SECRETS "Determines whether to embed secrets. Secrets are separate and non-public." OFF)
+
 #### Check the current Git commit and branch
 include(GetGitRevisionDescription)
 get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT)
@@ -163,7 +178,7 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle")
     set(INSTALL_BUNDLE "full")
 
     # Add the icon
-    install(FILES application/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR})
+    install(FILES launcher/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle")
     set(BINARY_DEST_DIR "bin")
@@ -186,7 +201,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle")
     SET(MultiMC_BINARY_RPATH "$ORIGIN/")
 
     # Install basic runner script
-    install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
+    install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps")
     set(BINARY_DEST_DIR "bin")
@@ -203,7 +218,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps")
     SET(MultiMC_BINARY_RPATH "$ORIGIN/")
 
     # Install basic runner script
-    install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
+    install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system")
     set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary")
@@ -265,12 +280,19 @@ add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader
 add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
 add_subdirectory(libraries/classparser) # google analytics library
 add_subdirectory(libraries/optional-bare)
+add_subdirectory(libraries/tomlc99) # toml parser
+add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much
 
 ############################### Built Artifacts ###############################
 
 add_subdirectory(buildconfig)
-add_subdirectory(api/logic)
-add_subdirectory(api/gui)
+
+if(MultiMC_EMBED_SECRETS)
+    add_subdirectory(secrets)
+else()
+    add_subdirectory(notsecrets)
+endif()
+
 
 # NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order.
-add_subdirectory(application)
+add_subdirectory(launcher)

COPYING.md

@@ -251,3 +251,54 @@
     FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
     ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
+
+# tomlc99
+
+    MIT License
+
+    Copyright (c) 2017 CK Tan
+    https://github.com/cktan/tomlc99
+
+    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.
+
+# O2 (Katabasis fork)
+
+    Copyright (c) 2012, Akos Polster
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,39 +1,50 @@
-<p align="center">
-  <img src="https://avatars2.githubusercontent.com/u/5411890" alt="MultiMC logo"/>
-</p>
+**This is a "cracked" version of a popular Minecraft launcher that lets you play the game without a Mojang account.**
+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.
+
+Offline mode based by this code:
+https://github.com/MultiMC/MultiMC5/commit/6ede3c13b2bcda315e65dd78f2bfd729bc8b699b
+
+Rewrited for use license and offline accounts at the same time
+
+Details about the original launcher below:
 
 MultiMC 5
 =========
 
-MultiMC is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. It also allows you to easily install and remove mods by simply dragging and dropping. Here are the current [features](https://github.com/MultiMC/MultiMC5/wiki#features) of MultiMC.
-
+MultiMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.
 
 ## Development
-The project uses C++ and Qt5 as the language and base framework. This might seem odd in the Minecraft community, but allows using 25MB of RAM, where other tools use an excessive amount of resources for no reason.
+If you want to contribute, talk to us on [Discord](https://discord.gg/multimc) first.
 
-We can do more, with less, on worse hardware and leave more resources for the game while keeping the launcher running and providing extra features.
+While blindly submitting PRs is definitely possible, they're not necessarily going to get accepted.
 
-If you want to contribute, either talk to us on [Discord](https://discord.gg/multimc), [IRC](http://webchat.esper.net/?nick=&channels=MultiMC)(esper.net/#MultiMC) or pick up some item from the github issues [workflowy](https://github.com/MultiMC/MultiMC5/issues) - there is always plenty of ideas around.
+<<<<<<< HEAD
+We aren't looking for flashy features, but expanding upon the existing feature set without distruption or endangering future viability of the project is OK.
+=======
+If you want to contribute, either talk to us on [Discord](https://discord.gg/0k2zsXGNHs0fE4Wm), [IRC](http://webchat.esper.net/?nick=&channels=MultiMC)(esper.net/#MultiMC) or pick up some item from the github issues [workflowy](https://github.com/Ponywka/MultiMC5-with-offline/issues) - there is always plenty of ideas around.
+>>>>>>> 8f2bcfc5 (Offline patch)
 
 ### Building
 If you want to build MultiMC yourself, check [BUILD.md](BUILD.md) for build instructions.
 
 ### Code formatting
 Just follow the existing formatting.
 
-In general:
-* Indent with 4 space unless it's in a submodule
-* Keep lists (of arguments, parameters, initializators...) as lists, not paragraphs.
+In general, in order of importance:
+* Make sure your IDE is not messing up line endings or whitespace and avoid using linters.
 * Prefer readability over dogma.
+* Keep to the existing formatting.
+* Indent with 4 space unless it's in a submodule.
+* Keep lists (of arguments, parameters, initializers...) as lists, not paragraphs. It should either read from top to bottom, or left to right. Not both.
 
 
 ## Translations
-Translations can be done [on crowdin](https://translate.multimc.org).
+Translations can be done [on crowdin](https://translate.multimc.org). Please avoid making direct pull requests to the translations repository.
 
-## Forking/Redistributing
+## Forking/Redistributing/Custom builds policy
 We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.
 
-Part of the reason for using the Apache license is we don't want people using the "MultiMC" name when redistributing the project. This means people must take the time to go through the source code and remove all references to "MultiMC", including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title).
+Part of the reason for using the Apache license is that we don't want people using the "MultiMC" name when redistributing the project. This means people must take the time to go through the source code and remove all references to "MultiMC", including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title).
 
 Apache covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. However, it should be abundantly clear that the project is a fork *without* implying that you have our blessing.