Merge pull request #305 from LifeMC-Studios/dev_main

Major updates and bug fixes 2024 part2

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: lifemcstudios
+ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -53,6 +53,10 @@ body:
         - 1.0.0+1.18.2
         - 1.0.0+1.19.4
         - 1.0.0+1.20.1
+        - 1.0.1+1.18.2
+        - 1.0.1+1.19.4
+        - 1.0.1+1.20.1
+        - 1.0.1+1.20.2
     validations:
       required: true
 
@@ -62,11 +66,12 @@ body:
       label: 🚀 Launcher
       description: Which Launcher do you use?
       options:
-        - ATLauncher
         - MultiMC
         - PolyMC
         - Prism Launcher
+        - ATLauncher
         - Modrinth App (Beta)
+        - BakaXL
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discord Server
-    url: https://discord.com/invite/dnVdDSUJFZ
+    url: https://discord.com/invite/XRcdUqrY9R
     about: Join our Discord server for discussions and support.

.github/auto_assign.yml

@@ -7,7 +7,7 @@ addAssignees: true
 # A list of reviewers to be added to pull requests (GitHub user name)
 reviewers:
   - Nukecraft5419
-  - Webbilizard
+  - MasterMC5801
 
 # A list of keywords to be skipped the process that add reviewers if pull requests include it
 # skipKeywords:

.github/dependabot.yml

@@ -8,4 +8,7 @@ updates:
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
+    open-pull-requests-limit: 0
+    labels:
+      - "pr: dependencies"

CONTRIBUTING.md

@@ -27,11 +27,11 @@
 
 ## 🛡️ Code of Conduct
 
-🚫 Please note that the LifeMC project is governed by the Contributor's Agreement version 2.1. By participating, you are expected to abide by this code. Please report any unacceptable behaviour in the [Server Discord](https://discord.com/invite/dnVdDSUJFZ)
+🚫 Please note that the LifeMC project is governed by the Contributor's Agreement version 2.1. By participating, you are expected to abide by this code. Please report any unacceptable behaviour in the [Server Discord](https://discord.com/invite/XRcdUqrY9R)
 
 ## 📚 Resources 
 
