Skip to content

Commit 95f2928

Browse files
authored
Merge pull request #2964 from TerraFirmaGreg-Team/dev
Release: 0.11.19
2 parents 135f8cb + 59c14e4 commit 95f2928

File tree

849 files changed

+17613
-6573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

849 files changed

+17613
-6573
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "[🐛]: Bug report"
2-
description: "Report a bug where something is not working as expected, which does not crash the game."
2+
description: "Report a bug where something is not working as expected, but does not crash the game."
33
title: "[🐛]: "
44
labels: [ "Status: Backlog" ]
55
projects: ["TerraFirmaGreg-Team/10"]
@@ -10,28 +10,65 @@ body:
1010
id: exists
1111
attributes:
1212
label: "Was this bug reported before?"
13-
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
13+
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
1414
options:
1515
- label: "No, it was not."
1616
required: true
1717

18+
- type: dropdown
19+
id: launcher
20+
validations:
21+
required: true
22+
attributes:
23+
label: "Are you using Prism or Curseforge?"
24+
description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
25+
options:
26+
- "Yes, I am using Prism or Curseforge."
27+
- "No, I am not using Prism or Curseforge."
28+
29+
- type: checkboxes
30+
id: redownload
31+
attributes:
32+
label: "Have you tried redownloading the pack?"
33+
description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
34+
options:
35+
- label: "Not Applicable / Yes, I have tried downloading a new instance."
36+
required: true
37+
38+
- type: input
39+
id: os
40+
validations:
41+
required: true
42+
attributes:
43+
label: Computer OS
44+
description: Write which OS your PC is running on.
45+
placeholder: "Example: Windows 11"
46+
1847
- type: input
1948
id: version
2049
validations:
2150
required: true
2251
attributes:
23-
label: "Version modpack used"
24-
description: "Write which version of the modpack you are using."
52+
label: Modpack Version Used
53+
description: Write which version of the modpack you are using.
2554
placeholder: "Example: 0.1.1"
2655

27-
- type: input
56+
- type: dropdown
2857
id: environment
2958
validations:
3059
required: true
3160
attributes:
32-
label: Environment
33-
description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
34-
placeholder: "Example: Singleplayer"
61+
label: Minecraft Environment
62+
options:
63+
- "Singleplayer"
64+
- "LAN"
65+
- "Forge Server"
66+
- "Sponge Server"
67+
- "Magma Server"
68+
- "Mohist Server"
69+
- "E4MC"
70+
- "Essential"
71+
- "Other"
3572

3673
- type: dropdown
3774
id: world

.github/ISSUE_TEMPLATE/CRASH_REPORT.yml

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,74 @@ body:
99
- type: checkboxes
1010
id: exists
1111
attributes:
12-
label: "Was this crash report before?"
13-
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
12+
label: "Was this crash reported before?"
13+
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
1414
options:
1515
- label: "No, it was not."
1616
required: true
1717

18+
- type: dropdown
19+
id: launcher
20+
validations:
21+
required: true
22+
attributes:
23+
label: "Are you using Prism or Curseforge?"
24+
description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
25+
options:
26+
- "Yes, I am using Prism or Curseforge."
27+
- "No, I am not using Prism or Curseforge."
28+
29+
- type: checkboxes
30+
id: dependencies
31+
attributes:
32+
label: "Did you install required dependencies?"
33+
description: "If you are using Prism or Modrinth you will be instructed to install required mods. Do so."
34+
options:
35+
- label: "Not Applicable / Yes, I have all required dependencies installed."
36+
required: true
37+
38+
- type: checkboxes
39+
id: redownload
40+
attributes:
41+
label: "Have you tried redownloading the pack?"
42+
description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
43+
options:
44+
- label: "Not Applicable / Yes, I have tried downloading a new instance."
45+
required: true
46+
47+
- type: input
48+
id: os
49+
validations:
50+
required: true
51+
attributes:
52+
label: Computer OS
53+
description: Write which OS your PC is running on.
54+
placeholder: "Example: Windows 10"
55+
1856
- type: input
1957
id: version
2058
validations:
2159
required: true
2260
attributes:
23-
label: Version modpack used
61+
label: Modpack Version Used
2462
description: Write which version of the modpack you are using.
2563
placeholder: "Example: 0.1.1"
2664

