Changeset 83ba924 in Launcher
- Timestamp:
-
Feb 16, 2021 12:20:34 PM
(3 years ago)
- Author:
- Jonathan Neufeld <support@…>
- Branches:
- feature/microsoft-oidc, master
- Children:
- 965c92c
- Parents:
- c15dff5 (diff), ff12d15 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- Message:
-
Merge remote-tracking branch 'vanilla/feat/new-authentication'
# Conflicts:
# build.gradle
# creator-tools/build.gradle
# creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/controller/WelcomeController.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/AboutDialog.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/BuilderConfigDialog.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/GenerateListingDialog.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/PackManagerFrame.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/WelcomeDialog.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/model/creator/Pack.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/model/swing/PackTableModel.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/model/swing/ProblemTableModel.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/server/TestServerBuilder.java
# gradle/wrapper/gradle-wrapper.properties
# launcher-bootstrap/build.gradle
# launcher-fancy/build.gradle
# readme/pack_manager.png
-
(No files)
-
