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
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 *
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 @@
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..b87f50610
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# 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"
+ groups:
+ dependencies:
+ applies-to: version-updates
+ patterns:
+ - "*"
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
deleted file mode 100644
index d62d40b15..000000000
--- a/.github/workflows/cron.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Close Not a TFG Bug issues
-on:
- schedule:
- - cron: "00 22 * * *"
-
-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 9aede06b4..89f1385a4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
name: Build
-run-name: "Build #${{ github.run_number }}"
+run-name: Build #${{ github.run_number }} by @${{ github.actor }}
on:
push:
@@ -25,7 +25,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v4.1.4
+ 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.3.3
+ 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.3.3
+ 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.3.3
+ 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
@@ -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
@@ -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
@@ -254,12 +254,12 @@ 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
- name: Create release
- uses: softprops/action-gh-release@v1
+ uses: softprops/action-gh-release@v2
with:
prerelease: false
generate_release_notes: true
@@ -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/.gitignore b/.gitignore
index 4897e6de1..7fc015e5f 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
+
# .minecraft
crash-reports/*
@@ -46,17 +60,23 @@ chiselsandbits/*
.vscode/
.idea/
.bobby/
+backups/
profileImage/
crash-reports/
+classOut/
logs/
+cache/
saves/
ldlib/
local/
modernfix/
+vintagefix/
XaeroWaypoints*/
XaeroWorldMap*/
xaero/
CustomSkinLoader/
+EverlastingSkins/
+visualores/
screenshots/
shaderpacks/
chiselsandbits/
@@ -70,13 +90,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
@@ -89,4 +115,3 @@ knownkeys.txt
!.github/buildtools/serverpack/minecraft_server.jar
.github/buildtools/serverpack/*
/icon-exports-x32
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59ba28fd0..721758666 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,26 @@
### Updated mods
- ??
+## [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.
+- 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
- Fixed Long Distance Pipes recipe.
diff --git a/README.md b/README.md
index 5ad7be6fb..da0de509d 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,15 @@
-
+
***
@@ -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.
-
+
diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json
index 2c7c6478f..b5605f934 100644
--- a/config/fallingtrees_common.json
+++ b/config/fallingtrees_common.json
@@ -11,7 +11,7 @@
"trees": {
"standardTree": {
"algorithm": {
- "maxLeavesRadius": 10,
+ "maxLeavesRadius": 15,
"maxLogAmount": 256,
"shouldFallOnMaxLogAmount": false,
"shouldIgnorePersistentLeaves": true
@@ -67,7 +67,7 @@
}
},
"chorusTree": {
- "enabled": true,
+ "enabled": false,
"onlyFallWithRequiredTool": false,
"allowedToolFilter": {
"whitelistedTags": [],
@@ -77,20 +77,16 @@
},
"mushroomTree": {
"stemFilter": {
- "whitelistedTags": [
- "minecraft:logs"
- ],
+ "whitelistedTags": [],
"whitelist": [],
"blacklist": []
},
"capFilter": {
- "whitelistedTags": [
- "minecraft:leaves"
- ],
+ "whitelistedTags": [],
"whitelist": [],
"blacklist": []
},
- "enabled": true,
+ "enabled": false,
"onlyFallWithRequiredTool": false,
"allowedToolFilter": {
"whitelistedTags": [],
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
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"
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
+ 
+
+ 
- 
+ 