Skip to content

Commit

Permalink
Merge pull request #331 from LifeMC-Studios/dev_main
Browse files Browse the repository at this point in the history
✨ v1.0.4 is out!
  • Loading branch information
MasterMC5801 authored Mar 30, 2024
2 parents 8291fd6 + f91a5a5 commit f6b179e
Show file tree
Hide file tree
Showing 364 changed files with 14,501 additions and 995 deletions.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ body:
- 1.0.3+1.19.4
- 1.0.3+1.20.1
- 1.0.3+1.20.2
- 1.0.4+1.18.2
- 1.0.4+1.19.4
- 1.0.4+1.20.1
- 1.0.4+1.20.2
- 1.0.4+1.20.4
validations:
required: true

Expand Down
16 changes: 13 additions & 3 deletions CLI/packwiz-modrinth-export.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ show_menu() {
echo "2. 1.19.4"
echo "3. 1.20.1"
echo "4. 1.20.2"
echo "5. All versions"
echo "6. Close"
echo "5. 1.20.4"
echo "6. 1.20.5"
echo "7. All versions"
echo "8. Close"
echo -e "\e[0m"
}

Expand Down Expand Up @@ -94,6 +96,12 @@ while true; do
export_modpack "1.20.2"
;;
5)
export_modpack "1.20.4"
;;
6)
export_modpack "1.20.5"
;;
7)
echo -e "\e[32m"
echo "You have selected All versions"
echo -e "\e[0m"
Expand All @@ -102,8 +110,10 @@ while true; do
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"
;;
6)
8)
echo -e "\e[31m"
echo "Closure..."
echo -e "\e[0m"
Expand Down
16 changes: 13 additions & 3 deletions CLI/packwiz-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ show_menu() {
echo "2. 1.19.4"
echo "3. 1.20.1"
echo "4. 1.20.2"
echo "5. All versions"
echo "6. Close"
echo "5. 1.20.4"
echo "6. 1.20.5"
echo "7. All versions"
echo "8. Close"
echo -e "\e[0m"
}

Expand Down Expand Up @@ -93,6 +95,12 @@ while true; do
update_modpack "1.20.2"
;;
5)
update_modpack "1.20.4"
;;
6)
update_modpack "1.20.5"
;;
7)
echo -e "\e[32m"
echo "You have selected All versions"
echo -e "\e[0m"
Expand All @@ -101,8 +109,10 @@ while true; do
update_modpack "1.19.4"
update_modpack "1.20.1"
update_modpack "1.20.2"
update_modpack "1.20.4"
update_modpack "1.20.5"
;;
6)
8)
echo -e "\e[31m"
echo "Closure..."
echo -e "\e[0m"
Expand Down
61 changes: 36 additions & 25 deletions CLI/update-languages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Define the Packwiz modpack directory
packwiz_dir="../Packwiz"

# Define the common resource folder
resources_dir="../Crowdin/lang/"

# Function to display the script's introduction
show_intro() {
clear
Expand Down Expand Up @@ -44,31 +47,37 @@ loading_animation() {
# Function to display the version selection menu
show_menu() {
echo -e "\e[34m"
echo "Which version would you like to update?"
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. All versions"
echo "6. Close"
echo "5. 1.20.4"
echo "6. 1.20.5"
echo "7. All versions"
echo "8. Close"
echo -e "\e[0m"
}

# Function to update the modpack for the selected version
update_modpack() {
# Function to update resources for the selected version
update_languages() {
local selected_version="$1"

# Target directory for the selected version
local version_dir="$packwiz_dir/$selected_version/config/yosbr/config/resources/minecraft/lang/"
echo -e "\e[32m"
echo "You have selected: $selected_version"
echo "You have selected $selected_version"
echo -e "\e[0m"
sleep 1
cd "$packwiz_dir/$selected_version"

# Update the modpack
pw update --all -y &
# Copying resources to the selected version
cp -r "$resources_dir"/* "$version_dir" &
cd "$packwiz_dir/$selected_version"
pw refresh &
loading_animation $!
cd -
echo -e "\e[32m"
echo "Modpack update completed!"
echo "Copying of all languages completed!"
echo -e "\e[0m"
sleep 1
}
Expand All @@ -81,28 +90,36 @@ while true; do

case "$choice" in
1)
update_modpack "1.18.2"
update_languages "1.18.2"
;;
2)
update_modpack "1.19.4"
update_languages "1.19.4"
;;
3)
update_modpack "1.20.1"
update_languages "1.20.1"
;;
4)
update_modpack "1.20.2"
update_languages "1.20.2"
;;
5)
update_languages "1.20.4"
;;
6)
update_languages "1.20.5"
;;
7)
echo -e "\e[32m"
echo "You have selected All versions"
echo -e "\e[0m"
sleep 1
update_modpack "1.18.2"
update_modpack "1.19.4"
update_modpack "1.20.1"
update_modpack "1.20.2"
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"
;;
6)
8)
echo -e "\e[31m"
echo "Closure..."
echo -e "\e[0m"
Expand All @@ -120,10 +137,4 @@ while true; do
echo
done

# > All rights reserved. © 2021-2024 LifeMC Studios
esac

echo
done

# > All rights reserved. © 2021-2024 LifeMC Studios
136 changes: 0 additions & 136 deletions CLI/update-resources.sh

This file was deleted.

6 changes: 3 additions & 3 deletions Packwiz/1.18.2/config/fabric_loader_dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"overrides": {
"fabricloader": {
"+depends": {
"fabricloader": ">=0.15.3"
"fabricloader": ">=0.15.7"
}
},
"minecraft": {
"+recommends": {
"LifeMC": ">1.0.3+1.18.2"
"LifeMC": ">1.0.4+1.18.2"
}
}
}
}
}
4 changes: 2 additions & 2 deletions Packwiz/1.18.2/config/lifemc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version_number": "1.0.3+1.18.2"
}
"version_number": "1.0.4+1.18.2"
}
Loading

0 comments on commit f6b179e

Please sign in to comment.