merged from upstream
This commit is contained in:
commit
d86b4816d7
1836 changed files with 67562 additions and 25471 deletions
53
.github/ISSUE_TEMPLATE/BUG_REPORT.yml
vendored
53
.github/ISSUE_TEMPLATE/BUG_REPORT.yml
vendored
|
|
@ -1,5 +1,5 @@
|
|||
name: "[🐛]: Bug report"
|
||||
description: "Report a bug where something is not working as expected, which does not crash the game."
|
||||
description: "Report a bug where something is not working as expected, but does not crash the game."
|
||||
title: "[🐛]: "
|
||||
labels: [ "Status: Backlog" ]
|
||||
projects: ["TerraFirmaGreg-Team/10"]
|
||||
|
|
@ -10,28 +10,65 @@ body:
|
|||
id: exists
|
||||
attributes:
|
||||
label: "Was this bug reported before?"
|
||||
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
|
||||
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
|
||||
options:
|
||||
- label: "No, it was not."
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: launcher
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: "Are you using Prism or Curseforge?"
|
||||
description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
|
||||
options:
|
||||
- "Yes, I am using Prism or Curseforge."
|
||||
- "No, I am not using Prism or Curseforge."
|
||||
|
||||
- type: checkboxes
|
||||
id: redownload
|
||||
attributes:
|
||||
label: "Have you tried redownloading the pack?"
|
||||
description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
|
||||
options:
|
||||
- label: "Not Applicable / Yes, I have tried downloading a new instance."
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: os
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: Computer OS
|
||||
description: Write which OS your PC is running on.
|
||||
placeholder: "Example: Windows 11"
|
||||
|
||||
- type: input
|
||||
id: version
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: "Version modpack used"
|
||||
description: "Write which version of the modpack you are using."
|
||||
label: Modpack Version Used
|
||||
description: Write which version of the modpack you are using.
|
||||
placeholder: "Example: 0.1.1"
|
||||
|
||||
- type: input
|
||||
- type: dropdown
|
||||
id: environment
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: Environment
|
||||
description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
|
||||
placeholder: "Example: Singleplayer"
|
||||
label: Minecraft Environment
|
||||
options:
|
||||
- "Singleplayer"
|
||||
- "LAN"
|
||||
- "Forge Server"
|
||||
- "Sponge Server"
|
||||
- "Magma Server"
|
||||
- "Mohist Server"
|
||||
- "E4MC"
|
||||
- "Essential"
|
||||
- "Other"
|
||||
|
||||
- type: dropdown
|
||||
id: world
|
||||
|
|
|
|||
59
.github/ISSUE_TEMPLATE/CRASH_REPORT.yml
vendored
59
.github/ISSUE_TEMPLATE/CRASH_REPORT.yml
vendored
|
|
@ -9,29 +9,74 @@ body:
|
|||
- type: checkboxes
|
||||
id: exists
|
||||
attributes:
|
||||
label: "Was this crash report before?"
|
||||
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
|
||||
label: "Was this crash reported before?"
|
||||
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
|
||||
options:
|
||||
- label: "No, it was not."
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: launcher
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: "Are you using Prism or Curseforge?"
|
||||
description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
|
||||
options:
|
||||
- "Yes, I am using Prism or Curseforge."
|
||||
- "No, I am not using Prism or Curseforge."
|
||||
|
||||
- type: checkboxes
|
||||
id: dependencies
|
||||
attributes:
|
||||
label: "Did you install required dependencies?"
|
||||
description: "If you are using Prism or Modrinth you will be instructed to install required mods. Do so."
|
||||
options:
|
||||
- label: "Not Applicable / Yes, I have all required dependencies installed."
|
||||
required: true
|
||||
|
||||
- type: checkboxes
|
||||
id: redownload
|
||||
attributes:
|
||||
label: "Have you tried redownloading the pack?"
|
||||
description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
|
||||
options:
|
||||
- label: "Not Applicable / Yes, I have tried downloading a new instance."
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: os
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: Computer OS
|
||||
description: Write which OS your PC is running on.
|
||||
placeholder: "Example: Windows 10"
|
||||
|
||||
- type: input
|
||||
id: version
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: Version modpack used
|
||||
label: Modpack Version Used
|
||||
description: Write which version of the modpack you are using.
|
||||
placeholder: "Example: 0.1.1"
|
||||
|
||||
- type: input
|
||||
- type: dropdown
|
||||
id: environment
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: Environment
|
||||
description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
|
||||
placeholder: "Example: Singleplayer"
|
||||
label: Minecraft Environment
|
||||
options:
|
||||
- "Singleplayer"
|
||||
- "LAN"
|
||||
- "Forge Server"
|
||||
- "Sponge Server"
|
||||
- "Mohist Server"
|
||||
- "E4MC"
|
||||
- "Essential"
|
||||
- "Other"
|
||||
|
||||
- type: dropdown
|
||||
id: crash
|
||||
|
|
|
|||
16
.github/ISSUE_TEMPLATE/ENHANCEMENT.yml
vendored
16
.github/ISSUE_TEMPLATE/ENHANCEMENT.yml
vendored
|
|
@ -1,6 +1,6 @@
|
|||
name: "[🪡]: Enhancement"
|
||||
description: "Provide supporting details for a feature in development"
|
||||
title: "[🪡]: "
|
||||
name: "[💎]: Enhancement"
|
||||
description: "Provide details for a gameplay enhancement or improvement."
|
||||
title: "[💎]: "
|
||||
labels: [ "Status: Backlog" ]
|
||||
projects: ["TerraFirmaGreg-Team/10"]
|
||||
type: "Enhancement"
|
||||
|
|
@ -9,8 +9,8 @@ body:
|
|||
- type: checkboxes
|
||||
id: exists
|
||||
attributes:
|
||||
label: "Was this enhancement asked before?"
|
||||
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
|
||||
label: "Was this enhancement suggested before?"
|
||||
description: "Please search OPEN/CLOSED issues before submitting, as the enhancement may have already been reported/addressed."
|
||||
options:
|
||||
- label: "No, it was not."
|
||||
required: true
|
||||
|
|
@ -20,8 +20,8 @@ body:
|
|||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: What would you like to be added?
|
||||
description: Feature requests are unlikely to make progress as issues.
|
||||
label: What would you like to be added/ changed?
|
||||
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.
|
||||
|
||||
- type: textarea
|
||||
id: rationale
|
||||
|
|
@ -32,4 +32,4 @@ body:
|
|||
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: "Thanks for taking the time to fill out this request enhancement."
|
||||
value: "Thanks for taking the time to fill out this enhancement request."
|
||||
60
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
vendored
60
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
vendored
|
|
@ -1,6 +1,6 @@
|
|||
name: "[🪶]: Feature request"
|
||||
description: "Request a new feature or a change to an existing one."
|
||||
title: "[🪶]: "
|
||||
name: "[💡]: Feature request"
|
||||
description: "Request a new feature or a new mod."
|
||||
title: "[💡]: "
|
||||
labels: [ "Status: Backlog" ]
|
||||
projects: ["TerraFirmaGreg-Team/10"]
|
||||
type: "Feature"
|
||||
|
|
@ -10,46 +10,44 @@ body:
|
|||
id: exists
|
||||
attributes:
|
||||
label: "Was this feature suggested before?"
|
||||
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
|
||||
description: "Please search OPEN/CLOSED issues before submitting, as the feature may have already been reported/addressed."
|
||||
options:
|
||||
- label: "No, it was not."
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: version
|
||||
- type: checkboxes
|
||||
id: blacklist
|
||||
attributes:
|
||||
label: "A list of popular features/mods the team has already considered and will not implement."
|
||||
description: |
|
||||
### Mod Requests:
|
||||
- Other large tech mods (Immersive Engineering, Mekanism, etc.) will not be added to the pack due to overlap with Gregtech.
|
||||
- Magic mods (Thaumcraft, Botania, etc.) will not be added to the pack as we wish to be grounded in plausibility.
|
||||
- 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.
|
||||
- Create Clockworks & Valkyrian Skies. Both cool mods, but impossible to balance in TFG.
|
||||
- Stargate. Overdone in GT packs. We will work on something unique as an endgame goal.
|
||||
|
||||
### Feature Requests:
|
||||
- Dyson Spheres. Boring and overdone.
|
||||
- More GT Voltage Tiers. We would prefer to have larger more rounded tiers than many small ones.
|
||||
options:
|
||||
- label: "I understand :("
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: feature
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: "Version modpack used"
|
||||
description: Write which version of the modpack you are using.
|
||||
placeholder: "Example: 0.1.1"
|
||||
label: What would you like to be added?
|
||||
description: Feature requests should focus on new gameplay experiences or QoL additions.
|
||||
|
||||
- type: textarea
|
||||
id: problem
|
||||
validations:
|
||||
required: false
|
||||
attributes:
|
||||
label: "Related problem"
|
||||
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.
|
||||
placeholder: "Example: I'm always frustrated when..."
|
||||
|
||||
- type: textarea
|
||||
id: solution
|
||||
id: rationale
|
||||
validations:
|
||||
required: true
|
||||
attributes:
|
||||
label: "Your solution"
|
||||
description: Describe the solution you would like to have happen.
|
||||
placeholder: "Example: If I could..."
|
||||
|
||||
- type: textarea
|
||||
id: additional-info
|
||||
validations:
|
||||
required: false
|
||||
attributes:
|
||||
label: "Additional information"
|
||||
description: Any additional information you wish to provide. Please add anything which did not fit into the other sections here.
|
||||
placeholder: "Example: This is likely achieveable by doing X because..."
|
||||
label: Why is this needed?
|
||||
|
||||
- type: markdown
|
||||
attributes:
|
||||
|
|
|
|||
10
.github/ISSUE_TEMPLATE/QUESTION.yml
vendored
10
.github/ISSUE_TEMPLATE/QUESTION.yml
vendored
|
|
@ -9,7 +9,7 @@ body:
|
|||
id: exists
|
||||
attributes:
|
||||
label: "Was this question asked before?"
|
||||
description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
|
||||
description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
|
||||
options:
|
||||
- label: "No, it was not."
|
||||
required: true
|
||||
|
|
@ -17,9 +17,13 @@ body:
|
|||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
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.
|
||||
If you are in need of a quick response, [Discord](https://discord.gg/AEaCzCTUwQ) may be a better place.
|
||||
|
||||
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.
|
||||
Most information is available in-game through Tooltips, EMI, Field Guide, or Quests.
|
||||
An online version of the [Field Guide](https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/) is also available.
|
||||
|
||||
For installing a development environment, please refer to the [Contributing Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/.github/CONTRIBUTING.md)
|
||||
For information about translating please read our [Localization Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/kubejs/README_IF_TRANSLATING.md)
|
||||
|
||||
- type: textarea
|
||||
id: question
|
||||
|
|
|
|||
4
.github/ISSUE_TEMPLATE/config.yml
vendored
4
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -7,3 +7,7 @@ contact_links:
|
|||
- name: TerraFirmaGreg CurseForge
|
||||
url: https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern
|
||||
about: Download page.
|
||||
|
||||
- name: TerraFirmaGreg YouTube
|
||||
url: https://www.youtube.com/@TFG-modern
|
||||
about: YouTube channel.
|
||||
|
|
|
|||
42
.github/SECURITY.md
vendored
42
.github/SECURITY.md
vendored
|
|
@ -1,42 +0,0 @@
|
|||
# Security Policy
|
||||
|
||||
## Scope
|
||||
|
||||
Keeping users safe and secure is a top priority for us.We welcome the contribution of external security researchers.
|
||||
|
||||
If you believe you’ve found a security or vulnerability issue in the repo we encourage you to notify us.
|
||||
|
||||
There are no hard and fast rules to determine if a bug is worth reporting as a security issue or a “regular” issue.
|
||||
When in doubt, please do send us a report.
|
||||
|
||||
## How to submit a report
|
||||
|
||||
Security issues can be reported by sending an [email to us][contact].
|
||||
|
||||
The team will acknowledge your email within 48 hours. You will receive a more detailed response within 96 hours.
|
||||
|
||||
We will create a maintainer security advisory on GitHub to discuss internally, and when needed, invite you to the
|
||||
advisory.
|
||||
|
||||
## Purpose
|
||||
|
||||
- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our
|
||||
services
|
||||
- Only interact with accounts you own or with explicit permission of the account holder. If you do encounter Personally
|
||||
Identifiable Information (PII) contact us immediately,
|
||||
do not proceed with access, and immediately purge any local information
|
||||
- Provide us with a reasonable amount of time to resolve vulnerabilities prior to any disclosure to the public or a
|
||||
third-party
|
||||
- We will consider activities conducted consistent with this policy to constitute “authorized” conduct and will not
|
||||
pursue civil action or initiate a complaint to law enforcement.
|
||||
We will help to the extent we can if legal action is initiated by a third party against you
|
||||
|
||||
Please submit a report to us before engaging in conduct that may be inconsistent with or unaddressed by this policy.
|
||||
|
||||
## Preferences
|
||||
|
||||
- Please provide detailed reports with reproducible steps and a clearly defined impact
|
||||
- Submit one vulnerability per report
|
||||
- Social engineering (such as phishing, vishing, smishing) is prohibited
|
||||
|
||||
[contact]: mailto:admin@terrafirmagreg.su
|
||||
15
.github/workflows/build.yml
vendored
15
.github/workflows/build.yml
vendored
|
|
@ -34,7 +34,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: 📦 Checkout
|
||||
uses: actions/checkout@v6.0.1
|
||||
uses: actions/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ jobs:
|
|||
steps:
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.1
|
||||
uses: actions/checkout@v6.0.2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.1
|
||||
uses: actions/checkout@v6.0.2
|
||||
|
||||
- name: 🔄 Replace strings
|
||||
shell: bash
|
||||
|
|
@ -327,24 +327,27 @@ jobs:
|
|||
|
||||
|
||||
sed -i -e "s/DEV/${VERSION}/g" pakku.json
|
||||
sed -i -e "s/DEV/${VERSION}/g" .github/docker/docker-compose.yml
|
||||
sed -i -e "s/DEV/${VERSION}/g" config/mod-director/modpack.json
|
||||
sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
|
||||
sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
|
||||
sed -i -e "s/DEV/${VERSION}/g" .pakku/server-overrides/server.properties
|
||||
sed -i -e "s/DEV/${VERSION}/g" .pakku/docker-overrides/docker-compose.yml
|
||||
|
||||
|
||||
sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
|
||||
sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
|
||||
sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
|
||||
|
||||
sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json
|
||||
sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/server-overrides/forge-auto-install.txt
|
||||
sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/docker-overrides/docker-compose.yml
|
||||
|
||||
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
|
||||
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
|
||||
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
|
||||
|
||||
- name: 📝 Cache Pakku
|
||||
uses: actions/cache@v5.0.1
|
||||
uses: actions/cache@v5.0.3
|
||||
id: cache
|
||||
with:
|
||||
path: build/.cache
|
||||
|
|
@ -457,7 +460,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: 📦 Checkout
|
||||
uses: actions/checkout@v6.0.1
|
||||
uses: actions/checkout@v6.0.2
|
||||
|
||||
- name: 📦 Download artifact
|
||||
uses: actions/download-artifact@v7.0.0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue