Skip to content

Commit

Permalink
Merge branch 'release' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexIIL committed Aug 20, 2023
2 parents 0da5df1 + 32d3c3c commit 0852886
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,11 @@ protected static String getRelease(String version) {
int year = Integer.parseInt(matcher.group(1));
int week = Integer.parseInt(matcher.group(2));

if (year >= 23 && week >= 12) {
if (year >= 23 && week >= 31) {
return "1.20.2";
} else if (year == 23 && week >= 12 && week <= 18) {
return "1.20";
} else if (year == 23 && week >= 3) {
} else if (year == 23 && week <= 7) {
return "1.19.4";
} else if (year == 22 && week >= 42 || year >= 23) {
// 22w42a started not including a release_target again, hence the large gap
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/changelog/0.19.3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Features:

- Added versioning support for 1.20.2 snapshots (upstream sync from Fabric)
- Added a fallback system for the global config/cache folders
- If the normal global folders can't be accessed then per-instance fallback folders are used instead:
- `<instance>/config/global` and `<instance>/cache/global`.
- These also respect the `loader.configDir` and `loader.cacheDir` system properties.
3 changes: 3 additions & 0 deletions src/main/resources/changelog/0.19.4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Features:

- Updated provided version of Fabric Loader to 0.14.22
3 changes: 3 additions & 0 deletions src/main/resources/changelog/0.19.5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Features:

- [RFC#84] Removed the active user beacon.
2 changes: 1 addition & 1 deletion src/main/resources/quilt.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"provides": [
{
"id": "fabricloader",
"version": "0.14.21"
"version": "0.14.22"
}
]
}
Expand Down

0 comments on commit 0852886

Please sign in to comment.