godot/mc-perfect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean aftert bad merge

Browse Source
This commit is contained in:
ggodot 2026-01-28 10:54:05 +01:00
parent 6d9b10886a
commit c80491ff9c
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mc-install.sh
View File

@ -94,13 +94,8 @@ elif [[ "$maxRam" =~ ("G"|"M") ]]; then
printf "\n+ Allocating $maxRam as RAM maximum." printf "\n+ Allocating $maxRam as RAM maximum."
echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt
elif [[ -z $maxRam ]]; then elif [[ -z $maxRam ]]; then
<<<<<<< HEAD
printf "\n+ Allocating $MaxRam as RAM maximum" printf "\n+ Allocating $MaxRam as RAM maximum"
echo "-Xmx4G" >> user_jvm_args.txt echo "-Xmx4G" >> user_jvm_args.txt
=======
printf "\n+ Allocating $MaxRam as RAM maximum"
echo "-Xmx4G" >> /opt/minecraft/user_jvm_args.txt
>>>>>>> refs/remotes/origin/life2
elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then
printf "\n+ Allocating ${maxRam}G as RAM maximum" printf "\n+ Allocating ${maxRam}G as RAM maximum"
echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt
@ -117,13 +112,8 @@ elif [[ "$minRam" =~ ("G"|"M") ]]; then
printf "\n+ Allocating $minRam as RAM minimum." printf "\n+ Allocating $minRam as RAM minimum."
echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt
elif [[ -z $minRam ]]; then elif [[ -z $minRam ]]; then
<<<<<<< HEAD
printf "\n+ Allocating $minRam as RAM minimum"
echo "-Xms1G" >> user_jvm_args.txt
=======
printf "\n+ Allocating $minRam as RAM minimum" printf "\n+ Allocating $minRam as RAM minimum"
echo "-Xms1G" >> /opt/minecraft/user_jvm_args.txt echo "-Xms1G" >> /opt/minecraft/user_jvm_args.txt
>>>>>>> refs/remotes/origin/life2
elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then
printf "Allocating ${minRam}G as RAM maximum" printf "Allocating ${minRam}G as RAM maximum"
echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt