Merge branch '1.18' into 1.16

# Conflicts:
#	.github/workflows/test.yml
#	build.gradle
#	gradle.properties
#	src/main/kotlin/xyz/deathsgun/modmanager/api/gui/list/ListWidget.kt
#	src/main/kotlin/xyz/deathsgun/modmanager/api/http/HttpClient.kt
#	src/main/kotlin/xyz/deathsgun/modmanager/gui/ModsOverviewScreen.kt
#	src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt
#	src/main/resources/fabric.mod.json
#	src/main/resources/modmanager.mixins.json

Author: DeathsGun

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
         uses: actions/checkout@v2
       - name: validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk 16
+      - name: setup jdk 8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8

CHANGELOG.md

@@ -1,14 +1,129 @@
-**IMPORTANT: ModManager v1.2.0-alpha+1.17 uses Fabric-Loader 0.12 you can't use 0.11**
-Please update ModManager first and then your Fabric installation
+# Changelog
 
-Bugs fixed:
+## [Unreleased]
+
+### Added
+
+- Update all button. Update all your mods in one go! [#100](https://github.com/DeathsGun/ModManager/issues/100)
+
+### Fixed
+
+- Race condition when showing the update notification [#108](https://github.com/DeathsGun/ModManager/issues/108)
+- Mods showing up that are actually up-to-date [#101](https://github.com/DeathsGun/ModManager/issues/101)
+
+### Changed
+
+- Updated to 1.18.1
+- Updated Russian translation (thanks to Felix14-v2) [#97](https://github.com/DeathsGun/ModManager/pull/97)
+
+## [1.2.1] - 22.11.2021
+
+### Added
+
+- Compatibility with 1.18-pre releases
+
+### Fixed
+
+- Essentials compatibility [#84](https://github.com/DeathsGun/ModManager/issues/84)
+- preLaunch errors [#95](https://github.com/DeathsGun/ModManager/issues/95)
+
+## [1.2.0-alpha] - 05.11.2021
+
+### Added
+
+- A back button [#87](https://github.com/DeathsGun/ModManager/issues/87)
+- New browsing experience by allowing more detailed filters [#79](https://github.com/DeathsGun/ModManager/issues/79)
+- Hide mods being shown in the updatable mods section [#77](https://github.com/DeathsGun/ModManager/issues/77)
+
+### Fixed
 
 - Delete mods on preLaunch which should avoid the update
   problem [#91](https://github.com/DeathsGun/ModManager/issues/91)
 
-Improvements:
+### Changed
 
-- Updated to Fabric-Loader 0.12
-- Added a back button [#87](https://github.com/DeathsGun/ModManager/issues/87)
-- New browsing experience by allowing more detailed filters [#79](https://github.com/DeathsGun/ModManager/issues/79)
-- Hide mods being shown in the updatable mods section [#77](https://github.com/DeathsGun/ModManager/issues/77)
+- Minimum ```fabric-loader``` version is now 0.12
+
+## [1.1.1-alpha] - 06.10.2021
+
+### Fixed
+
+- Old versions not being deleted (Now really) [#51](https://github.com/DeathsGun/ModManager/issues/51)
+- Whitespaces producing errors [#70](https://github.com/DeathsGun/ModManager/issues/70)
+- Tabs producing errors [#67](https://github.com/DeathsGun/ModManager/issues/67)
+
+### Changed
+
+- Updated turkish translation (thanks to kuzeeeyk) [#75](https://github.com/DeathsGun/ModManager/pull/75)
+
+## [1.1.0-alpha] - 01.10.2021
+
+### Added
+
+- Allows mods to specify their Modrinth project id [#8](https://github.com/DeathsGun/ModManager/issues/8)
+- Icons are now cached through restarts (Max: 10 MB) [#24](https://github.com/DeathsGun/ModManager/issues/24)
+- Restart notification when mods get updated, removed or
+  installed [#30](https://github.com/DeathsGun/ModManager/issues/30)
+- Continue scrolling in the mod list [#38](https://github.com/DeathsGun/ModManager/issues/38)
+- Show changelog, current version and target version before
+  update [#41](https://github.com/DeathsGun/ModManager/issues/41)
+- Sort mods by relevance, downloads, updated and newest [#45](https://github.com/DeathsGun/ModManager/issues/45)
+- Allows mods to disable update checking for their mod [#62](https://github.com/DeathsGun/ModManager/issues/62)
+
+### Fixed
+
+- NullPointerException when updating mods [#42](https://github.com/DeathsGun/ModManager/issues/42)
+- NullPointerException when mods not follow SemVer [#61](https://github.com/DeathsGun/ModManager/issues/64)
+- Forge versions shown as update [#56](https://github.com/DeathsGun/ModManager/issues/56)
+- Old versions not being deleted [#51](https://github.com/DeathsGun/ModManager/issues/51)
+- Mods shown outdated but there actually up to date [#52](https://github.com/DeathsGun/ModManager/issues/52)
+
+### Changed
+
+- Rewrite in Kotlin [#44](https://github.com/DeathsGun/ModManager/pull/44)
+
+## [1.0.2-alpha] - 03.09.2021
+
+### Added
+
+- New loading icon [#40](https://github.com/DeathsGun/ModManager/pull/40)
+- Chinese translation (Special thanks to MineCommanderCN) [#36](https://github.com/DeathsGun/ModManager/pull/36)
+- Korean translation (Special thanks to arlytical#1) [#32](https://github.com/DeathsGun/ModManager/pull/32)
+- Russian translation (Special thanks to Felix14-v2) [#31](https://github.com/DeathsGun/ModManager/pull/31)
+
+### Fixed
+
+- CPU overload when using ModManager [#48](https://github.com/DeathsGun/ModManager/issues/48)
+- Forge artifacts being downloaded [#37](https://github.com/DeathsGun/ModManager/pull/37)
+- NullPointerException's while updating a mod [#34](https://github.com/DeathsGun/ModManager/issues/34)
+
+### Changed
+
+- Improved Turkish translation (Special thanks to kuzeeeyk) [#39](https://github.com/DeathsGun/ModManager/pull/39)
+
+## [1.0.1-alpha] - 24.08.2021
+
+### Added
+
+- Turkish translation (Special thanks to kuzeeeyk) [#21](https://github.com/DeathsGun/ModManager/pull/21)
+- Only show "Updatable mods" category when there are updatable
+  mods [#10](https://github.com/DeathsGun/ModManager/issues/10)
+
+### Fixed
+
+- Crashes when opening ModMenu [#13](https://github.com/DeathsGun/ModManager/issues/13)
+- Update error on Windows because of file locks [#17](https://github.com/DeathsGun/ModManager/issues/13)
+- Search only when enter key was hit for improved performance [#7](https://github.com/DeathsGun/ModManager/issues/7)
+- Crashes when ModManager loses connection while opening a more detailed
+  view [#16](https://github.com/DeathsGun/ModManager/issues/16)
+- Icons being mixed up [#22](https://github.com/DeathsGun/ModManager/issues/22)
+- Unknown mods showing up [#18](https://github.com/DeathsGun/ModManager/issues/18)
+
+## [1.0.0-alpha] - 23.08.2021
+
+### Added
+
+- Browsing through Modrinth
+- Install, remove and update mods
+- Notification about updates
+- Overview about mods that can be updated

Readme.md

@@ -11,9 +11,11 @@ Features:
 
 ### Screenshots
 
+![](screenshots/mod-overview.png)
+Select multiple categories:
+![](screenshots/categories.png)
 Search view:
 ![](screenshots/search.png)
-![](screenshots/mod-overview.png)
 Updatable mods list:
 ![](screenshots/updatable-mods.png)
 Mod Update:

build.gradle

@@ -86,9 +86,15 @@ jar {
     }
 }
 
+task zip(type: Zip, dependsOn: remapJar) {
+    from remapJar
+}
+build.finalizedBy(zip)
+
+
 import com.modrinth.minotaur.TaskModrinthUpload
-import com.modrinth.minotaur.request.VersionType
 import com.modrinth.minotaur.request.Dependency
+import com.modrinth.minotaur.request.VersionType
 
 task publishModrinth(type: TaskModrinthUpload) {
     onlyIf {
@@ -99,10 +105,10 @@ task publishModrinth(type: TaskModrinthUpload) {
     projectId = "6kq7BzRK"
     versionNumber = version
     uploadFile = remapJar
-    versionType = VersionType.ALPHA
-    addGameVersion(project.minecraft_version)
+    versionType = VersionType.RELEASE
+    addGameVersion(project.release_target)
     addLoader("fabric")
-    addDependency("E4QBMVtO", Dependency.DependencyType.REQUIRED)
-    addDependency("1qsZV7U7", Dependency.DependencyType.REQUIRED)
+    addDependency("E4QBMVtO", Dependency.DependencyType.REQUIRED) // Mod Menu
+    addDependency("1qsZV7U7", Dependency.DependencyType.REQUIRED) // fabric-language-kotlin
     changelog = file("CHANGELOG.md").getText("UTF-8")
 }

gradle.properties

@@ -16,6 +16,7 @@
 org.gradle.jvmargs=-Xms2G -Xmx4G
 # Fabric Properties
 # check this on https://modmuss50.me/fabric.html
+release_target=1.16
 minecraft_version=1.16.5
 yarn_mappings=1.16.5+build.10
 loader_version=0.12.5
@@ -26,5 +27,4 @@ archives_base_name=modmanager
 # Dependencies
 modmenu_version=1.16.22
 # Kotlin
-kotlin_version=1.5.30
 fabric_kotlin_version=1.6.4+kotlin.1.5.30

gradle/wrapper/gradle-wrapper.jar

@@ -1,21 +1,5 @@
-#
-# Copyright 2021 DeathsGun
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists