From 88676823c5b6a97c488b811c359afea308f49707 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:07:10 +0500 Subject: [PATCH 01/36] Update cron.yml --- .github/workflows/cron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index d62d40b15..e6f5d92ca 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -1,7 +1,7 @@ name: Close Not a TFG Bug issues on: schedule: - - cron: "00 22 * * *" + - cron: "0 0 * * *" jobs: close-issues: From b4b27dd4f111e2207c8d095b67c7091e6c18b1cd Mon Sep 17 00:00:00 2001 From: Xikaro <55663835+Xikaro@users.noreply.github.com> Date: Tue, 1 Oct 2024 02:15:46 +0500 Subject: [PATCH 02/36] Create dependabot.yml Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com> --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..d8e682047 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ + +version: 2 +updates: + - package-ecosystem: "" + directory: "/" + schedule: + interval: "weekly" From c06bace8a9cff9a5888293bc730436fa343b7d26 Mon Sep 17 00:00:00 2001 From: Xikaro <55663835+Xikaro@users.noreply.github.com> Date: Tue, 1 Oct 2024 02:16:48 +0500 Subject: [PATCH 03/36] Update dependabot.yml Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com> --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d8e682047..6e7092b03 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - - package-ecosystem: "" + - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" From 11a47c62fa378ac3445c7ff454e5b807bb18bd0f Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:17:08 +0500 Subject: [PATCH 04/36] workflows --- .github/{ => workflows}/dependabot.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/dependabot.yml (100%) diff --git a/.github/dependabot.yml b/.github/workflows/dependabot.yml similarity index 100% rename from .github/dependabot.yml rename to .github/workflows/dependabot.yml From f435efcad64b17c40d7f153b454f77852a2ab451 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:21:02 +0500 Subject: [PATCH 05/36] Update dependabot.yml --- .github/workflows/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 6e7092b03..2d201dfbc 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -1,7 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 updates: - package-ecosystem: "github-actions" directory: "/" + open-pull-requests-limit: 1 schedule: interval: "weekly" From cd4d5b6a52d1832bb866934f5c9ca6d8b9025ae3 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:22:24 +0500 Subject: [PATCH 06/36] =?UTF-8?q?=F0=9F=91=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/{workflows => }/dependabot.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => }/dependabot.yml (100%) diff --git a/.github/workflows/dependabot.yml b/.github/dependabot.yml similarity index 100% rename from .github/workflows/dependabot.yml rename to .github/dependabot.yml From 932e75db467d7d17d163e286ab821d84c2b2bf17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:23:08 +0000 Subject: [PATCH 07/36] Bump actions/download-artifact from 4.1.7 to 4.1.8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.7 to 4.1.8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v4.1.7...v4.1.8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9aede06b4..17eb3a359 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -173,12 +173,12 @@ jobs: fi - name: Download cf modpack - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge - name: Download serverpack - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server @@ -254,7 +254,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download modpack - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: merge-multiple: true From d43761e583bc853cf2fac91a48f6d579fbcb309d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:30:00 +0500 Subject: [PATCH 08/36] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ebe1e685b..152714b50 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ config/xaeroworldmap.txt .vscode/ .idea/ .bobby/ +backups/ profileImage/ crash-reports/ logs/ From a0bd5a51839482ced6dee51648e959c524ac0c22 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:41:54 +0500 Subject: [PATCH 09/36] Update fallingtrees_common.json --- config/fallingtrees_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 2c7c6478f..dc469d421 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -13,7 +13,7 @@ "algorithm": { "maxLeavesRadius": 10, "maxLogAmount": 256, - "shouldFallOnMaxLogAmount": false, + "shouldFallOnMaxLogAmount": true, "shouldIgnorePersistentLeaves": true }, "logFilter": { From 07315ada136e24604d02374788914f17e3254b41 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:42:12 +0500 Subject: [PATCH 10/36] Update fallingtrees_common.json --- config/fallingtrees_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index dc469d421..722adcb68 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -11,7 +11,7 @@ "trees": { "standardTree": { "algorithm": { - "maxLeavesRadius": 10, + "maxLeavesRadius": 20, "maxLogAmount": 256, "shouldFallOnMaxLogAmount": true, "shouldIgnorePersistentLeaves": true From 3af911820d4223149a2fd06f1a370642a83a7c19 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:42:29 +0500 Subject: [PATCH 11/36] Update fallingtrees_common.json --- config/fallingtrees_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 722adcb68..7158f181b 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -11,7 +11,7 @@ "trees": { "standardTree": { "algorithm": { - "maxLeavesRadius": 20, + "maxLeavesRadius": 15, "maxLogAmount": 256, "shouldFallOnMaxLogAmount": true, "shouldIgnorePersistentLeaves": true From 80bebaa3bcff0bb42e14bec513f5469cf8ab1b26 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:56:46 +0500 Subject: [PATCH 12/36] Update .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0bb5bcff7..d6dcf7704 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ # Default to LF for all files -* text=auto \ No newline at end of file +* text=lf \ No newline at end of file From 70f86821ea8a70fcff0de1486107a05f6570a342 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 02:57:13 +0500 Subject: [PATCH 13/36] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D1=80=D0=B0=D1=88=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/fallingtrees_common.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 7158f181b..bb4ed4eb5 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -67,7 +67,7 @@ } }, "chorusTree": { - "enabled": true, + "enabled": false, "onlyFallWithRequiredTool": false, "allowedToolFilter": { "whitelistedTags": [], @@ -78,19 +78,17 @@ "mushroomTree": { "stemFilter": { "whitelistedTags": [ - "minecraft:logs" ], "whitelist": [], "blacklist": [] }, "capFilter": { "whitelistedTags": [ - "minecraft:leaves" ], "whitelist": [], "blacklist": [] }, - "enabled": true, + "enabled": false, "onlyFallWithRequiredTool": false, "allowedToolFilter": { "whitelistedTags": [], From 3adc987a94e955535a2b8b9062a907ec36db8c01 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:15:23 +0500 Subject: [PATCH 14/36] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 07011a708..e2ef2c7d1 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 07011a70855e845bdb11c0896c61467109f0d58f +Subproject commit e2ef2c7d194e7f1be34c70880ad23aa0e64c5a53 From d578877b8edd7f09be6dba7bd9ce8f4a67f86354 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:27:16 +0500 Subject: [PATCH 15/36] Update dependabot.yml --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2d201dfbc..b87f50610 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,3 +10,8 @@ updates: open-pull-requests-limit: 1 schedule: interval: "weekly" + groups: + dependencies: + applies-to: version-updates + patterns: + - "*" From 844bdcc59612760c44ceb3e1e0d36ca1e875dbcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:44:03 +0000 Subject: [PATCH 16/36] Bump the dependencies group with 3 updates Bumps the dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `actions/checkout` from 4.1.4 to 4.2.0 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.4...v4.2.0) Updates `actions/upload-artifact` from 4.3.3 to 4.4.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.3...v4.4.0) Updates `softprops/action-gh-release` from 1 to 2 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17eb3a359..41f848939 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.1.4 + uses: actions/checkout@v4.2.0 - name: Get tag id: project_version @@ -77,7 +77,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge.zip manifest.json modlist.html overrides - name: Upload zip CurseForge - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.4.0 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge.zip @@ -121,7 +121,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - name: Upload zip multimc - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.4.0 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip @@ -152,7 +152,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip .minecraft/* - name: Upload zip - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.4.0 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip @@ -259,7 +259,7 @@ jobs: merge-multiple: true - name: Create release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: false generate_release_notes: true From d92caa68d7016819cd513d726b45f2973d430b7e Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:49:23 +0500 Subject: [PATCH 17/36] Update fallingtrees_common.json --- config/fallingtrees_common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index bb4ed4eb5..727d2f675 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -13,7 +13,7 @@ "algorithm": { "maxLeavesRadius": 15, "maxLogAmount": 256, - "shouldFallOnMaxLogAmount": true, + "shouldFallOnMaxLogAmount": false, "shouldIgnorePersistentLeaves": true }, "logFilter": { From a1bdddf9f8eacebe71801c85b9b259102f998d79 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:49:26 +0500 Subject: [PATCH 18/36] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 154d9e098..5fa9ee313 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.7.13] - 01.10.2024 +### Changes +- Исправление краша при рубке деревьев с грибами на стволе. +### Removed mods +- TFCDesirePaths + ## [0.7.13] - 01.10.2024 ### Changes - Fixed Long Distance Pipes recipe. From 429160c55d8fb8dc66159f734ad9b0406fc247e3 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:57:46 +0500 Subject: [PATCH 19/36] Update client_mod.txt --- .github/buildtools/client_mod.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/buildtools/client_mod.txt b/.github/buildtools/client_mod.txt index 2a1493bfb..6145e538f 100644 --- a/.github/buildtools/client_mod.txt +++ b/.github/buildtools/client_mod.txt @@ -31,6 +31,7 @@ fancymenu* farsight* firstperson* FpsReducer* +ftbbackups2* InventoryHUD* invhud* ItemPhysic Lite * From e913a7f91a8e255cdad746ecf8f1937e1ec71ce7 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:57:49 +0500 Subject: [PATCH 20/36] Update ftbbackups2.json --- config/ftbbackups2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbbackups2.json b/config/ftbbackups2.json index 0e872ef20..58276e688 100644 --- a/config/ftbbackups2.json +++ b/config/ftbbackups2.json @@ -27,7 +27,7 @@ More info here (http://www.cronmaker.com) */ - "backup_cron": "0 */30 * * * ?", + "backup_cron": "0 0 1 * * ?", // Time between manual backups using the command "manual_backups_time": 0, // Only run a backup if a player has been online since the last backup From cbfbe3ad1cdff0680803108a9115cfd18c3d101f Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 11:59:51 +0500 Subject: [PATCH 21/36] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fa9ee313..9761ba718 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## [0.7.13] - 01.10.2024 ### Changes -- Исправление краша при рубке деревьев с грибами на стволе. +- Fixed a crash when cutting down trees with mushrooms on the trunk. +- Adjusted the FTB backups backup that runs every hour. +- FTB backups removed from serverpack. ### Removed mods - TFCDesirePaths From 35510af059fc1bbd1097c88f37634ef7488163b3 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 12:15:23 +0500 Subject: [PATCH 22/36] CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ config/astikorcarts-common.toml | 4 +++- config/fallingtrees_common.json | 6 ++---- config/packetfixer.properties | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9761ba718..a0c8d9a67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ - FTB backups removed from serverpack. ### Removed mods - TFCDesirePaths +### Updated mods +- TFCVesselTooltip 1.0 -> 1.1 +- waterflasks 3.0.2. -> 3.0.3 +- recipeessentials 3.4 -> 3.6 +- noisium 2.0.3 -> 2.3.0 +- cc-tweaked 1.111.0 -> 1.113.1 +- cloth-config 11.1.118 -> 11.1.136 +- curios 5.9.1 -> 5.10.0 +- astikorcarts 1.1.7 -> 1.1.8 +- TFCAstikorCarts 1.1.8.1 -> 1.1.8.2 +- u_team_core 5.1.4.299 -> 5.1.4.312 +- treetap 0.3.0 -> 0.4.0 ## [0.7.13] - 01.10.2024 ### Changes diff --git a/config/astikorcarts-common.toml b/config/astikorcarts-common.toml index f9f52e1a1..df87c6910 100644 --- a/config/astikorcarts-common.toml +++ b/config/astikorcarts-common.toml @@ -1,6 +1,8 @@ #Configuration for all carts and cart-like vehicles, check log for automatic "pull_animals" list. [carts] + #Enable carts being invulnerable to lightning (If false when struck, all items will disappear and mobs escape!) + lightningInvulnerable = true #The Supply Cart, a type of cart that stores items [carts.supply_cart] @@ -26,7 +28,7 @@ #Range: -1.0 ~ 0.0 pull_speed = 0.0 - #The Plow, an animal pulled machine for tilling soil and creating paths + #The Plow, n animal pulled machine for tilling soil and creating paths [carts.plow] #Animals that are able to pull this cart, such as ["minecraft:horse"] #An empty list defaults to all which may wear a saddle but not steered by an item diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 727d2f675..b5605f934 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -77,14 +77,12 @@ }, "mushroomTree": { "stemFilter": { - "whitelistedTags": [ - ], + "whitelistedTags": [], "whitelist": [], "blacklist": [] }, "capFilter": { - "whitelistedTags": [ - ], + "whitelistedTags": [], "whitelist": [], "blacklist": [] }, diff --git a/config/packetfixer.properties b/config/packetfixer.properties index fae0cdfe4..85d13a3bc 100644 --- a/config/packetfixer.properties +++ b/config/packetfixer.properties @@ -1,7 +1,7 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 2097152 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Mon Sep 30 23:09:25 YEKT 2024 +#Tue Oct 01 12:13:54 YEKT 2024 nbtMaxSize=209715200 decoderSize=838860800 packetSize=104857600 From 7c6a651494e3a5ab4340e261f670753d7a2d68c9 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 12:15:26 +0500 Subject: [PATCH 23/36] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index e2ef2c7d1..a5fd6b557 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit e2ef2c7d194e7f1be34c70880ad23aa0e64c5a53 +Subproject commit a5fd6b55716faee52f573531340ecf7c1d9956fd From 5c3b7faecf07920e683f21bf48543062c114b1a9 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 12:16:32 +0500 Subject: [PATCH 24/36] manifest --- .github/buildtools/modpack/manifest.json | 642 +++++++++++------------ .github/buildtools/modpack/modlist.html | 174 +++--- 2 files changed, 408 insertions(+), 408 deletions(-) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index fa99a9deb..9d0cef992 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -16,23 +16,13 @@ "projectID": 385053, "files": [ { - "projectID": 453394, - "fileID": 5280601, + "projectID": 871755, + "fileID": 5751145, "required": true }, { - "projectID": 576589, - "fileID": 5350440, - "required": true - }, - { - "projectID": 302973, - "fileID": 5276689, - "required": true - }, - { - "projectID": 907856, - "fileID": 5293020, + "projectID": 333287, + "fileID": 5729167, "required": true }, { @@ -40,21 +30,21 @@ "fileID": 5257897, "required": true }, - { - "projectID": 273744, - "fileID": 5299142, - "required": true - }, - { - "projectID": 841001, - "fileID": 5356968, - "required": true - }, { "projectID": 367706, "fileID": 5340225, "required": true }, + { + "projectID": 907856, + "fileID": 5581360, + "required": true + }, + { + "projectID": 916493, + "fileID": 5574685, + "required": true + }, { "projectID": 570017, "fileID": 5229844, @@ -66,23 +56,13 @@ "required": true }, { - "projectID": 947914, - "fileID": 5381714, + "projectID": 892005, + "fileID": 5728075, "required": true }, { - "projectID": 688231, - "fileID": 5331300, - "required": true - }, - { - "projectID": 491890, - "fileID": 5344499, - "required": true - }, - { - "projectID": 333287, - "fileID": 5729167, + "projectID": 670986, + "fileID": 5093785, "required": true }, { @@ -96,13 +76,18 @@ "required": true }, { - "projectID": 871755, - "fileID": 5751145, + "projectID": 441647, + "fileID": 5629578, "required": true }, { - "projectID": 316582, - "fileID": 5661478, + "projectID": 266890, + "fileID": 5647065, + "required": true + }, + { + "projectID": 419699, + "fileID": 5137938, "required": true }, { @@ -111,8 +96,8 @@ "required": true }, { - "projectID": 419699, - "fileID": 5137938, + "projectID": 491890, + "fileID": 5344499, "required": true }, { @@ -126,23 +111,23 @@ "required": true }, { - "projectID": 622737, - "fileID": 4834403, + "projectID": 240633, + "fileID": 4655091, "required": true }, { - "projectID": 441647, - "fileID": 5629578, + "projectID": 300331, + "fileID": 4832944, "required": true }, { - "projectID": 922713, - "fileID": 5366124, + "projectID": 513402, + "fileID": 5394097, "required": true }, { - "projectID": 670986, - "fileID": 5093785, + "projectID": 316582, + "fileID": 5661478, "required": true }, { @@ -150,24 +135,29 @@ "fileID": 4911084, "required": true }, - { - "projectID": 916747, - "fileID": 5644693, - "required": true - }, - { - "projectID": 407206, - "fileID": 5761157, - "required": true - }, { "projectID": 891816, "fileID": 5064623, "required": true }, { - "projectID": 531761, - "fileID": 5644976, + "projectID": 254284, + "fileID": 5739342, + "required": true + }, + { + "projectID": 618298, + "fileID": 5326245, + "required": true + }, + { + "projectID": 714158, + "fileID": 5316956, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, "required": true }, { @@ -181,13 +171,18 @@ "required": true }, { - "projectID": 240633, - "fileID": 4655091, + "projectID": 470013, + "fileID": 4923669, "required": true }, { - "projectID": 916493, - "fileID": 4988266, + "projectID": 404465, + "fileID": 5567591, + "required": true + }, + { + "projectID": 1056812, + "fileID": 5656688, "required": true }, { @@ -196,8 +191,8 @@ "required": true }, { - "projectID": 892005, - "fileID": 5728075, + "projectID": 317780, + "fileID": 5658224, "required": true }, { @@ -215,16 +210,6 @@ "fileID": 5217955, "required": true }, - { - "projectID": 404465, - "fileID": 5567591, - "required": true - }, - { - "projectID": 930207, - "fileID": 5302292, - "required": true - }, { "projectID": 627196, "fileID": 5090810, @@ -241,23 +226,18 @@ "required": true }, { - "projectID": 714158, - "fileID": 5316956, + "projectID": 238222, + "fileID": 5440261, "required": true }, { - "projectID": 952386, - "fileID": 4971650, + "projectID": 495476, + "fileID": 5707404, "required": true }, { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 223794, - "fileID": 5641282, + "projectID": 930207, + "fileID": 5650506, "required": true }, { @@ -266,83 +246,8 @@ "required": true }, { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 880630, - "fileID": 5653236, - "required": true - }, - { - "projectID": 263420, - "fileID": 5685657, - "required": true - }, - { - "projectID": 908741, - "fileID": 5352230, - "required": true - }, - { - "projectID": 973588, - "fileID": 5686125, - "required": true - }, - { - "projectID": 326652, - "fileID": 5470032, - "required": true - }, - { - "projectID": 499096, - "fileID": 5224988, - "required": true - }, - { - "projectID": 686911, - "fileID": 5425036, - "required": true - }, - { - "projectID": 433760, - "fileID": 5698665, - "required": true - }, - { - "projectID": 975460, - "fileID": 5653131, - "required": true - }, - { - "projectID": 952112, - "fileID": 5064493, - "required": true - }, - { - "projectID": 238222, - "fileID": 5440261, - "required": true - }, - { - "projectID": 272335, - "fileID": 5714571, - "required": true - }, - { - "projectID": 1017637, - "fileID": 5338560, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 297038, - "fileID": 5608316, + "projectID": 952386, + "fileID": 5677386, "required": true }, { @@ -350,9 +255,119 @@ "fileID": 5296475, "required": true }, + { + "projectID": 499980, + "fileID": 5768751, + "required": true + }, + { + "projectID": 257814, + "fileID": 5743457, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 922713, + "fileID": 5366124, + "required": true + }, + { + "projectID": 973588, + "fileID": 5686125, + "required": true + }, + { + "projectID": 688231, + "fileID": 5331300, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 326652, + "fileID": 5470032, + "required": true + }, + { + "projectID": 273744, + "fileID": 5523168, + "required": true + }, + { + "projectID": 309927, + "fileID": 5680164, + "required": true + }, + { + "projectID": 952112, + "fileID": 5064493, + "required": true + }, + { + "projectID": 663477, + "fileID": 5746857, + "required": true + }, + { + "projectID": 270441, + "fileID": 5739352, + "required": true + }, { "projectID": 354353, - "fileID": 4891706, + "fileID": 5666352, + "required": true + }, + { + "projectID": 407206, + "fileID": 5761157, + "required": true + }, + { + "projectID": 975460, + "fileID": 5653131, + "required": true + }, + { + "projectID": 1017637, + "fileID": 5338560, + "required": true + }, + { + "projectID": 688367, + "fileID": 5689932, + "required": true + }, + { + "projectID": 439890, + "fileID": 5473648, + "required": true + }, + { + "projectID": 686911, + "fileID": 5425036, + "required": true + }, + { + "projectID": 429371, + "fileID": 4884096, + "required": true + }, + { + "projectID": 580555, + "fileID": 5436769, + "required": true + }, + { + "projectID": 982512, + "fileID": 5551629, "required": true }, { @@ -365,39 +380,24 @@ "fileID": 5320730, "required": true }, - { - "projectID": 257814, - "fileID": 5743457, - "required": true - }, - { - "projectID": 289412, - "fileID": 5543955, - "required": true - }, - { - "projectID": 266890, - "fileID": 5647065, - "required": true - }, - { - "projectID": 899986, - "fileID": 5125661, - "required": true - }, { "projectID": 250398, "fileID": 4646682, "required": true }, { - "projectID": 317780, - "fileID": 5658224, + "projectID": 916747, + "fileID": 5644693, "required": true }, { - "projectID": 513402, - "fileID": 5394097, + "projectID": 790626, + "fileID": 5425647, + "required": true + }, + { + "projectID": 454372, + "fileID": 5102258, "required": true }, { @@ -406,8 +406,13 @@ "required": true }, { - "projectID": 439890, - "fileID": 5473648, + "projectID": 289412, + "fileID": 5543955, + "required": true + }, + { + "projectID": 841001, + "fileID": 5356968, "required": true }, { @@ -415,34 +420,39 @@ "fileID": 4906217, "required": true }, + { + "projectID": 908741, + "fileID": 5352230, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 940350, + "fileID": 5313702, + "required": true + }, + { + "projectID": 282001, + "fileID": 5714507, + "required": true + }, + { + "projectID": 738663, + "fileID": 5760231, + "required": true + }, { "projectID": 627824, "fileID": 5685940, "required": true }, { - "projectID": 880532, - "fileID": 5331987, - "required": true - }, - { - "projectID": 580555, - "fileID": 5436769, - "required": true - }, - { - "projectID": 233071, - "fileID": 5623639, - "required": true - }, - { - "projectID": 844019, - "fileID": 5141430, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, + "projectID": 880630, + "fileID": 5653236, "required": true }, { @@ -450,29 +460,24 @@ "fileID": 5046696, "required": true }, - { - "projectID": 438332, - "fileID": 4715408, - "required": true - }, - { - "projectID": 254284, - "fileID": 5739342, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, { "projectID": 550678, "fileID": 4627738, "required": true }, { - "projectID": 499980, - "fileID": 5768751, + "projectID": 438332, + "fileID": 4715408, + "required": true + }, + { + "projectID": 223794, + "fileID": 5641282, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, "required": true }, { @@ -485,11 +490,6 @@ "fileID": 4766090, "required": true }, - { - "projectID": 927874, - "fileID": 5112443, - "required": true - }, { "projectID": 676136, "fileID": 5200949, @@ -501,8 +501,13 @@ "required": true }, { - "projectID": 454372, - "fileID": 5102258, + "projectID": 272335, + "fileID": 5714571, + "required": true + }, + { + "projectID": 297038, + "fileID": 5608316, "required": true }, { @@ -511,13 +516,18 @@ "required": true }, { - "projectID": 618298, - "fileID": 5326245, + "projectID": 622737, + "fileID": 4834403, "required": true }, { - "projectID": 636608, - "fileID": 5556895, + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 245028, + "fileID": 4891607, "required": true }, { @@ -526,8 +536,13 @@ "required": true }, { - "projectID": 688367, - "fileID": 5689932, + "projectID": 880532, + "fileID": 5331987, + "required": true + }, + { + "projectID": 720848, + "fileID": 4608859, "required": true }, { @@ -540,26 +555,11 @@ "fileID": 4680832, "required": true }, - { - "projectID": 940350, - "fileID": 5313702, - "required": true - }, - { - "projectID": 470013, - "fileID": 4923669, - "required": true - }, { "projectID": 581495, "fileID": 5299671, "required": true }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, { "projectID": 689467, "fileID": 5416166, @@ -571,28 +571,28 @@ "required": true }, { - "projectID": 982512, - "fileID": 5551629, + "projectID": 927874, + "fileID": 5589123, "required": true }, { - "projectID": 282001, - "fileID": 5379173, + "projectID": 947914, + "fileID": 5381714, "required": true }, { - "projectID": 309927, - "fileID": 5367944, + "projectID": 499096, + "fileID": 5224988, "required": true }, { - "projectID": 1056812, - "fileID": 5656688, + "projectID": 890405, + "fileID": 5369020, "required": true }, { - "projectID": 357540, - "fileID": 5639966, + "projectID": 433760, + "fileID": 5698665, "required": true }, { @@ -600,39 +600,29 @@ "fileID": 5028413, "required": true }, + { + "projectID": 636608, + "fileID": 5556895, + "required": true + }, + { + "projectID": 551736, + "fileID": 4731947, + "required": true + }, { "projectID": 943925, "fileID": 4926070, "required": true }, - { - "projectID": 495476, - "fileID": 5707404, - "required": true - }, - { - "projectID": 738663, - "fileID": 5760231, - "required": true - }, { "projectID": 858542, "fileID": 5284015, "required": true }, { - "projectID": 790626, - "fileID": 5425647, - "required": true - }, - { - "projectID": 245028, - "fileID": 4891607, - "required": true - }, - { - "projectID": 720848, - "fileID": 4608859, + "projectID": 348521, + "fileID": 5729105, "required": true }, { @@ -650,14 +640,29 @@ "fileID": 4596742, "required": true }, + { + "projectID": 302973, + "fileID": 5276689, + "required": true + }, + { + "projectID": 899986, + "fileID": 5125661, + "required": true + }, { "projectID": 410811, "fileID": 4896152, "required": true }, { - "projectID": 663477, - "fileID": 5746857, + "projectID": 357540, + "fileID": 5639966, + "required": true + }, + { + "projectID": 576589, + "fileID": 5350440, "required": true }, { @@ -665,11 +670,6 @@ "fileID": 5326142, "required": true }, - { - "projectID": 890405, - "fileID": 5369020, - "required": true - }, { "projectID": 828656, "fileID": 4932788, @@ -690,11 +690,6 @@ "fileID": 5226922, "required": true }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, { "projectID": 435044, "fileID": 4596768, @@ -711,13 +706,13 @@ "required": true }, { - "projectID": 583345, - "fileID": 4925840, + "projectID": 844019, + "fileID": 5645573, "required": true }, { - "projectID": 270441, - "fileID": 5739352, + "projectID": 263420, + "fileID": 5685657, "required": true }, { @@ -730,14 +725,24 @@ "fileID": 4961778, "required": true }, + { + "projectID": 233071, + "fileID": 5623639, + "required": true + }, { "projectID": 274259, "fileID": 4882500, "required": true }, { - "projectID": 300331, - "fileID": 4832944, + "projectID": 453394, + "fileID": 5280601, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, "required": true }, { @@ -751,24 +756,19 @@ "required": true }, { - "projectID": 852668, - "fileID": 4710223, + "projectID": 531761, + "fileID": 5644976, "required": true }, { - "projectID": 551736, - "fileID": 4731947, + "projectID": 852668, + "fileID": 4710223, "required": true }, { "projectID": 60089, "fileID": 5338457, "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true } ], "overrides": "overrides" diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 560bdf958..ab10ff626 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,153 +1,153 @@  From 2d5485e6e8b954a5958ed540ec30e07a345bf05d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 1 Oct 2024 12:16:38 +0500 Subject: [PATCH 25/36] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0c8d9a67..f5e25ff48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.7.13] - 01.10.2024 +## [0.7.14] - 01.10.2024 ### Changes - Fixed a crash when cutting down trees with mushrooms on the trunk. - Adjusted the FTB backups backup that runs every hour. From 8dac34f837c96456cc0cbca3c1a642e575155b4e Mon Sep 17 00:00:00 2001 From: Aleksandr Valiulin Date: Sun, 6 Oct 2024 00:47:12 +0500 Subject: [PATCH 26/36] fix #476 Fixed typo in quest --- config/ftbquests/quests/chapters/primitive_age.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index f49a02006..73181c5cd 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -1974,7 +1974,7 @@ } } match_nbt: false - title: "A copper or bronze axe" + title: "A copper or bronze hammer" type: "item" }] x: 12.0d From 81eb193c127de9ca97f57fc97f2858d1cefd6d4c Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 11:26:18 +0500 Subject: [PATCH 27/36] workflows --- .github/workflows/cron.yml | 23 ----------------------- .github/workflows/release.yml | 6 ++++-- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/cron.yml diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml deleted file mode 100644 index e6f5d92ca..000000000 --- a/.github/workflows/cron.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Close Not a TFG Bug issues -on: - schedule: - - cron: "0 0 * * *" - -jobs: - close-issues: - name: Close issues - runs-on: ubuntu-latest - permissions: - issues: write - steps: - - uses: actions/stale@v9.0.0 - with: - days-before-issue-stale: 30 - days-before-issue-close: 14 - days-before-pr-stale: -1 - days-before-pr-close: -1 - any-of-issue-labels: '1. Type: Not a TFG Bug' - stale-issue-label: '2. Status: Stale' - stale-issue-message: "This issue is stale because it has been open for 30 days with no activity." - close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale." - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41f848939..d3e5d82b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,10 @@ -name: Build -run-name: "Build #${{ github.run_number }}" +name: Release +run-name: "Release #${{ github.run_number }}" on: push: + branches: + - main tags: - "*.*.*" From afd043880f06083997bf233ccd78cf94e191072d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 11:33:46 +0500 Subject: [PATCH 28/36] Update release.yml --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3e5d82b4..7054045d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,8 @@ -name: Release -run-name: "Release #${{ github.run_number }}" +name: Build +run-name: Build #${{ github.run_number }} by @${{ github.actor }} on: push: - branches: - - main tags: - "*.*.*" From 5073ab12ae9ddcd37afc95ff523e11ea5b863669 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 11:37:38 +0500 Subject: [PATCH 29/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ad7be6fb..e72cbb913 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ · Request Features · - Roadmap + Roadmap


From 8b5a6b63bb67a86a15393f641cb64ea37a0f8ccf Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 11:53:05 +0500 Subject: [PATCH 30/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e72cbb913..37c35c63c 100644 --- a/README.md +++ b/README.md @@ -45,4 +45,4 @@ Also in the modpack there are other interesting mods that will allow you to pass and others, also all these mods have addons to diversify the gameplay even more! To make it easier for you to start developing in this complex world, there are quests in the modpack, with the help of them you can get used to this unfriendly world. -![img](https://github.com/TerraFirmaGreg-Team/Modpack-1.12.x/assets/55663835/0a71cfbf-c519-45b8-820c-c5ad6bf90e46) +![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/image_readme.png?raw=true) From 53e15cda460e26077c23f0ef6b3628b12b20f451 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 12:01:17 +0500 Subject: [PATCH 31/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37c35c63c..ffeff00d7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@
-![logotfg](https://user-images.githubusercontent.com/52341158/131987786-bf99e1af-318c-4ed4-a6f8-c4617d692adb.png) +![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/terrafirmagreg-og.png?raw=true) *** From 74270145929b13dc0a495df88e5494cb9f91471a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 12:07:04 +0500 Subject: [PATCH 32/36] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ffeff00d7..88d938ab1 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,15 @@
- Logo + Logo
- Chat on Discord + Chat on Discord - Available on СurseForge + Available on СurseForge

Explore the wiki @@ -24,7 +24,7 @@


-![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/terrafirmagreg-og.png?raw=true) +![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo_large.png?raw=true) *** From 703c72725003c6202c22e1c58a0b3ca409ae44df Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 12:52:38 +0500 Subject: [PATCH 33/36] workflows --- .github/workflows/release.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7054045d7..d2ada53bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -283,10 +283,10 @@ jobs: with: webhook-url: ${{secrets.RELEASES_1_20}} username: "TerraFirmaGreg" - avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge.png" + avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo.png" embed-title: Release ${{ needs.info.outputs.project_version }} embed-url: https://github.com/${{ github.repository }}/releases/tag/${{ needs.info.outputs.project_version }} - embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo.png + embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge_logo.png embed-description: | **Release Type**: `${{ env.RELEASE_TYPE }}` **GameVersion**: `${{ needs.info.outputs.mc_version }}` diff --git a/README.md b/README.md index 88d938ab1..da0de509d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
- + Chat on Discord From 033c4dda809ddaa70578a55a3a74cec3522ffe63 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 6 Oct 2024 13:05:25 +0500 Subject: [PATCH 34/36] Update .gitignore --- .gitignore | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 152714b50..ccfab5998 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ # Configs config/jei/world/ +config/roughlyenoughitems/ +config/fantasticlib/ +config/gregtech/terminal/ config/oculus.properties config/fml.toml @@ -17,6 +20,17 @@ config/xaerominimap_entities.json config/voicechat/username-cache.json config/xaerominimap.txt config/xaeroworldmap.txt +config/jei/worldSettings.cfg +config/JustEnoughCalculation/record.json +config/splash.properties +config/customloadingscreen_timings.nbt +config/simplelogin.cfg +config/fancymenu/menu_identifiers.db +config/fancymenu/user_variables.db +config/AppliedEnergistics2/items.csv +config/AppliedEnergistics2/CustomRecipes.cfg +config/cherishedworlds/favorites.dat + # Client data .vscode/ @@ -25,15 +39,20 @@ config/xaeroworldmap.txt backups/ profileImage/ crash-reports/ +classOut/ logs/ +cache/ saves/ ldlib/ local/ modernfix/ +vintagefix/ XaeroWaypoints*/ XaeroWorldMap*/ xaero/ CustomSkinLoader/ +EverlastingSkins/ +visualores/ screenshots/ shaderpacks/ chiselsandbits/ @@ -46,13 +65,19 @@ usernamecache.json usercache.json rhino.local.properties fancymenu_data/last_world.fmdata +local/ftbutilities/backups.json + profile.json +OpenComputersMod-* emi.json servers.dat servers.dat_old cherishedworlds-favorites.dat realms_persistence.json minecraftinstance.json +hei_bookmarks.ini +optionsof.txt +optionsshaders.txt knownkeys.txt # Server data @@ -63,4 +88,5 @@ knownkeys.txt !.github/buildtools/serverpack/start_server.bat !.github/buildtools/serverpack/user_jvm_args.txt !.github/buildtools/serverpack/minecraft_server.jar -.github/buildtools/serverpack/* \ No newline at end of file +.github/buildtools/serverpack/* + From a64b1566eb89cb5990e0610131ea943f7f4b3adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:25:46 +0000 Subject: [PATCH 35/36] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 4.2.0 to 4.2.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.0...v4.2.1) Updates `actions/upload-artifact` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2ada53bd..89f1385a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 - name: Get tag id: project_version @@ -59,7 +59,7 @@ jobs: needs: [info] steps: - name: Checkout - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 - name: Replace strings shell: bash @@ -77,7 +77,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge.zip manifest.json modlist.html overrides - name: Upload zip CurseForge - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.1 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-curseforge.zip @@ -89,7 +89,7 @@ jobs: needs: [info] steps: - name: Checkout - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 - name: Replace strings shell: bash @@ -121,7 +121,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - name: Upload zip multimc - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.1 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-multimc.zip @@ -133,7 +133,7 @@ jobs: needs: [info] steps: - name: Checkout - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 - name: Download Mods run: | @@ -152,7 +152,7 @@ jobs: zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip .minecraft/* - name: Upload zip - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.1 with: name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip @@ -239,7 +239,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.0 + uses: actions/checkout@v4.2.1 - name: Сlose fixed in dev uses: Xikaro/close-issues-based-on-label@master From 260008772fd31493011d05d0b38b9bd9e138d8bb Mon Sep 17 00:00:00 2001 From: Aleksandr Valiulin Date: Sun, 13 Oct 2024 16:11:59 +0500 Subject: [PATCH 36/36] fix #523 Fixed needed item in HV:AE2 Raw Quartz from ore block to poor/raw/rich ore. --- config/ftbquests/quests/chapters/ae2.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt index c204397fc..4c38b476a 100644 --- a/config/ftbquests/quests/chapters/ae2.snbt +++ b/config/ftbquests/quests/chapters/ae2.snbt @@ -1922,7 +1922,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:ores/certus_quartz)" + "ftbfiltersystem:filter": "or(item(gtceu:rich_raw_certus_quartz)item(gtceu:raw_certus_quartz)item(gtceu:poor_raw_certus_quartz))" } } title: "Any #forge:ores/certus_quartz"