Merge pull request #357 from LifeMC-Studios/dev_main

✨ v1.0.6 is out!
LifeMC-Studios · May 17, 2024 · ae64fad · ae64fad
2 parents bbebd03 + 8bcc7fe
commit ae64fad
Show file tree

Hide file tree

Showing 1,320 changed files with 11,413 additions and 32,871 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -75,6 +75,9 @@ body:
         - 1.0.5+1.20.1
         - 1.0.5+1.20.2
         - 1.0.5+1.20.4
+        - 1.0.6+1.18.2
+        - 1.0.6+1.19.4
+        - 1.0.6+1.20.4
     validations:
       required: true
 

diff --git a/CLI/packwiz-modrinth-export.sh b/CLI/packwiz-modrinth-export.sh
@@ -47,8 +47,6 @@ show_menu() {
     echo "Which version do you want to export?"
     echo "1. 1.18.2"
     echo "2. 1.19.4"
-    echo "3. 1.20.1"
-    echo "4. 1.20.2"
     echo "5. 1.20.4"
     echo "6. 1.20.5"
     echo "7. All versions"
@@ -89,12 +87,6 @@ while true; do
         2)
             export_modpack "1.19.4"
         ;;
-        3)
-            export_modpack "1.20.1"
-        ;;
-        4)
-            export_modpack "1.20.2"
-        ;;
         5)
             export_modpack "1.20.4"
         ;;
@@ -108,8 +100,6 @@ while true; do
             sleep 1
             export_modpack "1.18.2"
             export_modpack "1.19.4"
-            export_modpack "1.20.1"
-            export_modpack "1.20.2"
             export_modpack "1.20.4"
             export_modpack "1.20.5"
         ;;

diff --git a/CLI/packwiz-update.sh b/CLI/packwiz-update.sh
@@ -47,8 +47,6 @@ show_menu() {
     echo "Which version would you like to update?"
     echo "1. 1.18.2"
     echo "2. 1.19.4"
-    echo "3. 1.20.1"
-    echo "4. 1.20.2"
     echo "5. 1.20.4"
     echo "6. 1.20.5"
     echo "7. All versions"
@@ -88,12 +86,6 @@ while true; do
         2)
             update_modpack "1.19.4"
         ;;
-        3)
-            update_modpack "1.20.1"
-        ;;
-        4)
-            update_modpack "1.20.2"
-        ;;
         5)
             update_modpack "1.20.4"
         ;;

diff --git a/CLI/update-languages.sh b/CLI/update-languages.sh
@@ -50,8 +50,6 @@ show_menu() {
     echo "Which version do you want to update the languages to?"
     echo "1. 1.18.2"
     echo "2. 1.19.4"
-    echo "3. 1.20.1"
-    echo "4. 1.20.2"
     echo "5. 1.20.4"
     echo "6. 1.20.5"
     echo "7. All versions"
@@ -95,12 +93,6 @@ while true; do
         2)
             update_languages "1.19.4"
         ;;
-        3)
-            update_languages "1.20.1"
-        ;;
-        4)
-            update_languages "1.20.2"
-        ;;
         5)
             update_languages "1.20.4"
         ;;
@@ -114,8 +106,6 @@ while true; do
             sleep 1
             update_languages "1.18.2"
             update_languages "1.19.4"
-            update_languages "1.20.1"
-            update_languages "1.20.2"
             update_languages "1.20.4"
             update_languages "1.20.5"
         ;;

diff --git a/COPYING.md b/COPYING.md
diff --git a/Crowdin/lang/af_za.json b/Crowdin/lang/af_za.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ar_sa.json b/Crowdin/lang/ar_sa.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/be_by.json b/Crowdin/lang/be_by.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/bg_bg.json b/Crowdin/lang/bg_bg.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ca_es.json b/Crowdin/lang/ca_es.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/cs_cz.json b/Crowdin/lang/cs_cz.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/cy_gb.json b/Crowdin/lang/cy_gb.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/da_dk.json b/Crowdin/lang/da_dk.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/de_ch.json b/Crowdin/lang/de_ch.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/de_de.json b/Crowdin/lang/de_de.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/el_gr.json b/Crowdin/lang/el_gr.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/en_gb.json b/Crowdin/lang/en_gb.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/en_pt.json b/Crowdin/lang/en_pt.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/en_ud.json b/Crowdin/lang/en_ud.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "¡ʍoN ǝʇɐpd∩",
-  "lifemc.notification.update": "¡ƆWǝɟᴉ˥ ɹoɟ ǝlqɐlᴉɐʌɐ ǝʇɐpdn ʍǝN",
   "lifemc.copying": "˙soᴉpnʇS ƆWǝɟᴉ˥ ㄣᄅ0ᄅ-Ɩᄅ0ᄅ © ˙pǝʌɹǝsǝɹ sʇɥƃᴉɹ ll∀",
   "sodium.option_impact.low": "ʍo˥",
   "sodium.option_impact.medium": "ɯnᴉpǝW",

diff --git a/Crowdin/lang/en_us.json b/Crowdin/lang/en_us.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/eo_uy.json b/Crowdin/lang/eo_uy.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/es_ar.json b/Crowdin/lang/es_ar.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/es_es.json b/Crowdin/lang/es_es.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/et_ee.json b/Crowdin/lang/et_ee.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/fa_ir.json b/Crowdin/lang/fa_ir.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/fi_fi.json b/Crowdin/lang/fi_fi.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/fil_ph.json b/Crowdin/lang/fil_ph.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/fr_ca.json b/Crowdin/lang/fr_ca.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/fr_fr.json b/Crowdin/lang/fr_fr.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/he_il.json b/Crowdin/lang/he_il.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/hi_in.json b/Crowdin/lang/hi_in.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/hr_hr.json b/Crowdin/lang/hr_hr.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/hu_hu.json b/Crowdin/lang/hu_hu.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/id_id.json b/Crowdin/lang/id_id.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/is_is.json b/Crowdin/lang/is_is.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/it_it.json b/Crowdin/lang/it_it.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Aggiorna ora!",
-  "lifemc.notification.update": "Nuovo aggiornamento disponibile per LifeMC!",
   "lifemc.copying": "Tutti i diritti riservati. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Basso",
   "sodium.option_impact.medium": "Medio",

diff --git a/Crowdin/lang/it_lt.json b/Crowdin/lang/it_lt.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ja_jp.json b/Crowdin/lang/ja_jp.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ka_ge.json b/Crowdin/lang/ka_ge.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ko_kr.json b/Crowdin/lang/ko_kr.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/lol_us.json b/Crowdin/lang/lol_us.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/lv_lv.json b/Crowdin/lang/lv_lv.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/ms_my.json b/Crowdin/lang/ms_my.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/nl_nl.json b/Crowdin/lang/nl_nl.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/nn_no.json b/Crowdin/lang/nn_no.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/no_no.json b/Crowdin/lang/no_no.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/pl_pl.json b/Crowdin/lang/pl_pl.json
@@ -1,6 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
   "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
   "sodium.option_impact.low": "Low",
   "sodium.option_impact.medium": "Medium",

diff --git a/Crowdin/lang/pt_br.json b/Crowdin/lang/pt_br.json
@@ -1,9 +1,4 @@
 {
-  "lifemc.btn.update": "Update Now!",
-  "lifemc.notification.update": "New update available for LifeMC!",
-  "lifemc.copying": "All rights reserved. © 2021-2024 LifeMC Studios.",
-  "sodium.option_impact.low": "Low",
-  "sodium.option_impact.medium": "Medium",
   "sodium.option_impact.high": "High",
   "sodium.option_impact.extreme": "Extreme",
   "sodium.option_impact.varies": "Varies",