diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index a0514eeeb..319198c73 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml index 6520e1409..37bb57c86 100644 --- a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml index 2e4288bc9..0e86bfcb0 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml @@ -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." \ No newline at end of file + value: "Thanks for taking the time to fill out this enhancement request." \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml index a73f7aa56..735dc2c3c 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml @@ -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: diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index ba1b89c57..ac1db729d 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index c09d1b5d1..98025f0b1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -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. diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json index 9cda74328..6ccf049c2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json @@ -34,7 +34,7 @@ }, { "type": "patchouli:text", - "text": "若你不想费心计算配比，我们推荐使用$(item)25份金属矿粉$()和$(item)22份燃料$()的组合。在投入所需的$(thing)燃料$()和$(thing)矿石$()后，点燃锻铁炉方块并等上 15 小时。锻铁炉熄灭后会留下许多方坯方块。用镐反复挖掘$(thing)方坯$()便能得到$(thing)生铁方坯$()。" + "text": "若你不想费心计算配比，我们推荐使用$(item)25份金属矿粉$()和$(item)22份燃料$()的组合。在投入所需的$(thing)燃料$()和$(thing)矿石$()后，点燃锻铁炉门并等上 15 小时。锻铁炉熄灭后会留下许多方坯方块。用镐反复挖掘$(thing)方坯$()便能得到$(thing)生铁方坯$()。" }, { "type": "patchouli:multiblock", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json index 2dad79376..c6189f085 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json @@ -12,6 +12,15 @@ "type": "patchouli:text", "text": "除了从野生作物获取种子，栽培作物也会产出种子。当一株完全成熟的作物不论是因为天气原因，或是过了收获时节而枯萎时就会转变为种子，为下一季种植更多作物提供了保障。" }, + { + "type": "patchouli:text", + "title": "目录", + "text": "$(li)$(l:tfc:mechanics/crops#barley)大麦$()$(li)$(l:tfc:mechanics/crops#beet)甜菜$()$(li)$(l:tfc:mechanics/crops#cabbage)卷心菜$()$(li)$(l:tfc:mechanics/crops#canola)油菜$()$(li)$(l:tfc:mechanics/crops#carrot)胡萝卜$()$(li)$(l:tfc:mechanics/crops#flax)亚麻$()$(li)$(l:tfc:mechanics/crops#garlic)大蒜$()$(li)$(l:tfc:mechanics/crops#green_bean)绿豆$()$(li)$(l:tfc:mechanics/crops#jute)黄麻$()$(li)$(l:tfc:mechanics/crops#maize)玉米$()$(li)$(l:tfc:mechanics/crops#melon)西瓜$()$(li)$(l:tfc:mechanics/crops#oat)燕麦$()$(li)$(l:tfc:mechanics/crops#onion)洋葱$()" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfc:mechanics/crops#papyrus)纸莎草$()$(li)$(l:tfc:mechanics/crops#potato)马铃薯$()$(li)$(l:tfc:mechanics/crops#pumpkin)南瓜$()$(li)$(l:tfc:mechanics/crops#red_bell_pepper)红甜椒$()$(li)$(l:tfc:mechanics/crops#rice)大米$()$(li)$(l:tfc:mechanics/crops#rye)黑麦$()$(li)$(l:tfc:mechanics/crops#soybean)大豆$()$(li)$(l:tfc:mechanics/crops#squash)西葫芦$()$(li)$(l:tfc:mechanics/crops#sugarcane)甘蔗$()$(li)$(l:tfc:mechanics/crops#sunflower)向日葵$()$(li)$(l:tfc:mechanics/crops#tomatoes)西红柿$()$(li)$(l:tfc:mechanics/crops#wheat)小麦$()$(li)$(l:tfc:mechanics/crops#yellow_bell_pepper)黄甜椒$()" + }, { "type": "tfc:rock_knapping_recipe", "title": "Contents", @@ -780,7 +789,7 @@ }, { "type": "tfc:multimultiblock", - "text": "", + "text": "注意：种植水稻种子的方块必须$(thing)含水$()。", "multiblocks": [ { "pattern": [ @@ -3308,8 +3317,8 @@ { "type": "patchouli:text", "anchor": "sunflower", - "text": "$(bold)$(l:the_world/climate#temperature)温度$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)湿度$(): 10 - 60 %$(br)$(bold)营养物质$()：磷$(br2)油菜是一种两格高的作物。油菜种子可种植在耕地上，生长到两格高，并生产可加工为$(thing)种子油$()的$(item)油菜籽荚$()。种子油既可用作灯油，也可在后期用于制作$(thing)生物柴油$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，油菜同样被视为有效花源。", - "title": "油菜" + "text": "$(bold)$(l:the_world/climate#temperature)温度$()：5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：20 - 80 %$(br)$(bold)营养物质$()：氮$(br2)向日葵是一种两格高的作物。向日葵种子可以种植在耕地上，生长到两格高，并生产可加工为$(thing)种子油$()的$(item)向日葵花盘$()。种子油既可用作灯油，也可在后期用于制作$(thing)生物柴油$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，向日葵同样被视为有效花源。", + "title": "向日葵" }, { "type": "tfc:multimultiblock", @@ -3467,8 +3476,8 @@ { "type": "patchouli:text", "anchor": "canola", - "text": "$(bold)$(l:the_world/climate#temperature)温度$()：5 - 37 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：25 - 100 %$(br)$(bold)营养物质$()：氮$(br2)亚麻是一种两格高的农作物。亚麻种子可以种植在耕地上，生长到两格高，并生产用于加工为$(thing)亚麻布$()的$(item)亚麻茎杆$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，亚麻同样被视为有效花源。", - "title": "亚麻" + "text": "$(bold)$(l:the_world/climate#temperature)温度$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)湿度$(): 10 - 60 %$(br)$(bold)营养物质$()：磷$(br2)油菜是一种两格高的作物。油菜种子可种植在耕地上，生长到两格高，并生产可加工为$(thing)种子油$()的$(item)油菜籽荚$()。种子油既可用作灯油，也可在后期用于制作$(thing)生物柴油$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，油菜同样被视为有效花源。", + "title": "油菜" }, { "type": "tfc:multimultiblock", @@ -3627,8 +3636,8 @@ { "type": "patchouli:text", "anchor": "flax", - "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -8 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 15 - 65 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)Flax is a two block tall crop. Flax seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Flax Stems$() which can be processed into $(thing)Linen$() or $(thing)Burlap$().$(br)Flax also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", - "title": "Flax" + "text": "$(bold)$(l:the_world/climate#temperature)温度$()：5 - 37 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：25 - 100 %$(br)$(bold)营养物质$()：氮$(br2)亚麻是一种两格高的农作物。亚麻种子可以种植在耕地上，生长到两格高，并生产用于加工为$(thing)亚麻布$()的$(item)亚麻茎杆$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，亚麻同样被视为有效花源。", + "title": "亚麻" }, { "type": "tfc:multimultiblock", diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 571a8438b..86807a155 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -385,6 +385,13 @@ const registerFramedBlocksRecipes = (event) => { A: '#minecraft:planks', B: '#forge:rods/wooden' }).id('framedblocks:framed_cube') + + event.recipes.gtceu.assembler('tfg:assembler/framedblocks/framed_cube') + .itemInputs('4x #minecraft:planks', '4x #forge:rods/wooden') + .circuit(8) + .itemOutputs('framedblocks:framed_cube') + .duration(40) + .EUt(GTValues.VA[GTValues.ULV]) // Framed Fence event.shaped('3x framedblocks:framed_fence', [