27-
- type: input
65+
- type: dropdown
2866
id: environment
2967
validations:
3068
required: true
3169
attributes:
32-
label: Environment
33-
description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
34-
placeholder: "Example: Singleplayer"
70+
label: Minecraft Environment
71+
options:
72+
- "Singleplayer"
73+
- "LAN"
74+
- "Forge Server"
75+
- "Sponge Server"
76+
- "Mohist Server"
77+
- "E4MC"
78+
- "Essential"
79+
- "Other"
3580

3681
- type: dropdown
3782
id: crash
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: "[🪡]: Enhancement"
2-
description: "Provide supporting details for a feature in development"
3-
title: "[🪡]: "
1+
name: "[💎]: Enhancement"
2+
description: "Provide details for a gameplay enhancement or improvement."
3+
title: "[💎]: "
44
labels: [ "Status: Backlog" ]
55
projects: ["TerraFirmaGreg-Team/10"]
66
type: "Enhancement"
@@ -9,8 +9,8 @@ body:
99
- type: checkboxes
1010
id: exists
1111
attributes:
12-
label: "Was this enhancement asked before?"
13-
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
12+
label: "Was this enhancement suggested before?"
13+
description: "Please search OPEN/CLOSED issues before submitting, as the enhancement may have already been reported/addressed."
1414
options:
1515
- label: "No, it was not."
1616
required: true
@@ -20,8 +20,8 @@ body:
2020
validations:
2121
required: true
2222
attributes:
23-
label: What would you like to be added?
24-
description: Feature requests are unlikely to make progress as issues.
23+
label: What would you like to be added/ changed?
24+
description: Enhancement requests should focus on gameplay improvements or additions that can be achieved without completely new features. Ex. Rebalancing the energy cost of a recipe.
2525

2626
- type: textarea
2727
id: rationale
@@ -32,4 +32,4 @@ body:
3232

3333
- type: markdown
3434
attributes:
35-
value: "Thanks for taking the time to fill out this request enhancement."
35+
value: "Thanks for taking the time to fill out this enhancement request."

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: "[🪶]: Feature request"
2-
description: "Request a new feature or a change to an existing one."
3-
title: "[🪶]: "
1+
name: "[💡]: Feature request"
2+
description: "Request a new feature or a new mod."
3+
title: "[💡]: "
44
labels: [ "Status: Backlog" ]
55
projects: ["TerraFirmaGreg-Team/10"]
66
type: "Feature"
@@ -10,46 +10,44 @@ body:
1010
id: exists
1111
attributes:
1212
label: "Was this feature suggested before?"
13-
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
13+
description: "Please search OPEN/CLOSED issues before submitting, as the feature may have already been reported/addressed."
1414
options:
1515
- label: "No, it was not."
1616
required: true
1717

18-
- type: input
19-
id: version
20-
validations:
21-
required: true
22-
attributes:
23-
label: "Version modpack used"
24-
description: Write which version of the modpack you are using.
25-
placeholder: "Example: 0.1.1"
26-
27-
- type: textarea
28-
id: problem
29-
validations:
30-
required: false
18+
- type: checkboxes
19+
id: blacklist
3120
attributes:
32-
label: "Related problem"
33-
description: If the feature you wish to change is related to a problem, please desscribe it. Leave this field blank if it is not related to a problem.
34-
placeholder: "Example: I'm always frustrated when..."
21+
label: "A list of popular features/mods the team has already considered and will not implement."
22+
description: |
23+
### Mod Requests:
24+
- Other large tech mods (Immersive Engineering, Mekanism, etc.) will not be added to the pack due to overlap with Gregtech.
25+
- Magic mods (Thaumcraft, Botania, etc.) will not be added to the pack as we wish to be grounded in plausibility.
26+
- Create: the factory must grow. And other large Create mods. They do not work with Greate and we do not wish to focus on Create too much.
27+
- Create Clockworks & Valkyrian Skies. Both cool mods, but impossible to balance in TFG.
28+
- Stargate. Overdone in GT packs. We will work on something unique as an endgame goal.
29+
30+
### Feature Requests:
31+
- Dyson Spheres. Boring and overdone.
32+
- More GT Voltage Tiers. We would prefer to have larger more rounded tiers than many small ones.
33+
options:
34+
- label: "I understand :("
35+
required: true
3536

3637
- type: textarea
37-
id: solution
38+
id: feature
3839
validations:
3940
required: true
4041
attributes:
41-
label: "Your solution"
42-
description: Describe the solution you would like to have happen.
43-
placeholder: "Example: If I could..."
42+
label: What would you like to be added?
43+
description: Feature requests should focus on new gameplay experiences or QoL additions.
4444

4545
- type: textarea
46-
id: additional-info
46+
id: rationale
4747
validations:
48-
required: false
48+
required: true
4949
attributes:
50-
label: "Additional information"
51-
description: Any additional information you wish to provide. Please add anything which did not fit into the other sections here.
52-
placeholder: "Example: This is likely achieveable by doing X because..."
50+
label: Why is this needed?
5351

5452
- type: markdown
5553
attributes:

.github/ISSUE_TEMPLATE/QUESTION.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ body:
99
id: exists
1010
attributes:
1111
label: "Was this question asked before?"
12-
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
12+
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
1313
options:
1414
- label: "No, it was not."
1515
required: true
1616

1717
- type: markdown
1818
attributes:
1919
value: |
20-
If you are in need of quick response, Discord may be a better place. You can find a link to join in our README.md for this project.
20+
If you are in need of a quick response, [Discord](https://discord.gg/AEaCzCTUwQ) may be a better place.
2121
22-
If you are looking for a game wiki, we are currently developing it, however most information is available in-game info through tooltips, JEI/HEI and quest. You can also ask any question on Discord, and someone will most likely have a response.
22+
Most information is available in-game through Tooltips, EMI, Field Guide, or Quests.
23+
An online version of the [Field Guide](https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/) is also available.
24+
25+
For installing a development environment, please refer to the [Contributing Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/.github/CONTRIBUTING.md)
26+
For information about translating please read our [Localization Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/kubejs/README_IF_TRANSLATING.md)
2327
2428
- type: textarea
2529
id: question

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ contact_links:
77
- name: TerraFirmaGreg CurseForge
88
url: https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern
99
about: Download page.
10+
11+
- name: TerraFirmaGreg YouTube
12+
url: https://www.youtube.com/@TFG-modern
13+
about: YouTube channel.

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: 📦 Checkout
37-
uses: actions/checkout@v6.0.1
37+
uses: actions/checkout@v6.0.2
3838
with:
3939
fetch-depth: 0
4040

@@ -229,7 +229,7 @@ jobs:
229229
steps:
230230

231231
- name: Checkout
232-
uses: actions/checkout@v6.0.1
232+
uses: actions/checkout@v6.0.2
233233
with:
234234
fetch-depth: 0
235235

@@ -313,7 +313,7 @@ jobs:
313313
runs-on: ubuntu-latest
314314
steps:
315315
- name: Checkout
316-
uses: actions/checkout@v6.0.1
316+
uses: actions/checkout@v6.0.2
317317

318318
- name: 🔄 Replace strings
319319
shell: bash
@@ -347,7 +347,7 @@ jobs:
347347
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
348348
349349
- name: 📝 Cache Pakku
350-
uses: actions/cache@v5.0.2
350+
uses: actions/cache@v5.0.3
351351
id: cache
352352
with:
353353
path: build/.cache
@@ -460,7 +460,7 @@ jobs:
460460

461461
steps:
462462
- name: 📦 Checkout
463-
uses: actions/checkout@v6.0.1
463+
uses: actions/checkout@v6.0.2
464464

465465
- name: 📦 Download artifact
466466
uses: actions/download-artifact@v7.0.0

.pakku/server-overrides/defaultconfigs/tfc-server.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ familiarityDecayLimit = 0.3
167167
#
168168
# Tank capacity of a crucible (in mB).
169169
#Range: 0 ~ 2147483645
170-
crucibleCapacity = 4032
170+
crucibleCapacity = 4608
171171
#
172172
# A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks.
173173
#Range: > 1

0 commit comments

Comments
 (0)