-- 🎤 [Server Discord](https://discord.com/invite/dnVdDSUJFZ)
+- 🎤 [Server Discord](https://discord.com/invite/XRcdUqrY9R)
 - 🔗 [Modrinth](https://modrinth.com/modpack/lifemc)
 - 🐛 [Issue Tracker](https://github.com/LifeMC-Studios/LifeMC/issues)
 - 🔒 [Security Policy](https://github.com/LifeMC-Studios/LifeMC/blob/main/SECURITY.md)

Packwiz/1.18.2/config/fabric_loader_dependencies.json

@@ -8,7 +8,7 @@
     },
     "minecraft": {
       "+recommends": {
-        "LifeMC": ">1.0.0+1.18.2"
+        "LifeMC": ">1.0.1+1.18.2"
       }
     }
   }

Packwiz/1.18.2/config/lifemc.json

@@ -1,3 +1,3 @@
 {
-  "version_number": "1.0.0+1.18.2"
-}
+  "version_number": "1.0.+1.18.2"
+}

Packwiz/1.18.2/config/yosbr/config/fabrishot.properties

@@ -1,3 +1,3 @@
 custom_file_name=lifemc_%time%
-override_screenshot_key=true
+override_screenshot_key=false
 save_file=true

Packwiz/1.18.2/config/yosbr/config/fancymenu/customization/lifemc-mainmenu.dark.txt

@@ -69,6 +69,40 @@ customization {
   action = hidebutton
 }
 
+customization {
+  identifier = %id=628382%
+  orientation = bottom-left
+  x = 72
+  action = movebutton
+  y = -59
+}
+
+customization {
+  identifier = %id=628382%
+  width = 24
+  action = resizebutton
+  height = 24
+}
+
+customization {
+  identifier = %id=628382%
+  action = setbuttonlabel
+  value =
+}
+
+customization {
+  identifier = %id=628382%
+  loopbackgroundanimations = true
+  restartbackgroundanimations = true
+  action = setbuttontexture
+  delayappearanceeverytime = false
+  fadein = true
+  fadeinspeed = 1.0
+  delayappearance = true
+  backgroundhovered = config/resources/minecraft/buttons/dark/lifemc-btn-screenshot-menu-on.dark.png
+  backgroundnormal = config/resources/minecraft/buttons/dark/lifemc-btn-screenshot-menu-off.dark.png
+}
+
 customization {
   identifier = %id=button_compatibility_id:mc_titlescreen_options_button%
   orientation = bottom-centered
@@ -360,7 +394,7 @@ customization {
   orientation = bottom-centered
   restartbackgroundanimations = true
   delayappearanceseconds = 1.0
-  buttonaction = openlink;https://discord.com/invite/dnVdDSUJFZ%btnaction_splitter_fm%
+  buttonaction = openlink;https://discord.com/invite/XRcdUqrY9R%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/dark/lifemc-btn-discord-on.dark.png
   label =
   loopbackgroundanimations = true
@@ -380,14 +414,14 @@ customization {
 customization {
   orientation = top-centered
   delayappearanceseconds = 1.0
-  path = config/resources/minecraft/images/piggy.png
+  path = config/resources/minecraft/images/lifemc_logo.png
   fadein = true
   fadeinspeed = 1.0
-  x = -46
-  width = 92
+  x = -65
+  width = 130
   action = addtexture
   actionid = 94ca028e-47bf-48d4-a288-b70d208b55931686853321724
-  y = 10
+  y = 50
   delayappearance = true
   delayappearanceeverytime = false
   height = 130
@@ -421,12 +455,13 @@ customization {
   delayappearanceseconds = 1.0
   buttonaction = openlink;https://modrinth.com/modpack/lifemc/versions?g={"placeholder":"mcversion"}%btnaction_splitter_fm%quitgame%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/dark/lifemc-btn-update-on.dark.png
+  description = {"placeholder":"local","values":{"key":"lifemc.btn.update"}}
   label =
   loopbackgroundanimations = true
   fadein = true
   fadeinspeed = 1.0
-  x = -206
-  width = 170
+  x = -63
+  width = 24
   action = addbutton
   actionid = 0a82d1ec-9544-4d7e-be74-46c199c2fdfb1686853479674
   y = -45
@@ -485,31 +520,6 @@ customization {
   height = 14
 }
 
-customization {
-  orientation = bottom-right
-  enable_scrolling = false
-  shadow = true
-  delayappearanceseconds = 1.0
-  scale = 1.0
-  source = {"placeholder":"local","values":{"key":"lifemc.btn.update"}}
-  [loading_requirement:fancymenu_visibility_requirement_is_text][requirement_mode:if_not][req_id:73c5094f-6006-47e2-b158-3f64abad0f921687979544461] = ["mode":"equals","text":"{"placeholder":"json","values":{"source":"config/lifemc.json","json_path":"$.version_number"}}","compare_with":"{"placeholder":"json","values":{"source":"https://raw.githubusercontent.com/LifeMC-Studios/LifeMC/main/Packwiz/{"placeholder":"mcversion"}/config/lifemc.json","json_path":"$.version_number"}}"]$
-  text_border = 0
-  case_mode = normal
-  fadein = true
-  source_mode = direct
-  line_spacing = 1
-  fadeinspeed = 1.0
-  x = -178
-  width = 130
-  action = custom_layout_element:fancymenu_customization_item_text
-  actionid = ba55f9f2-9967-4953-8821-e9c2f82cba421687979276025
-  y = -39
-  delayappearance = true
-  alignment = centered
-  delayappearanceeverytime = false
-  height = 14
-}
-
 customization {
   orientation = bottom-left
   restartbackgroundanimations = true
@@ -535,7 +545,7 @@ customization {
   orientation = bottom-left
   restartbackgroundanimations = true
   delayappearanceseconds = 1.0
-  buttonaction = openlink;https://patreon.com/LifeMCStudios%btnaction_splitter_fm%
+  buttonaction = openlink;https://github.com/LifeMC-Studios/LifeMC/blob/main/CONTRIBUTING.md%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/dark/lifemc-btn-donation-on.dark.png
   label =
   loopbackgroundanimations = true

Packwiz/1.18.2/config/yosbr/config/fancymenu/customization/lifemc-mainmenu.light.txt

@@ -69,6 +69,40 @@ customization {
   action = hidebutton
 }
 
+customization {
+  identifier = %id=628382%
+  orientation = bottom-left
+  x = 72
+  action = movebutton
+  y = -59
+}
+
+customization {
+  identifier = %id=628382%
+  width = 24
+  action = resizebutton
+  height = 24
+}
+
+customization {
+  identifier = %id=628382%
+  action = setbuttonlabel
+  value =
+}
+
+customization {
+  identifier = %id=628382%
+  loopbackgroundanimations = true
+  restartbackgroundanimations = true
+  action = setbuttontexture
+  delayappearanceeverytime = false
+  fadein = true
+  fadeinspeed = 1.0
+  delayappearance = true
+  backgroundhovered = config/resources/minecraft/buttons/light/lifemc-btn-screenshot-menu-on.light.png
+  backgroundnormal = config/resources/minecraft/buttons/light/lifemc-btn-screenshot-menu-off.light.png
+}
+
 customization {
   identifier = %id=button_compatibility_id:mc_titlescreen_options_button%
   orientation = bottom-centered
@@ -360,7 +394,7 @@ customization {
   orientation = bottom-centered
   restartbackgroundanimations = true
   delayappearanceseconds = 1.0
-  buttonaction = openlink;https://discord.com/invite/dnVdDSUJFZ%btnaction_splitter_fm%
+  buttonaction = openlink;https://discord.com/invite/XRcdUqrY9R%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/light/lifemc-btn-discord-on.light.png
   label =
   loopbackgroundanimations = true
@@ -380,14 +414,14 @@ customization {
 customization {
   orientation = top-centered
   delayappearanceseconds = 1.0
-  path = config/resources/minecraft/images/piggy.png
+  path = config/resources/minecraft/images/lifemc_logo.png
   fadein = true
   fadeinspeed = 1.0
-  x = -46
-  width = 92
+  x = -65
+  width = 130
   action = addtexture
   actionid = 94ca028e-47bf-48d4-a288-b70d208b55931686853321724
-  y = 10
+  y = 50
   delayappearance = true
   delayappearanceeverytime = false
   height = 130
@@ -421,12 +455,13 @@ customization {
   delayappearanceseconds = 1.0
   buttonaction = openlink;https://modrinth.com/modpack/lifemc/versions?g={"placeholder":"mcversion"}%btnaction_splitter_fm%quitgame%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/light/lifemc-btn-update-on.light.png
+  description = {"placeholder":"local","values":{"key":"lifemc.btn.update"}}
   label =
   loopbackgroundanimations = true
   fadein = true
   fadeinspeed = 1.0
-  x = -206
-  width = 170
+  x = -63
+  width = 24
   action = addbutton
   actionid = 0a82d1ec-9544-4d7e-be74-46c199c2fdfb1686853479674
   y = -45
@@ -485,31 +520,6 @@ customization {
   height = 14
 }
 
-customization {
-  orientation = bottom-right
-  enable_scrolling = false
-  shadow = true
-  delayappearanceseconds = 1.0
-  scale = 1.0
-  source = {"placeholder":"local","values":{"key":"lifemc.btn.update"}}
-  [loading_requirement:fancymenu_visibility_requirement_is_text][requirement_mode:if_not][req_id:73c5094f-6006-47e2-b158-3f64abad0f921687979544461] = ["mode":"equals","text":"{"placeholder":"json","values":{"source":"config/lifemc.json","json_path":"$.version_number"}}","compare_with":"{"placeholder":"json","values":{"source":"https://raw.githubusercontent.com/LifeMC-Studios/LifeMC/main/Packwiz/{"placeholder":"mcversion"}/config/lifemc.json","json_path":"$.version_number"}}"]$
-  text_border = 0
-  case_mode = normal
-  fadein = true
-  source_mode = direct
-  line_spacing = 1
-  fadeinspeed = 1.0
-  x = -178
-  width = 130
-  action = custom_layout_element:fancymenu_customization_item_text
-  actionid = ba55f9f2-9967-4953-8821-e9c2f82cba421687979276025
-  y = -39
-  delayappearance = true
-  alignment = centered
-  delayappearanceeverytime = false
-  height = 14
-}
-
 customization {
   orientation = bottom-left
   restartbackgroundanimations = true
@@ -535,7 +545,7 @@ customization {
   orientation = bottom-left
   restartbackgroundanimations = true
   delayappearanceseconds = 1.0
-  buttonaction = openlink;https://patreon.com/LifeMCStudios%btnaction_splitter_fm%
+  buttonaction = openlink;https://github.com/LifeMC-Studios/LifeMC/blob/main/CONTRIBUTING.md%btnaction_splitter_fm%
   backgroundhovered = config/resources/minecraft/buttons/light/lifemc-btn-donation-on.light.png
   label =
   loopbackgroundanimations = true